1 files changed, 8 insertions, 8 deletions
diff --git a/testsuite/testing.sh b/testsuite/testing.sh
index 22c640faf..65a0f6529 100755
--- a/testsuite/testing.sh
+++ b/testsuite/testing.sh
@@ -54,14 +54,14 @@ test x"$ECHO" != x"" || {
 optional()
 {
-  option=`echo ":$OPTIONFLAGS:" | grep ":$1:"`
+        SKIP=
-  # Not set?
+        while test "$1"; do
-  if [ -z "$1" ] || [ -z "$OPTIONFLAGS" ] || [ ${#option} -ne 0 ]
+                if test x"${OPTIONFLAGS/*:$1:*/y}" != x"y"; then
-  then
+                        SKIP=1
-    SKIP=
+                        return
-    return
+                fi
-  fi
+                shift
-  SKIP=1
+        done
 }
 # The testing function

diff --git a/testsuite/testing.sh b/testsuite/testing.sh index 22c640faf..65a0f6529 100755 --- a/testsuite/testing.sh +++ b/testsuite/testing.sh
@@ -54,14 +54,14 @@ test x"$ECHO" != x"" \|\| {
54		54
55	optional()	55	optional()
56	{	56	{
57	option=`echo ":$OPTIONFLAGS:" \| grep ":$1:"`	57	SKIP=
58	# Not set?	58	while test "$1"; do
59	if [ -z "$1" ] \|\| [ -z "$OPTIONFLAGS" ] \|\| [ ${#option} -ne 0 ]	59	if test x"${OPTIONFLAGS/:$1:/y}" != x"y"; then
60	then	60	SKIP=1
61	SKIP=	61	return
62	return	62	fi
63	fi	63	shift
64	SKIP=1	64	done
65	}	65	}
66		66
67	# The testing function	67	# The testing function