svn commit: samba r22160 - in branches/SAMBA_4_0/source/script/tests: .

[abartlet at samba.org]

Author: abartlet
Date: 2007-04-11 01:32:38 +0000 (Wed, 11 Apr 2007)
New Revision: 22160

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22160

Log:
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

Modified:
   branches/SAMBA_4_0/source/script/tests/selftest.pl
   branches/SAMBA_4_0/source/script/tests/test_quick.sh
   branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/selftest.pl
===================================================================
--- branches/SAMBA_4_0/source/script/tests/selftest.pl	2007-04-10 22:59:42 UTC (rev 22159)
+++ branches/SAMBA_4_0/source/script/tests/selftest.pl	2007-04-11 01:32:38 UTC (rev 22160)
@@ -223,6 +223,7 @@
 	if ($ret == $expected_ret) {
 		print "TEST PASSED: $name\n";
 	} else {
+		push(@$suitesfailed, $name);
 		print "TEST FAILED: $name (status $ret)\n";
 	}
 	print "==========================================\n";

Modified: branches/SAMBA_4_0/source/script/tests/test_quick.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_quick.sh	2007-04-10 22:59:42 UTC (rev 22159)
+++ branches/SAMBA_4_0/source/script/tests/test_quick.sh	2007-04-11 01:32:38 UTC (rev 22160)
@@ -15,5 +15,5 @@
 
 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

Modified: branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh	2007-04-10 22:59:42 UTC (rev 22159)
+++ branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh	2007-04-11 01:32:38 UTC (rev 22160)
@@ -18,7 +18,7 @@
    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