Move ndrdump tests closer to the code they test.

diff --git a/testprogs/blackbox/ndrdump/samr-CreateUser-in.dat b/source4/librpc/tests/samr-CreateUser-in.dat
similarity index 100%
rename from testprogs/blackbox/ndrdump/samr-CreateUser-in.dat
rename to source4/librpc/tests/samr-CreateUser-in.dat

diff --git a/testprogs/blackbox/ndrdump/samr-CreateUser-out.dat b/source4/librpc/tests/samr-CreateUser-out.dat
similarity index 100%
rename from testprogs/blackbox/ndrdump/samr-CreateUser-out.dat
rename to source4/librpc/tests/samr-CreateUser-out.dat

diff --git a/testprogs/blackbox/test_ndrdump.sh b/source4/librpc/tests/test_ndrdump.sh
similarity index 100%
rename from testprogs/blackbox/test_ndrdump.sh
rename to source4/librpc/tests/test_ndrdump.sh

diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 6f6ffbba6023291751314eb9e31f517256a57233..3c292d3855d9bfa843f7ccbdd76bffa17f84bd73 100755 (executable)
--- 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
similarity index 100%
rename from testprogs/ejs/minschema_classes.txt
rename to testdata/minschema_classes.txt