From acb9a569826dfaeaaeb30e1c193d7dd72e85a15c Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Mon, 14 Feb 2011 11:29:00 +0100
Subject: [PATCH] s3-selftest: when skipping tests, use the selftest/skip file.

Guenther
(cherry picked from commit c575d30a32092665d104a06a12139528730b1287)
---
 source3/script/tests/test_posix_s3.sh | 18 ------------------
 source3/selftest/skip                 |  9 +++++++++
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 36c21dab233..8cdb1e26f41 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -71,14 +71,6 @@ if test "x$POSIX_SUBTESTS" != "x" ; then
 	tests="$POSIX_SUBTESTS"
 fi
 
-skipped="base.charset base.tcondev"
-skipped="$skipped raw.acls raw.composite raw.context"
-skipped="$skipped raw.ioctl"
-skipped="$skipped raw.qfileinfo raw.qfsinfo"
-skipped="$skipped raw.sfileinfo.base"
-
-echo "WARNING: Skipping tests $skipped"
-
 ADDARGS="$ADDARGS --option=torture:sharedelay=100000"
 #ADDARGS="$ADDARGS --option=torture:writetimeupdatedelay=500000"
 
@@ -87,16 +79,6 @@ for t in $tests; do
     if [ ! -z "$start" -a "$start" != $t ]; then
 	continue;
     fi
-    skip=0
-    for s in $skipped; do
-    	if [ x"$s" = x"$t" ]; then
-    	    skip=1;
-	    break;
-	fi
-    done
-    if [ $skip = 1 ]; then
-    	continue;
-    fi
     start=""
     name="$t"
     if [ "$t" = "base.delaywrite" ]; then
diff --git a/source3/selftest/skip b/source3/selftest/skip
index 64873839e47..1dca282d9b1 100644
--- a/source3/selftest/skip
+++ b/source3/selftest/skip
@@ -15,3 +15,12 @@ samba3.utable
 samba3.pipe_number
 samba3.smbtorture_s3.plain.CHAIN1
 samba3.smbtorture_s3.crypt.CHAIN1
+samba3.*base.charset
+samba3.*base.tcondev
+samba3.*raw.acls
+samba3.*raw.composite
+samba3.*raw.context
+samba3.*raw.ioctl
+samba3.*raw.qfileinfo
+samba3.*raw.qfsinfo
+samba3.*raw.sfileinfo.base
-- 
2.11.4.GIT