diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-28 22:16:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:31:03 -0500 |
| commit | 679ef7b6babef0666749bea1d3b722786ce928d9 (patch) | |
| tree | e042b4b5de1ea41807c7dd6e4b696538c08283de /source3/script/tests/test_smbtorture_s3.sh | |
| parent | 5221ebb299081da6a806362212c6a8ceb9cc70a8 (diff) | |
| download | samba-679ef7b6babef0666749bea1d3b722786ce928d9.tar.gz samba-679ef7b6babef0666749bea1d3b722786ce928d9.tar.bz2 samba-679ef7b6babef0666749bea1d3b722786ce928d9.zip | |
r25415: Merge the 3.2-perltest branch that switches Samba 3.2 to use Samba 4's selftest code. See the mailing list for details.
(This used to be commit bdc831ddb3a860676c36bbd89e6f748946df68a1)
Diffstat (limited to 'source3/script/tests/test_smbtorture_s3.sh')
| -rwxr-xr-x | source3/script/tests/test_smbtorture_s3.sh | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh index 38ab40f09d..21c0fca445 100755 --- a/source3/script/tests/test_smbtorture_s3.sh +++ b/source3/script/tests/test_smbtorture_s3.sh @@ -2,23 +2,13 @@ # this runs the file serving tests that are expected to pass with samba3 -if [ $# -lt 3 ]; then -cat <<EOF -Usage: test_smbtorture_s3.sh UNC USERNAME PASSWORD <first> <smbtorture args> -EOF -exit 1; -fi - -unc="$1" -username="$2" -password="$3" -start="$4" -shift 4 ADDARGS="$*" incdir=`dirname $0` . $incdir/test_functions.sh +BINDIR=$incdir/../../bin + tests="FDPASS LOCK1 LOCK2 LOCK3 LOCK4 LOCK5 LOCK6 LOCK7" tests="$tests UNLINK BROWSE ATTR TRANS2 MAXFID TORTURE " tests="$tests OPLOCK1 OPLOCK2 OPLOCK3" @@ -26,22 +16,6 @@ tests="$tests DIR DIR1 TCON TCONDEV RW1 RW2 RW3" tests="$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K" tests="$tests TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE" -skipped1="RANDOMIPC NEGNOWAIT NBENCH ERRMAPEXTRACT TRANS2SCAN NTTRANSSCAN" -skipped2="DENY1 DENY2 OPENATTR CASETABLE EATEST" -skipped3="MANGLE UTABLE PIPE_NUMBER" -echo "Skipping the following tests:" -echo "$skipped1" -echo "$skipped2" -echo "$skipped3" - -failed=0 for t in $tests; do - if [ ! -z "$start" -a "$start" != $t ]; then - continue; - fi - start="" - name="$t" - testit "$name" $VALGRIND $BINDIR/smbtorture $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1` + plantest "SAMBA3-$t" dc $VALGRIND $BINDIR/smbtorture $ADDARGS //\$SERVER_IP/tmp -U"\$USERNAME"%"\$PASSWORD" $t done - -testok $0 $failed |