Skip to contentSkip to conversation

scripts: Allow multiple -t and -x regular expressions for run-tests.sh

PATCH New Mike Mason 1 participant 1 message Aug 18, 2014

lore
Share & tools
lore

Mike Mason

author
#0 lore raw

PATCH v2 1/1 scripts: Allow multiple -t and -x regular expressions for run-tests.sh

Piglit allows multiple -t and -x regular expressions to be given on the command line. This patch enables run-tests.sh to support that as well.

---
 scripts/run-tests.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
scripts/run-tests.sh +4 -2
index cf77473..d0e0c67 100755
@@ -55,8 +55,10 @@ function print_help {
 	echo "                  (default: $RESULTS)"
 	echo "  -s              create html summary"
 	echo "  -t <regex>      only include tests that match the regular expression"
+	echo "                  (can be used more than once)"
 	echo "  -v              enable verbose mode"
 	echo "  -x <regex>      exclude tests that match the regular expression"
+	echo "                  (can be used more than once)"
 	echo ""
 	echo "Useful patterns for test filtering are described in tests/NAMING-CONVENTION"
 }
@@ -78,9 +80,9 @@ while getopts ":dhlr:st:vx:" opt; do
 		l) list_tests; exit ;;
 		r) RESULTS="$OPTARG" ;;
 		s) SUMMARY="html" ;;
-		t) FILTER="-t $OPTARG" ;;
+		t) FILTER="$FILTER -t $OPTARG" ;;
 		v) VERBOSE="-v" ;;
-		x) EXCLUDE="-x $OPTARG" ;;
+		x) EXCLUDE="$EXCLUDE -x $OPTARG" ;;
 		:)
 			echo "Option -$OPTARG requires an argument."
 			exit 1
Signature · 1 line
1.9.1