summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-19 12:07:03 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-19 12:07:03 +0200
commitc7d069a4833548e249a74837d6fce02dd09f473c (patch)
treef49b8044204dd01ee474861207bc48bd2f4a76a6 /source4
parent62b5f1886d06edb94bbb799c07470803cbd9988b (diff)
downloadsamba-c7d069a4833548e249a74837d6fce02dd09f473c.tar.gz
samba-c7d069a4833548e249a74837d6fce02dd09f473c.tar.bz2
samba-c7d069a4833548e249a74837d6fce02dd09f473c.zip
Fix path to ndrdump in blackbox test, don't start smb server for ndrdump
tests.
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/librpc/tests/test_ndrdump.sh4
-rwxr-xr-xsource4/selftest/samba4_tests.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/librpc/tests/test_ndrdump.sh b/source4/librpc/tests/test_ndrdump.sh
index dddfc0eae1..511856061c 100755
--- a/source4/librpc/tests/test_ndrdump.sh
+++ b/source4/librpc/tests/test_ndrdump.sh
@@ -8,9 +8,9 @@
failed=0
-samba4bindir=`dirname $0`/../../source4/bin
+samba4bindir=`dirname $0`/../../bin
ndrdump=$samba4bindir/ndrdump
-files=`dirname $0`/ndrdump
+files=`dirname $0`/
testit "ndrdump with in" $VALGRIND $ndrdump samr samr_CreateUser in $files/samr-CreateUser-in.dat $@ || failed=`expr $failed + 1`
testit "ndrdump with out" $VALGRIND $ndrdump samr samr_CreateUser out $files/samr-CreateUser-out.dat $@ || failed=`expr $failed + 1`
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 3c2bb134b0..a72024e9e1 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -269,7 +269,7 @@ fi
bbdir=$incdir/../../testprogs/blackbox
-plantest "blackbox.ndrdump" dc $samba4srcdir/librpc/tests/test_ndrdump.sh
+plantest "blackbox.ndrdump" none $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"