diff options
| author | Petri Latvala <petri.latvala@intel.com> | 2018-08-14 15:38:31 +0300 |
|---|---|---|
| committer | Petri Latvala <petri.latvala@intel.com> | 2018-08-16 14:40:07 +0300 |
| commit | 1598fdb717546e25e8077935daa8e97768ad245d (patch) | |
| tree | 3df6ae75ec64774b180fc75329991cfe68aa0979 /runner | |
| parent | cb0c20aa4287d8b51e9cccd444041ad75603b1ee (diff) | |
runner: Match the piglit name with -t and -x options
Instead of just matching the binary/subtest name.
Originally not implemented to get the runner landed faster. Turned out
to be simple enough.
Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Diffstat (limited to 'runner')
| -rw-r--r-- | runner/job_list.c | 11 | ||||
| -rw-r--r-- | runner/runner_tests.c | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/runner/job_list.c b/runner/job_list.c index e3f820c3..5fe88e4f 100644 --- a/runner/job_list.c +++ b/runner/job_list.c @@ -74,13 +74,19 @@ static void add_subtests(struct job_list *job_list, struct settings *settings, } while (fscanf(p, "%ms", &subtestname) == 1) { - if (exclude && exclude->size && matches_any(subtestname, exclude)) { + char *piglitname; + + asprintf(&piglitname, "igt@%s@%s", binary, subtestname); + + if (exclude && exclude->size && matches_any(piglitname, exclude)) { free(subtestname); + free(piglitname); continue; } - if (include && include->size && !matches_any(subtestname, include)) { + if (include && include->size && !matches_any(piglitname, include)) { free(subtestname); + free(piglitname); continue; } @@ -96,6 +102,7 @@ static void add_subtests(struct job_list *job_list, struct settings *settings, } free(subtestname); + free(piglitname); } if (num_subtests) diff --git a/runner/runner_tests.c b/runner/runner_tests.c index 89b4377a..942ba26b 100644 --- a/runner/runner_tests.c +++ b/runner/runner_tests.c @@ -514,6 +514,8 @@ igt_main job_list_filter_test("binary-exclude", "-x", "successtest", 3, 2); job_list_filter_test("subtest-include", "-t", "first-subtest", 1, 1); job_list_filter_test("subtest-exclude", "-x", "second-subtest", 4, 3); + job_list_filter_test("piglit-names", "-t", "igt@successtest", 2, 1); + job_list_filter_test("piglit-names-subtest", "-t", "igt@successtest@first", 1, 1); igt_subtest_group { char filename[] = "tmplistXXXXXX"; |