summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-16 18:16:49 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-16 18:16:49 +0200
commitaa09d8a75f04dd2680aa7c0f06e47b6f5a36fa56 (patch)
treee1d7d5dbac05fce826622d4ffbe60afe1115b5f1
parentc2eb4e5f8e0275003f9cffe1feeee6e34b7e578e (diff)
downloadsamba-aa09d8a75f04dd2680aa7c0f06e47b6f5a36fa56.tar.gz
samba-aa09d8a75f04dd2680aa7c0f06e47b6f5a36fa56.tar.xz
samba-aa09d8a75f04dd2680aa7c0f06e47b6f5a36fa56.zip
Move ndrdump tests closer to the code they test.
-rw-r--r--source4/librpc/tests/samr-CreateUser-in.dat (renamed from testprogs/blackbox/ndrdump/samr-CreateUser-in.dat)bin60 -> 60 bytes
-rw-r--r--source4/librpc/tests/samr-CreateUser-out.dat (renamed from testprogs/blackbox/ndrdump/samr-CreateUser-out.dat)bin32 -> 32 bytes
-rwxr-xr-xsource4/librpc/tests/test_ndrdump.sh (renamed from testprogs/blackbox/test_ndrdump.sh)0
-rwxr-xr-xsource4/selftest/samba4_tests.sh2
-rw-r--r--testdata/minschema_classes.txt (renamed from testprogs/ejs/minschema_classes.txt)0
5 files changed, 1 insertions, 1 deletions
diff --git a/testprogs/blackbox/ndrdump/samr-CreateUser-in.dat b/source4/librpc/tests/samr-CreateUser-in.dat
index a5840e1f7f..a5840e1f7f 100644
--- a/testprogs/blackbox/ndrdump/samr-CreateUser-in.dat
+++ b/source4/librpc/tests/samr-CreateUser-in.dat
Binary files differ
diff --git a/testprogs/blackbox/ndrdump/samr-CreateUser-out.dat b/source4/librpc/tests/samr-CreateUser-out.dat
index cf9131dba9..cf9131dba9 100644
--- a/testprogs/blackbox/ndrdump/samr-CreateUser-out.dat
+++ b/source4/librpc/tests/samr-CreateUser-out.dat
Binary files differ
diff --git a/testprogs/blackbox/test_ndrdump.sh b/source4/librpc/tests/test_ndrdump.sh
index 50fd76ba92..50fd76ba92 100755
--- a/testprogs/blackbox/test_ndrdump.sh
+++ b/source4/librpc/tests/test_ndrdump.sh
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 6f6ffbba60..3c292d3855 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -267,7 +267,7 @@ fi
bbdir=$incdir/../../testprogs/blackbox
-plantest "blackbox.ndrdump" dc $bbdir/test_ndrdump.sh
+plantest "blackbox.ndrdump" dc $samba4srcdir/librpc/tests/test_ndrdump.sh
plantest "blackbox.net" dc $samba4srcdir/utils/tests/test_net.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN"
plantest "blackbox.kinit" dc $bbdir/test_kinit.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$REALM" "\$DOMAIN" "$PREFIX" $CONFIGURATION
plantest "blackbox.cifsdd" dc $samba4srcdir/client/tests/test_cifsdd.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN"
diff --git a/testprogs/ejs/minschema_classes.txt b/testdata/minschema_classes.txt
index 30f5b8ce96..30f5b8ce96 100644
--- a/testprogs/ejs/minschema_classes.txt
+++ b/testdata/minschema_classes.txt