[PATCH i-g-t v2] lib/igt_core.c: Expand --run-subtest functionality.

[Derek Morton <derek.j.morton@intel.com>]

Added support for specifying arbitary lists of subtests to run, or
to exclude from being run if prefixed by ^ or !.

subtest1,subtest2 Will run subtest1 and subtest2
^subtest1,subtest2 or !subtest1,subtest2 will run all subtests except
subtest1 and subtest2.

Any subtest string not starting ! or ^ and not containing a comma is
treated as a normal wildcard expression.

This is required mainly on android to exclude subtests that test
features that do not exist in the android driver while still being able
to run other subtests in the binary when a wildcard expression is
insufficient.

v2: Use comma as list separator (Ville Syrjala)
support both ^ and ! as not operators (Dave Gordon)

Signed-off-by: Derek Morton <derek.j.morton@intel.com>
---
 lib/igt_core.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/lib/igt_core.c b/lib/igt_core.c
index 6b69bb7..5d243af 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -207,7 +207,15 @@
  * To do that obtain the lists of subtests with "--list-subtests", which can be
  * run as non-root and doesn't require the i915 driver to be loaded (or any
  * intel gpu to be present). Then individual subtests can be run with
- * "--run-subtest". Usage help for tests with subtests can be obtained with the
+ * "--run-subtest". --run-subtest accepts wildcard characters. A list of
+ * subtests to run may be specified by using ',' as a separator.
+ * A prefix of ^ or ! may be added to invert the logic, e.g. run all tests except...
+ *
+ * - --run-subtest basic* will run all subtests starting basic.
+ * - --run-subtest subtest1,subtest2 will run only subtest1 and subtest2
+ * - --run-subtest ^subtest1,subtest2 will run all those except subtest1 and subtest2
+ *
+ * Usage help for tests with subtests can be obtained with the
  * "--help" command line option.
  */
 
@@ -786,6 +794,41 @@ void igt_simple_init_parse_opts(int *argc, char **argv,
 		    extra_opt_handler, handler_data);
 }
 
+static bool check_testlist(const char *subtest_name)
+{
+	char *p;
+
+	/* Run subtests not in list
+	 * Look for subtest_name in list of form ^subtest1,subtest2,subtest3
+	 * or !test1,subtest2,subtest3
+	 * return true if not found.
+	 */
+	if ((run_single_subtest[0] == '^') || (run_single_subtest[0] == '!')) {
+		char prefix = run_single_subtest[0];
+		p = strstr(run_single_subtest, subtest_name);
+		if (!((p) &&
+		     ((*(p-1) == prefix) || (*(p-1) == ',')) &&
+		     ((*(p+strlen(subtest_name)) == ',') || (*(p+strlen(subtest_name)) == '\0'))))
+			return true;
+	}
+	/* Run subtests in list
+	 * Look for subtest_name in list of form subtest1,subtest2,subtest3
+	 * return true if found.
+	 */
+	else if (strstr(run_single_subtest, ",")) {
+		p = strstr(run_single_subtest, subtest_name);
+		if ((p) &&
+		    ((p == run_single_subtest) || (*(p-1) == ',')) &&
+		    ((*(p+strlen(subtest_name)) == ',') || (*(p+strlen(subtest_name)) == '\0')))
+			return true;
+	}
+	/* Run subtests that match shell wildcard */
+	else if (fnmatch(run_single_subtest, subtest_name, 0) == 0)
+		return true;
+
+	return false;
+}
+
 /*
  * Note: Testcases which use these helpers MUST NOT output anything to stdout
  * outside of places protected by igt_run_subtest checks - the piglit
@@ -814,7 +857,8 @@ bool __igt_run_subtest(const char *subtest_name)
 	}
 
 	if (run_single_subtest) {
-		if (fnmatch(run_single_subtest, subtest_name, 0) != 0)
+
+		if (check_testlist(subtest_name) == false)
 			return false;
 		else
 			run_single_subtest_found = true;
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx