Fix paths to subunit.sh

diff --git a/source4/librpc/tests/test_ndrdump.sh b/source4/librpc/tests/test_ndrdump.sh
index 50fd76ba9272c00a9972c7f18874275cceb07d6b..dddfc0eae174099b6ca4ff557ef4a72e4dfa29dd 100755 (executable)
--- a/source4/librpc/tests/test_ndrdump.sh
+++ b/source4/librpc/tests/test_ndrdump.sh
@@ -4,7 +4,7 @@
 # Copyright (C) 2008 Andrew Bartlett
 # based on test_smbclient.sh
 
-. `dirname $0`/subunit.sh
+. `dirname $0`/../../../testprogs/blackbox/subunit.sh
 
 failed=0
 

diff --git a/source4/torture/tests/test_gentest.sh b/source4/torture/tests/test_gentest.sh
index 046f280f7d645b192f5ac851921844b8f682582e..2f4d00dc77495a495864126af75c7db05a7d2554 100755 (executable)
--- a/source4/torture/tests/test_gentest.sh
+++ b/source4/torture/tests/test_gentest.sh
@@ -17,10 +17,10 @@ DOMAIN=$4
 shift 4
 failed=0
 
-samba4bindir=`dirname $0`/../../source4/bin
+samba4bindir=`dirname $0`/../../bin
 gentest=$samba4bindir/gentest
 
-. `dirname $0`/subunit.sh
+. `dirname $0`/../../../testprogs/blackbox/subunit.sh
 
 cat <<EOF > st/gentest.ignore
 all_info.out.fname
@@ -29,6 +29,6 @@ EOF
 
 testit "gentest" $VALGRIND $gentest //$SERVER/test1 //$SERVER/test2 --num-ops=100 --ignore=st/gentest.ignore -W "$DOMAIN" -U"$USERNAME%$PASSWORD" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
 
-/bin/rm -f st/gentest.ignore
+rm -f st/gentest.ignore
 
 exit $failed

diff --git a/source4/torture/tests/test_locktest.sh b/source4/torture/tests/test_locktest.sh
index 9cad4dafa29331e56d83bbf13743bbac4315f2b8..1fe39b4d1d31bb92676d4a3d7239cc381fcfc71e 100755 (executable)
--- a/source4/torture/tests/test_locktest.sh
+++ b/source4/torture/tests/test_locktest.sh
@@ -18,10 +18,10 @@ PREFIX=$5
 shift 5
 failed=0
 
-samba4bindir=`dirname $0`/../../source4/bin
+samba4bindir=`dirname $0`/../../bin
 locktest=$samba4bindir/locktest
 
-. `dirname $0`/subunit.sh
+. `dirname $0`/../../../testprogs/blackbox/subunit.sh
 
 testit "locktest" $VALGRIND $locktest //$SERVER/test1 //$SERVER/test2 --num-ops=100  -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
 

diff --git a/source4/torture/tests/test_masktest.sh b/source4/torture/tests/test_masktest.sh
index 440966261fcb7811071ee9e124428c7468f09ae4..59165e47dfd792c785b1300cfbfb2eb365dd72b3 100755 (executable)
--- a/source4/torture/tests/test_masktest.sh
+++ b/source4/torture/tests/test_masktest.sh
@@ -18,10 +18,10 @@ PREFIX=$5
 shift 5
 failed=0
 
-samba4bindir=`dirname $0`/../../source4/bin
+samba4bindir=`dirname $0`/../../bin
 masktest=$samba4bindir/masktest
 
-. `dirname $0`/subunit.sh
+. `dirname $0`/../../../testprogs/blackbox/subunit.sh
 
 testit "masktest" $VALGRIND $masktest //$SERVER/tmp --num-ops=200 --dieonerror -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`