svn commit: samba r24707 - in branches/SAMBA_4_0: . source/selftest

[jelmer at samba.org]

Author: jelmer
Date: 2007-08-27 14:38:13 +0000 (Mon, 27 Aug 2007)
New Revision: 24707

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

Log:
Remove some more cruft from the test list generation code.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/selftest/test_cifs.sh
   branches/SAMBA_4_0/source/selftest/test_local.sh
   branches/SAMBA_4_0/source/selftest/test_posix.sh
   branches/SAMBA_4_0/source/selftest/test_quick.sh
   branches/SAMBA_4_0/source/selftest/test_simple.sh
   branches/SAMBA_4_0/source/selftest/test_w2k3_file.sh


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/selftest/test_cifs.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_cifs.sh	2007-08-27 14:36:22 UTC (rev 24706)
+++ branches/SAMBA_4_0/source/selftest/test_cifs.sh	2007-08-27 14:38:13 UTC (rev 24707)
@@ -10,12 +10,8 @@
 
 raw=`bin/smbtorture --list | grep "^RAW-" | xargs`
 base=`bin/smbtorture --list | grep "^BASE-" | xargs`
-tests="$base $raw $smb2"
+tests="$base $raw"
 
 for t in $tests; do
-    if [ ! -z "$start" -a "$start" != $t ]; then
-	continue;
-    fi
-    start=""
     plantest "ntvfs/cifs $t" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS //\$NETBIOSNAME/cifs -U"\$USERNAME"%"\$PASSWORD" $t
 done

Modified: branches/SAMBA_4_0/source/selftest/test_local.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_local.sh	2007-08-27 14:36:22 UTC (rev 24706)
+++ branches/SAMBA_4_0/source/selftest/test_local.sh	2007-08-27 14:38:13 UTC (rev 24707)
@@ -5,10 +5,6 @@
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-# the local tests don't need smbd
-SMBD_TEST_FIFO=""
-export SMBD_TEST_FIFO
-
 for t in $local_tests; do
 	plantest "$t" none $VALGRIND bin/smbtorture $TORTURE_OPTIONS ncalrpc: $t "$*"
 done

Modified: branches/SAMBA_4_0/source/selftest/test_posix.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_posix.sh	2007-08-27 14:36:22 UTC (rev 24706)
+++ branches/SAMBA_4_0/source/selftest/test_posix.sh	2007-08-27 14:38:13 UTC (rev 24707)
@@ -14,9 +14,5 @@
 tests="$base $raw $smb2"
 
 for t in $tests; do
-    if [ ! -z "$start" -a "$start" != $t ]; then
-	continue;
-    fi
-    start=""
     plantest "$t" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/tmp -U"\$USERNAME"%"\$PASSWORD" $t
 done

Modified: branches/SAMBA_4_0/source/selftest/test_quick.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_quick.sh	2007-08-27 14:36:22 UTC (rev 24706)
+++ branches/SAMBA_4_0/source/selftest/test_quick.sh	2007-08-27 14:38:13 UTC (rev 24707)
@@ -14,8 +14,7 @@
 tests="$tests RAW-EAS RAW-STREAMS"
 
 for t in $tests; do
-    name="$t"
-    plantest "$name" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/tmp -U"\$USERNAME"%"\$PASSWORD" $t
+    plantest "$t" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/tmp -U"\$USERNAME"%"\$PASSWORD" $t
 done
 
 name=BASE-OPEN

Modified: branches/SAMBA_4_0/source/selftest/test_simple.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_simple.sh	2007-08-27 14:36:22 UTC (rev 24706)
+++ branches/SAMBA_4_0/source/selftest/test_simple.sh	2007-08-27 14:38:13 UTC (rev 24707)
@@ -9,6 +9,5 @@
 tests="BASE-RW1"
 
 for t in $tests; do
-    name="$t"
-    plantest "$name" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/simple -U"\$USERNAME"%"\$PASSWORD" $t
+    plantest "$t" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/simple -U"\$USERNAME"%"\$PASSWORD" $t
 done

Modified: branches/SAMBA_4_0/source/selftest/test_w2k3_file.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_w2k3_file.sh	2007-08-27 14:36:22 UTC (rev 24706)
+++ branches/SAMBA_4_0/source/selftest/test_w2k3_file.sh	2007-08-27 14:38:13 UTC (rev 24707)
@@ -40,10 +40,5 @@
 echo "Skipping tests expected to fail: $fail"
 
 for t in $tests; do
-    if [ ! -z "$start" -a "$start" != $t ]; then
-	continue;
-    fi
-    start=""
-    name="$t"
-    testit "$name" smb $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
+    testit "$t" smb $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
 done