diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 18:39:08 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 18:39:08 +0200 |
| commit | 3e5ba883b3dd82e5285d98b8c5083336c478ba04 (patch) | |
| tree | b644a6fdd08bf02c2603020a3cd0441aa2714709 | |
| parent | 740f67d7815250eca67c15b690a8d3f28b377ad2 (diff) | |
| download | samba-3e5ba883b3dd82e5285d98b8c5083336c478ba04.tar.gz samba-3e5ba883b3dd82e5285d98b8c5083336c478ba04.tar.bz2 samba-3e5ba883b3dd82e5285d98b8c5083336c478ba04.zip | |
Fix paths to subunit.sh
| -rwxr-xr-x | source4/librpc/tests/test_ndrdump.sh | 2 | ||||
| -rwxr-xr-x | source4/torture/tests/test_gentest.sh | 6 | ||||
| -rwxr-xr-x | source4/torture/tests/test_locktest.sh | 4 | ||||
| -rwxr-xr-x | source4/torture/tests/test_masktest.sh | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/source4/librpc/tests/test_ndrdump.sh b/source4/librpc/tests/test_ndrdump.sh index 50fd76ba92..dddfc0eae1 100755 --- 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 046f280f7d..2f4d00dc77 100755 --- 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 9cad4dafa2..1fe39b4d1d 100755 --- 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 440966261f..59165e47df 100755 --- 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` |