diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-10-16 13:06:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:21:12 -0500 |
| commit | 8773e743c518578584d07d35ffdafdd598af88b0 (patch) | |
| tree | 89726232dd6ae9eca1c219e21729a9b2336ddaa9 /source4/script | |
| parent | 0f2347e417dec4a50f95d64353b260cd53a44a2b (diff) | |
| download | samba-8773e743c518578584d07d35ffdafdd598af88b0.tar.gz samba-8773e743c518578584d07d35ffdafdd598af88b0.tar.bz2 samba-8773e743c518578584d07d35ffdafdd598af88b0.zip | |
r19339: Merge my 4.0-unittest branch. This adds an API for more fine-grained
output in the testsuite rather than just True or False for a
set of tests.
The aim is to use this for:
* known failure lists (run all tests and detect tests that
started working or started failing). This
would allow us to get rid of the RPC-SAMBA3-* tests
* nicer torture output
* simplification of the testsuite system
* compatibility with other unit testing systems
* easier usage of smbtorture (being able to run one test
and automatically set up the environment for that)
This is still a work-in-progress; expect more updates over the next couple of
days.
(This used to be commit 0eb6097305776325c75081356309115f445a7218)
Diffstat (limited to 'source4/script')
| -rwxr-xr-x | source4/script/tests/test_nbt.sh | 3 | ||||
| -rwxr-xr-x | source4/script/tests/test_posix.sh | 4 | ||||
| -rwxr-xr-x | source4/script/tests/test_w2k3_file.sh | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/source4/script/tests/test_nbt.sh b/source4/script/tests/test_nbt.sh index 45e1e49e5d..1cb5b97ac5 100755 --- a/source4/script/tests/test_nbt.sh +++ b/source4/script/tests/test_nbt.sh @@ -22,8 +22,7 @@ testit "nmblookup -U $SERVER $SERVER" bin/nmblookup $TORTURE_OPTIONS -U $SERVER testit "nmblookup $SERVER" bin/nmblookup $TORTURE_OPTIONS $SERVER || failed=`expr $failed + 1` NBT_TESTS="NBT-REGISTER NBT-WINS" -NBT_TESTS="$NBT_TESTS NBT-WINSREPLICATION-SIMPLE" -NBT_TESTS="$NBT_TESTS NBT-WINSREPLICATION-REPLICA" +NBT_TESTS="$NBT_TESTS NBT-WINSREPLICATION" # if [ "$TORTURE_QUICK"x != "yes"x ]; then # NBT_TESTS="$NBT_TESTS NBT-WINSREPLICATION-OWNED" # fi diff --git a/source4/script/tests/test_posix.sh b/source4/script/tests/test_posix.sh index 016cfeaff7..81e7268c2d 100755 --- a/source4/script/tests/test_posix.sh +++ b/source4/script/tests/test_posix.sh @@ -27,8 +27,8 @@ incdir=`dirname $0` # base="BASE-ATTR BASE-CHARSET BASE-CHKPATH BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE" base="$base BASE-DENY1 BASE-DENY2 BASE-DENY3 BASE-DENYDOS BASE-DIR1 BASE-DIR2" -base="$base BASE-DISCONNECT BASE-FDPASS BASE-LOCK1 BASE-LOCK2 BASE-LOCK3 BASE-LOCK4" -base="$base BASE-LOCK5 BASE-LOCK6 BASE-LOCK7 BASE-MANGLE BASE-NEGNOWAIT BASE-NTDENY1" +base="$base BASE-DISCONNECT BASE-FDPASS BASE-LOCK " +base="$base BASE-MANGLE BASE-NEGNOWAIT BASE-NTDENY1" base="$base BASE-NTDENY2 BASE-OPEN BASE-OPENATTR BASE-PROPERTIES BASE-RENAME BASE-RW1" base="$base BASE-SECLEAK BASE-TCON BASE-TCONDEV BASE-TRANS2 BASE-UNLINK BASE-VUID" base="$base BASE-XCOPY" diff --git a/source4/script/tests/test_w2k3_file.sh b/source4/script/tests/test_w2k3_file.sh index 16819dd205..e57fb7c2bd 100755 --- a/source4/script/tests/test_w2k3_file.sh +++ b/source4/script/tests/test_w2k3_file.sh @@ -19,8 +19,8 @@ ADDARGS="$*" incdir=`dirname $0` . $incdir/test_functions.sh -tests="BASE-FDPASS BASE-LOCK1 BASE-LOCK2 BASE-LOCK3 BASE-LOCK4" -tests="$tests BASE-LOCK5 BASE-LOCK6 BASE-LOCK7 BASE-UNLINK BASE-ATTR" +tests="BASE-FDPASS BASE-LOCK " +tests="$tests BASE-UNLINK BASE-ATTR" tests="$tests BASE-DIR1 BASE-DIR2 BASE-VUID" tests="$tests BASE-TCON BASE-TCONDEV BASE-RW1" tests="$tests BASE-DENY3 BASE-XCOPY BASE-OPEN BASE-DENYDOS" |