[igt-dev] [PATCH CI i-g-t] HAX: Run without --piglit-style-dmesg

Petri Latvala petri.latvala at intel.com
Tue Jan 8 09:07:13 UTC 2019


Cc: Martin Peres <martin.peres at linux.intel.com>
---
 runner/resultgen.c         | 4 ++--
 runner/runner_json_tests.c | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/runner/resultgen.c b/runner/resultgen.c
index be884955..3eb2877c 100644
--- a/runner/resultgen.c
+++ b/runner/resultgen.c
@@ -507,7 +507,7 @@ static int init_regex_whitelist(struct settings *settings)
 	static int status = -1;
 
 	if (status == -1) {
-		const char *regex = settings->piglit_style_dmesg ?
+		const char *regex = (false && settings->piglit_style_dmesg) ?
 			igt_piglit_style_dmesg_blacklist :
 			igt_dmesg_whitelist;
 
@@ -678,7 +678,7 @@ static bool fill_from_dmesg(int fd,
 			current_test = get_or_create_json_object(tests, piglit_name);
 		}
 
-		if (settings->piglit_style_dmesg) {
+		if (false && settings->piglit_style_dmesg) {
 			if ((flags & 0x07) <= 5 && continuation != 'c' &&
 			    regexec(&re, message, (size_t)0, NULL, 0) != REG_NOMATCH) {
 				append_line(&warnings, &warningslen, formatted);
diff --git a/runner/runner_json_tests.c b/runner/runner_json_tests.c
index 09a93189..2d6dfc07 100644
--- a/runner/runner_json_tests.c
+++ b/runner/runner_json_tests.c
@@ -151,7 +151,6 @@ static const char *dirnames[] = {
 	"normal-run",
 	"warnings",
 	"warnings-with-dmesg-warns",
-	"piglit-style-dmesg",
 	"incomplete-before-any-subtests",
 	"dmesg-results",
 	"aborted-on-boot",
-- 
2.19.1



More information about the igt-dev mailing list