public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Petri Latvala <petri.latvala@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>,
	Petri Latvala <petri.latvala@intel.com>
Subject: [igt-dev] [PATCH i-g-t 1/1] scripts/run-tests.sh: Use the filter flag values when listing tests
Date: Wed, 27 Nov 2019 13:02:51 +0200	[thread overview]
Message-ID: <20191127110251.23069-1-petri.latvala@intel.com> (raw)

Testcase:
scripts/run-tests.sh -l -T fast-feedback.testlist -x vgem_basic

Previously the filters (-T for testlist, -t/-x for regex
include/exclude) were silently dropped when listing tests. Actually
use them for listing, since that works properly when using igt_runner.

Warning for those using piglit (the -p flag): The -x flag for listing
with piglit is the same as -t at this time:
https://gitlab.freedesktop.org/mesa/piglit/issues/29

Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
---
 scripts/run-tests.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
index 615b7da5..2780f59d 100755
--- a/scripts/run-tests.sh
+++ b/scripts/run-tests.sh
@@ -32,7 +32,6 @@ IGT_RESUME=
 USE_PIGLIT=0
 RUNNER=
 RESUME=
-BLACKLIST=
 
 function find_file # basename <possible paths>
 {
@@ -134,11 +133,11 @@ while getopts ":dhlr:st:T:vx:Rnpb:" opt; do
 		t) FILTER="$FILTER -t $OPTARG" ;;
 		T) FILTER="$FILTER --test-list $OPTARG" ;;
 		v) VERBOSE="-l verbose" ;;
-		x) EXCLUDE="$EXCLUDE -x $OPTARG" ;;
+		x) FILTER="$FILTER -x $OPTARG" ;;
 		R) RESUME_RUN="true" ;;
 		n) NORETRY="--no-retry" ;;
 		p) USE_PIGLIT=1 ;;
-		b) BLACKLIST="$BLACKLIST -b $OPTARG" ;;
+		b) FILTER="$FILTER -b $OPTARG" ;;
 		:)
 			echo "Option -$OPTARG requires an argument."
 			exit 1
@@ -187,12 +186,11 @@ else
 
 	RUNNER=$IGT_RUNNER
 	RESUME=$IGT_RESUME
-	RUN_ARGS="$BLACKLIST"
-	LIST_ARGS="-L $BLACKLIST"
+	LIST_ARGS="-L"
 fi
 
 if [ "x$LIST_TESTS" != "x" ]; then
-	execute_runner 0 $RUNNER $LIST_ARGS
+	echo execute_runner 0 $RUNNER $LIST_ARGS $FILTER
 	exit
 fi
 
@@ -200,7 +198,7 @@ if [ "x$RESUME_RUN" != "x" ]; then
 	execute_runner 1 $RESUME $RESUME_ARGS "$RESULTS"
 else
 	mkdir -p "$RESULTS"
-	execute_runner 1 $RUNNER $RUN_ARGS -o -s "$RESULTS" $VERBOSE $EXCLUDE $FILTER
+	execute_runner 1 $RUNNER $RUN_ARGS -o -s "$RESULTS" $VERBOSE $FILTER
 fi
 
 if [ "$SUMMARY" == "html" ]; then
-- 
2.19.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

             reply	other threads:[~2019-11-27 11:03 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-27 11:02 Petri Latvala [this message]
2019-11-27 11:53 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/1] scripts/run-tests.sh: Use the filter flag values when listing tests Patchwork
2019-11-28  8:45 ` [igt-dev] [PATCH i-g-t v2 1/1] " Petri Latvala
2019-11-28  9:39 ` [igt-dev] ✗ GitLab.Pipeline: warning for series starting with [i-g-t,v2,1/1] scripts/run-tests.sh: Use the filter flag values when listing tests (rev2) Patchwork
2019-11-28  9:57 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork
2019-11-29 13:45 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191127110251.23069-1-petri.latvala@intel.com \
    --to=petri.latvala@intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=tomi.p.sarvela@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox