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.

Signed-off-by: Mike Mason <michael.w.mason@intel.com>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>

diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
index cf77473..d0e0c67 100755 (executable)
--- a/scripts/run-tests.sh
+++ b/scripts/run-tests.sh
@@ -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