6 files changed, 4 insertions, 23 deletions
diff --git a/source4/selftest/test_cifs.sh b/source4/selftest/test_cifs.sh
index 2bf3c4a5b1..76bb4c65e7 100755
--- a/source4/selftest/test_cifs.sh
+++ b/source4/selftest/test_cifs.sh
@@ -10,12 +10,8 @@ incdir=`dirname $0`
 
 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
diff --git a/source4/selftest/test_local.sh b/source4/selftest/test_local.sh
index d4c6b656c9..b3b8387f00 100755
--- a/source4/selftest/test_local.sh
+++ b/source4/selftest/test_local.sh
@@ -5,10 +5,6 @@ local_tests=`bin/smbtorture --list | grep "^LOCAL-" | xargs`
 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
diff --git a/source4/selftest/test_posix.sh b/source4/selftest/test_posix.sh
index 88040def88..8a547b906e 100755
--- a/source4/selftest/test_posix.sh
+++ b/source4/selftest/test_posix.sh
@@ -14,9 +14,5 @@ base=`bin/smbtorture --list | grep "^BASE-" | xargs`
 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
diff --git a/source4/selftest/test_quick.sh b/source4/selftest/test_quick.sh
index e2c14e42f2..438c04e444 100755
--- a/source4/selftest/test_quick.sh
+++ b/source4/selftest/test_quick.sh
@@ -14,8 +14,7 @@ tests="$tests RAW-UNLINK RAW-READ RAW-CLOSE RAW-IOCTL RAW-RENAME"
 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
diff --git a/source4/selftest/test_simple.sh b/source4/selftest/test_simple.sh
index a4a672cd5b..00cfb34a9f 100755
--- a/source4/selftest/test_simple.sh
+++ b/source4/selftest/test_simple.sh
@@ -9,6 +9,5 @@ incdir=`dirname $0`
 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
diff --git a/source4/selftest/test_w2k3_file.sh b/source4/selftest/test_w2k3_file.sh
index f008d49128..d59d2b49ef 100755
--- a/source4/selftest/test_w2k3_file.sh
+++ b/source4/selftest/test_w2k3_file.sh
@@ -40,10 +40,5 @@ fail="RAW-SEARCH RAW-ACLS RAW-QFSINFO"
 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