summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-04-11 01:32:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:55 -0500
commitdbfb32ffe5925259994712c9b1f18c4b60b9cdee (patch)
tree71b75c10c0d2b91705140e07c98ddce749ff65ee
parente338b4b47b6271ca46060a1fe8c61ab8afaecc8f (diff)
downloadsamba-dbfb32ffe5925259994712c9b1f18c4b60b9cdee.tar.gz
samba-dbfb32ffe5925259994712c9b1f18c4b60b9cdee.tar.bz2
samba-dbfb32ffe5925259994712c9b1f18c4b60b9cdee.zip
r22160: Only use test environment names that actually exist (get make
quicktest to pass). Ensure that when we fail on the build farm, this ends up in the total failures. I think having the 2 different functions for running the tests is just asking for this kind of failure. The build farm should be a presentation detail, and not alter the test behaviour. There is still a gremlin in there, we will fail horribly on the farm, but not on local tests... Andrew Bartlett (This used to be commit 519f3c0575748968ece2f556f370ade98c59ff05)
-rwxr-xr-xsource4/script/tests/selftest.pl1
-rwxr-xr-xsource4/script/tests/test_quick.sh2
-rwxr-xr-xsource4/script/tests/test_rpc_quick.sh2
3 files changed, 3 insertions, 2 deletions
diff --git a/source4/script/tests/selftest.pl b/source4/script/tests/selftest.pl
index bb9510a00b..e6ca48bafb 100755
--- a/source4/script/tests/selftest.pl
+++ b/source4/script/tests/selftest.pl
@@ -223,6 +223,7 @@ sub run_test_buildfarm($$$$)
if ($ret == $expected_ret) {
print "TEST PASSED: $name\n";
} else {
+ push(@$suitesfailed, $name);
print "TEST FAILED: $name (status $ret)\n";
}
print "==========================================\n";
diff --git a/source4/script/tests/test_quick.sh b/source4/script/tests/test_quick.sh
index e601bc7f9b..52e47a8a36 100755
--- a/source4/script/tests/test_quick.sh
+++ b/source4/script/tests/test_quick.sh
@@ -15,5 +15,5 @@ tests="$tests RAW-EAS RAW-STREAMS"
for t in $tests; do
name="$t"
- plantest "$name" base $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/cifs -U"\$USERNAME"%"\$PASSWORD" $t
+ plantest "$name" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/cifs -U"\$USERNAME"%"\$PASSWORD" $t
done
diff --git a/source4/script/tests/test_rpc_quick.sh b/source4/script/tests/test_rpc_quick.sh
index 1f37bac2e5..8793e0b6e6 100755
--- a/source4/script/tests/test_rpc_quick.sh
+++ b/source4/script/tests/test_rpc_quick.sh
@@ -18,7 +18,7 @@ for bindoptions in seal,padcheck $VALIDATE bigendian; do
esac
for t in $tests; do
name="$t on $transport with $bindoptions"
- plantest "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*"
+ plantest "$name" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*"
done
done
done