Attachment 154469 Details for Bug 239659 – patch -- add -C option to "server" script to skip non-CIFS friendly tests

[patch] patch -- add -C option to "server" script to skip non-CIFS friendly tests

cthon-cifs.patch (text/plain), 2.76 KB, created by Jeff Layton on 2007-05-10 13:47:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-05-10 13:47:19 UTC

Size: 2.76 KB

patch

obsolete

>diff --git a/lock/runtests b/lock/runtests
>index a25f101..748512e 100644
>--- a/lock/runtests
>+++ b/lock/runtests
>@@ -41,6 +41,10 @@ then
> 	TESTARGS="-v 2 $TESTARGS"
> fi
> 
>+if [ "$CIFS" == "yes" ]; then
>+	TESTARGS="-c $TESTARGS"
>+fi
>+
> for i in $LOCKTESTS
> do
> 	echo ""
>diff --git a/lock/tlock.c b/lock/tlock.c
>index 8a7d0cc..431cc7b 100644
>--- a/lock/tlock.c
>+++ b/lock/tlock.c
>@@ -105,6 +105,8 @@ static off_t maxeof;
> #define	DO_TEST(n)	((testnum == 0) || (testnum == (n)))
> #define	DO_RATE(n)	((ratetest > 0) || (testnum == (n)))
> #define	DO_MAND(n)	((mandtest > 0) || (testnum == (n)))
>+/* exclude stuff known to fail on CIFS w/o unix extensions */
>+#define DO_CIFS		(!cifstest)
> 
> #define	DO_UNLINK	1
> #define	JUST_CLOSE	0
>@@ -119,6 +121,7 @@ static off_t maxeof;
> static int ratetest = 0;
> static int ratecount = 1000;		/* test 8 */
> static int mandtest = 0;
>+static int cifstest = 0;
> 
> static int iorate_kb = 256;		/* test 14 */
> static int iorate_count = 10;		/* test 14 */
>@@ -1593,10 +1596,10 @@ runtests()
> 	if (DO_MAND(9)) {
> 		test9();
> 	}
>-	if (DO_TEST(10)) {
>+	if (DO_TEST(10) && DO_CIFS) {
> 		test10();
> 	}
>-	if (DO_TEST(11)) {
>+	if (DO_TEST(11) && DO_CIFS) {
> 		test11();
> 	}
> 	if (DO_TEST(12)) {
>@@ -1630,8 +1633,11 @@ main(argc, argv)
> 
> 	passcnt = 1;	/* default, test for 1 pass */
> 
>-	while ((c = getopt(argc, argv, "p:t:rmv:w:")) != -1) {
>+	while ((c = getopt(argc, argv, "cp:t:rmv:w:")) != -1) {
> 		switch (c) {
>+		case 'c':
>+			cifstest++;
>+			break;
> 		case 'p':
> 			sscanf(optarg, "%d", &passcnt);
> 			break;
>diff --git a/server b/server
>index 0a76f33..439c96f 100755
>--- a/server
>+++ b/server
>@@ -19,7 +19,7 @@
> Program=`basename $0`
> 
> InitFile="./tests.init"
>-USAGE="usage:  $Program [-a|-b|-g|-s|-l|-c] [-f|-t|-n|-h] [-o mnt_options] [-p server_path] [-m mntpoint] [-N passes] server_name"
>+USAGE="usage:  $Program [-a|-b|-g|-s|-l|-c] [-f|-t|-n|-h|-C] [-o mnt_options] [-p server_path] [-m mntpoint] [-N passes] server_name"
> 
> # defaults
> . $InitFile
>@@ -27,7 +27,7 @@ export PATH CFLAGS LIBS MOUNT UMOUNT MNTOPTIONS
> 
> passes="1"
> 
>-set - `getopt abcfglhm:N:no:p:st $*`
>+set - `getopt abcCfglhm:N:no:p:st $*`
> 
> if [ $? != 0 ]
> then
>@@ -40,6 +40,7 @@ do
> 		-a|-b|-g|-s|-l)	TEST=$c; shift	;;
> 		-f|-n|-t)	TESTARG=$c; shift	;;
> 		-c)		cachefs="yes"; shift	;;
>+		-C)		CIFS="yes"; export CIFS; shift ;;
> 		-h)		HARDLINKS=n; export HARDLINKS; shift	;;
> 		-m)		USRMNTPOINT=$2; shift; shift	;;
> 		-o)		MNTOPTIONS=$2; export MNTOPTIONS;
>diff --git a/special/runtests.wrk b/special/runtests.wrk
>index 9543761..a941d33 100644
>--- a/special/runtests.wrk
>+++ b/special/runtests.wrk
>@@ -64,7 +64,7 @@ echo ""
> echo "test holey file support"
> ./holey
> 
>-if [ "$HARDLINKS"o != no ]
>+if [ "$HARDLINKS"o != no -a "$CIFS" != "yes" ]
> then
> 	echo ""
> 	echo "second check for lost reply on non-idempotent requests"

Actions: View | Diff

Attachments on bug 239659: 154465 | 154469 | 154470 | 154919