Re: [igt-dev] [PATCH i-g-t] runner: Treat dmesg warnings as pure warnings

Petri Latvala
2018-11-14T11:56:55Z

On Tue, Nov 13, 2018 at 05:25:47PM +0000, Chris Wilson wrote:
> I have whinged on for ages about the dmesg-warnings being an expected
> part of kernel testing (where else is the kernel meant to log its
> errors?) and should be treated the same as our stderr for the test. That
> is if a test fails, it fails and does not need to be conflated with
> whether or not there was a dmesg warning (just as the test saying why it
> failed on stderr does not need flagging), and that a passing test with a
> dmesg warning is simply a warn.
>
> The effect is that we simply remove the "dmesg-" flagging from results
> names, as the err/dmesg output is simply collated for the error report
> already.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Petri Latvala <petri.latvala@intel.com>
> Cc: Martin Peres <martin.peres@linux.intel.com>

Yep, now's a good a time as any to remove this cargo cult if ever.

Some acks from kernel people in general would be nice.

TODO:
Martin: cibuglog filters ready for this
Tomi et al: Visualization ready for this (tooltips etc)

Runner's tests need to be adapted, so squash this in:

-- >8 --
Subject: [PATCH i-g-t 1/1] Adapt unit tests for removing dmesg-warn

Signed-off-by: Petri Latvala <petri.latvala@intel.com>
---
.../json_tests_data/dmesg-results/README.txt | 3 +-
.../dmesg-results/reference.json | 34 ++--
.../warnings-with-dmesg-warns/0/dmesg.txt | 6 -
.../warnings-with-dmesg-warns/0/err.txt | 3 -
.../warnings-with-dmesg-warns/0/journal.txt | 2 -
.../warnings-with-dmesg-warns/0/out.txt | 3 -
.../warnings-with-dmesg-warns/1/dmesg.txt | 5 -
.../warnings-with-dmesg-warns/1/err.txt | 2 -
.../warnings-with-dmesg-warns/1/journal.txt | 2 -
.../warnings-with-dmesg-warns/1/out.txt | 3 -
.../warnings-with-dmesg-warns/2/dmesg.txt | 4 -
.../warnings-with-dmesg-warns/2/err.txt | 0
.../warnings-with-dmesg-warns/2/journal.txt | 1 -
.../warnings-with-dmesg-warns/2/out.txt | 2 -
.../warnings-with-dmesg-warns/3/dmesg.txt | 4 -
.../warnings-with-dmesg-warns/3/err.txt | 1 -
.../warnings-with-dmesg-warns/3/journal.txt | 2 -
.../warnings-with-dmesg-warns/3/out.txt | 6 -
.../warnings-with-dmesg-warns/4/dmesg.txt | 4 -
.../warnings-with-dmesg-warns/4/err.txt | 1 -
.../warnings-with-dmesg-warns/4/journal.txt | 2 -
.../warnings-with-dmesg-warns/4/out.txt | 6 -
.../warnings-with-dmesg-warns/README.txt | 3 -
.../warnings-with-dmesg-warns/endtime.txt | 1 -
.../warnings-with-dmesg-warns/joblist.txt | 5 -
.../warnings-with-dmesg-warns/metadata.txt | 12 --
.../warnings-with-dmesg-warns/reference.json | 159 ------------------
.../warnings-with-dmesg-warns/starttime.txt | 1 -
.../warnings-with-dmesg-warns/uname.txt | 1 -
runner/runner_json_tests.c | 1 -
30 files changed, 18 insertions(+), 261 deletions(-)
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/0/dmesg.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/0/err.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/0/journal.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/0/out.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/1/dmesg.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/1/err.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/1/journal.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/1/out.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/2/dmesg.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/2/err.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/2/journal.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/2/out.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/3/dmesg.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/3/err.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/3/journal.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/3/out.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/4/dmesg.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/4/err.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/4/journal.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/4/out.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/README.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/endtime.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/joblist.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/metadata.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/reference.json
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/starttime.txt
delete mode 100644 runner/json_tests_data/warnings-with-dmesg-warns/uname.txt

diff --git a/runner/json_tests_data/dmesg-results/README.txt b/runner/json_tests_data/dmesg-results/README.txt
index d928a526..e66ee611 100644
--- a/runner/json_tests_data/dmesg-results/README.txt
+++ b/runner/json_tests_data/dmesg-results/README.txt
@@ -1,3 +1,2 @@
Certain types of kernel log messages cause the result to change from
-'pass' to 'dmesg-warn', and from 'fail' to 'dmesg-fail'. 'skip' should
-stay 'skip'.
+'pass' to 'warn'. 'skip' should stay 'skip'.
diff --git a/runner/json_tests_data/dmesg-results/reference.json b/runner/json_tests_data/dmesg-results/reference.json
index 811b63eb..bf96217e 100644
--- a/runner/json_tests_data/dmesg-results/reference.json
+++ b/runner/json_tests_data/dmesg-results/reference.json
@@ -12,7 +12,7 @@
"igt@successtest@first-subtest":{
"out":"Starting subtest: first-subtest\nSubtest first-subtest: SUCCESS (0.000s)\n",
"igt-version":"IGT-Version: 1.23-g0c763bfd (x86_64) (Linux: 4.18.0-1-amd64 x86_64)",
- "result":"dmesg-warn",
+ "result":"warn",
"time":{
"__type__":"TimeAttribute",
"start":0,
@@ -25,7 +25,7 @@
"igt@successtest@second-subtest":{
"out":"Starting subtest: second-subtest\nSubtest second-subtest: FAIL (0.000s)\n",
"igt-version":"IGT-Version: 1.23-g0c763bfd (x86_64) (Linux: 4.18.0-1-amd64 x86_64)",
- "result":"dmesg-fail",
+ "result":"fail",
"time":{
"__type__":"TimeAttribute",
"start":0,
@@ -41,7 +41,7 @@
"start":0,
"end":0.01
},
- "result":"dmesg-warn",
+ "result":"warn",
"out":"IGT-Version: 1.23-g0c763bfd (x86_64) (Linux: 4.18.0-1-amd64 x86_64)\nSUCCESS (0.000s)\n",
"igt-version":"IGT-Version: 1.23-g0c763bfd (x86_64) (Linux: 4.18.0-1-amd64 x86_64)",
"err":"",
@@ -77,50 +77,50 @@
"":{
"crash":0,
"pass":0,
- "dmesg-fail":1,
- "dmesg-warn":2,
+ "dmesg-fail":0,
+ "dmesg-warn":0,
"skip":2,
"incomplete":0,
"timeout":0,
"notrun":0,
- "fail":0,
- "warn":0
+ "fail":1,
+ "warn":2
},
"root":{
"crash":0,
"pass":0,
- "dmesg-fail":1,
- "dmesg-warn":2,
+ "dmesg-fail":0,
+ "dmesg-warn":0,
"skip":2,
"incomplete":0,
"timeout":0,
"notrun":0,
- "fail":0,
- "warn":0
+ "fail":1,
+ "warn":2
},
"igt@successtest":{
"crash":0,
"pass":0,
- "dmesg-fail":1,
- "dmesg-warn":1,
+ "dmesg-fail":0,
+ "dmesg-warn":0,
"skip":0,
"incomplete":0,
"timeout":0,
"notrun":0,
- "fail":0,
- "warn":0
+ "fail":1,
+ "warn":1
},
"igt@no-subtests":{
"crash":0,
"pass":0,
"dmesg-fail":0,
- "dmesg-warn":1,
+ "dmesg-warn":0,
"skip":0,
"incomplete":0,
"timeout":0,
"notrun":0,
"fail":0,
- "warn":0
+ "warn":1
},
"igt@skippers":{
"crash":0,
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/0/dmesg.txt b/runner/json_tests_data/warnings-with-dmesg-warns/0/dmesg.txt
deleted file mode 100644
index e50f75db..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/0/dmesg.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-6,951,3216186095083,-;Console: switching to colour dummy device 80x25
-14,952,3216186095097,-;[IGT] successtest: executing
-14,953,3216186101115,-;[IGT] successtest: starting subtest first-subtest
-3,954,3216186101159,-;Warning from kernel
-14,955,3216186101160,-;[IGT] successtest: exiting, ret=0
-6,956,3216186101299,-;Console: switching to colour frame buffer device 240x75
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/0/err.txt b/runner/json_tests_data/warnings-with-dmesg-warns/0/err.txt
deleted file mode 100644
index e18c00e9..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/0/err.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Starting subtest: first-subtest
-This is a warning line
-Subtest first-subtest: SUCCESS (0.000s)
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/0/journal.txt b/runner/json_tests_data/warnings-with-dmesg-warns/0/journal.txt
deleted file mode 100644
index 86a30e07..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/0/journal.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-first-subtest
-exit:0 (0.014s)
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/0/out.txt b/runner/json_tests_data/warnings-with-dmesg-warns/0/out.txt
deleted file mode 100644
index 5946bf31..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/0/out.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-IGT-Version: 1.23-g0c763bfd (x86_64) (Linux: 4.18.0-1-amd64 x86_64)
-Starting subtest: first-subtest
-Subtest first-subtest: SUCCESS (0.000s)
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/1/dmesg.txt b/runner/json_tests_data/warnings-with-dmesg-warns/1/dmesg.txt
deleted file mode 100644
index 59b7cee3..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/1/dmesg.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-6,956,3216186111837,-;Console: switching to colour dummy device 80x25
-14,957,3216186111851,-;[IGT] successtest: executing
-14,958,3216186114762,-;[IGT] successtest: starting subtest second-subtest
-14,959,3216186114814,-;[IGT] successtest: exiting, ret=0
-6,960,3216186114933,-;Console: switching to colour frame buffer device 240x75
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/1/err.txt b/runner/json_tests_data/warnings-with-dmesg-warns/1/err.txt
deleted file mode 100644
index 57be9f7b..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/1/err.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Starting subtest: second-subtest
-Subtest second-subtest: SUCCESS (0.000s)
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/1/journal.txt b/runner/json_tests_data/warnings-with-dmesg-warns/1/journal.txt
deleted file mode 100644
index 99f57815..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/1/journal.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-second-subtest
-exit:0 (0.013s)
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/1/out.txt b/runner/json_tests_data/warnings-with-dmesg-warns/1/out.txt
deleted file mode 100644
index 24b37244..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/1/out.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-IGT-Version: 1.23-g0c763bfd (x86_64) (Linux: 4.18.0-1-amd64 x86_64)
-Starting subtest: second-subtest
-Subtest second-subtest: SUCCESS (0.000s)
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/2/dmesg.txt b/runner/json_tests_data/warnings-with-dmesg-warns/2/dmesg.txt
deleted file mode 100644
index 998b4797..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/2/dmesg.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-6,961,3216186123400,-;Console: switching to colour dummy device 80x25
-14,962,3216186123414,-;[IGT] no-subtests: executing
-14,963,3216186125204,-;[IGT] no-subtests: exiting, ret=0
-6,964,3216186125374,-;Console: switching to colour frame buffer device 240x75
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/2/err.txt b/runner/json_tests_data/warnings-with-dmesg-warns/2/err.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/2/journal.txt b/runner/json_tests_data/warnings-with-dmesg-warns/2/journal.txt
deleted file mode 100644
index 7151877f..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/2/journal.txt
+++ /dev/null
@@ -1 +0,0 @@
-exit:0 (0.010s)
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/2/out.txt b/runner/json_tests_data/warnings-with-dmesg-warns/2/out.txt
deleted file mode 100644
index 695b67c2..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/2/out.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-IGT-Version: 1.23-g0c763bfd (x86_64) (Linux: 4.18.0-1-amd64 x86_64)
-SUCCESS (0.000s)
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/3/dmesg.txt b/runner/json_tests_data/warnings-with-dmesg-warns/3/dmesg.txt
deleted file mode 100644
index 21e75031..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/3/dmesg.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-6,965,3216186135188,-;Console: switching to colour dummy device 80x25
-14,966,3216186135212,-;[IGT] skippers: executing
-14,967,3216186137075,-;[IGT] skippers: exiting, ret=77
-6,968,3216186137206,-;Console: switching to colour frame buffer device 240x75
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/3/err.txt b/runner/json_tests_data/warnings-with-dmesg-warns/3/err.txt
deleted file mode 100644
index 59b73d09..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/3/err.txt
+++ /dev/null
@@ -1 +0,0 @@
-Subtest skip-one: SKIP
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/3/journal.txt b/runner/json_tests_data/warnings-with-dmesg-warns/3/journal.txt
deleted file mode 100644
index afab8ba6..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/3/journal.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-skip-one
-exit:77 (0.011s)
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/3/out.txt b/runner/json_tests_data/warnings-with-dmesg-warns/3/out.txt
deleted file mode 100644
index 96284e78..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/3/out.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-IGT-Version: 1.23-g0c763bfd (x86_64) (Linux: 4.18.0-1-amd64 x86_64)
-Test requirement not met in function __real_main3, file ../runner/testdata/skippers.c:6:
-Test requirement: false
-Skipping from fixture
-Last errno: 2, No such file or directory
-Subtest skip-one: SKIP
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/4/dmesg.txt b/runner/json_tests_data/warnings-with-dmesg-warns/4/dmesg.txt
deleted file mode 100644
index 737bc692..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/4/dmesg.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-6,969,3216186145899,-;Console: switching to colour dummy device 80x25
-14,970,3216186145912,-;[IGT] skippers: executing
-14,971,3216186147754,-;[IGT] skippers: exiting, ret=77
-6,972,3216186147894,-;Console: switching to colour frame buffer device 240x75
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/4/err.txt b/runner/json_tests_data/warnings-with-dmesg-warns/4/err.txt
deleted file mode 100644
index 2251da1e..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/4/err.txt
+++ /dev/null
@@ -1 +0,0 @@
-Subtest skip-two: SKIP
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/4/journal.txt b/runner/json_tests_data/warnings-with-dmesg-warns/4/journal.txt
deleted file mode 100644
index a9dba132..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/4/journal.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-skip-two
-exit:77 (0.010s)
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/4/out.txt b/runner/json_tests_data/warnings-with-dmesg-warns/4/out.txt
deleted file mode 100644
index 2024db8f..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/4/out.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-IGT-Version: 1.23-g0c763bfd (x86_64) (Linux: 4.18.0-1-amd64 x86_64)
-Test requirement not met in function __real_main3, file ../runner/testdata/skippers.c:6:
-Test requirement: false
-Skipping from fixture
-Last errno: 2, No such file or directory
-Subtest skip-two: SKIP
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/README.txt b/runner/json_tests_data/warnings-with-dmesg-warns/README.txt
deleted file mode 100644
index 7ef9ee73..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-A test that has output in stderr should result in 'warn' instead of
-'pass'. But if there is a message in the kernel logs that would make
-the result 'dmesg-warn' instead, that takes priority over 'warn'.
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/endtime.txt b/runner/json_tests_data/warnings-with-dmesg-warns/endtime.txt
deleted file mode 100644
index 635f6ae9..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/endtime.txt
+++ /dev/null
@@ -1 +0,0 @@
-1539953735.172373
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/joblist.txt b/runner/json_tests_data/warnings-with-dmesg-warns/joblist.txt
deleted file mode 100644
index 31ef8413..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/joblist.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-successtest first-subtest
-successtest second-subtest
-no-subtests
-skippers skip-one
-skippers skip-two
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/metadata.txt b/runner/json_tests_data/warnings-with-dmesg-warns/metadata.txt
deleted file mode 100644
index 1316560d..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/metadata.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-abort_on_error : 0
-name : normal-run
-dry_run : 0
-sync : 0
-log_level : 0
-overwrite : 0
-multiple_mode : 0
-inactivity_timeout : 0
-use_watchdog : 0
-piglit_style_dmesg : 0
-test_root : /path/does/not/exist
-results_path : /path/does/not/exist
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/reference.json b/runner/json_tests_data/warnings-with-dmesg-warns/reference.json
deleted file mode 100644
index 9e027efb..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/reference.json
+++ /dev/null
@@ -1,159 +0,0 @@
-{
- "__type__":"TestrunResult",
- "results_version":9,
- "name":"normal-run",
- "uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
- "time_elapsed":{
- "__type__":"TimeAttribute",
- "start":1539953735.1110389,
- "end":1539953735.1723731
- },
- "tests":{
- "igt@successtest@first-subtest":{
- "out":"Starting subtest: first-subtest\nSubtest first-subtest: SUCCESS (0.000s)\n",
- "igt-version":"IGT-Version: 1.23-g0c763bfd (x86_64) (Linux: 4.18.0-1-amd64 x86_64)",
- "result":"dmesg-warn",
- "time":{
- "__type__":"TimeAttribute",
- "start":0,
- "end":0
- },
- "err":"Starting subtest: first-subtest\nThis is a warning line\nSubtest first-subtest: SUCCESS (0.000s)\n",
- "dmesg":"<6> [3216186.095083] Console: switching to colour dummy device 80x25\n<6> [3216186.095097] [IGT] successtest: executing\n<6> [3216186.101115] [IGT] successtest: starting subtest first-subtest\n<3> [3216186.101159] Warning from kernel\n<6> [3216186.101160] [IGT] successtest: exiting, ret=0\n<6> [3216186.101299] Console: switching to colour frame buffer device 240x75\n",
- "dmesg-warnings":"<3> [3216186.101159] Warning from kernel\n"
- },
- "igt@successtest@second-subtest":{
- "out":"Starting subtest: second-subtest\nSubtest second-subtest: SUCCESS (0.000s)\n",
- "igt-version":"IGT-Version: 1.23-g0c763bfd (x86_64) (Linux: 4.18.0-1-amd64 x86_64)",
- "result":"pass",
- "time":{
- "__type__":"TimeAttribute",
- "start":0,
- "end":0
- },
- "err":"Starting subtest: second-subtest\nSubtest second-subtest: SUCCESS (0.000s)\n",
- "dmesg":"<6> [3216186.111837] Console: switching to colour dummy device 80x25\n<6> [3216186.111851] [IGT] successtest: executing\n<6> [3216186.114762] [IGT] successtest: starting subtest second-subtest\n<6> [3216186.114814] [IGT] successtest: exiting, ret=0\n<6> [3216186.114933] Console: switching to colour frame buffer device 240x75\n"
- },
- "igt@no-subtests":{
- "time":{
- "__type__":"TimeAttribute",
- "start":0,
- "end":0.01
- },
- "result":"pass",
- "out":"IGT-Version: 1.23-g0c763bfd (x86_64) (Linux: 4.18.0-1-amd64 x86_64)\nSUCCESS (0.000s)\n",
- "igt-version":"IGT-Version: 1.23-g0c763bfd (x86_64) (Linux: 4.18.0-1-amd64 x86_64)",
- "err":"",
- "dmesg":"<6> [3216186.123400] Console: switching to colour dummy device 80x25\n<6> [3216186.123414] [IGT] no-subtests: executing\n<6> [3216186.125204] [IGT] no-subtests: exiting, ret=0\n<6> [3216186.125374] Console: switching to colour frame buffer device 240x75\n"
- },
- "igt@skippers@skip-one":{
- "out":"Test requirement not met in function __real_main3, file ..\/runner\/testdata\/skippers.c:6:\nTest requirement: false\nSkipping from fixture\nLast errno: 2, No such file or directory\nSubtest skip-one: SKIP\n",
- "igt-version":"IGT-Version: 1.23-g0c763bfd (x86_64) (Linux: 4.18.0-1-amd64 x86_64)",
- "result":"skip",
- "time":{
- "__type__":"TimeAttribute",
- "start":0,
- "end":0
- },
- "err":"Subtest skip-one: SKIP\n",
- "dmesg":"<6> [3216186.135188] Console: switching to colour dummy device 80x25\n<6> [3216186.135212] [IGT] skippers: executing\n<6> [3216186.137075] [IGT] skippers: exiting, ret=77\n<6> [3216186.137206] Console: switching to colour frame buffer device 240x75\n"
- },
- "igt@skippers@skip-two":{
- "out":"Test requirement not met in function __real_main3, file ..\/runner\/testdata\/skippers.c:6:\nTest requirement: false\nSkipping from fixture\nLast errno: 2, No such file or directory\nSubtest skip-two: SKIP\n",
- "igt-version":"IGT-Version: 1.23-g0c763bfd (x86_64) (Linux: 4.18.0-1-amd64 x86_64)",
- "result":"skip",
- "time":{
- "__type__":"TimeAttribute",
- "start":0,
- "end":0
- },
- "err":"Subtest skip-two: SKIP\n",
- "dmesg":"<6> [3216186.145899] Console: switching to colour dummy device 80x25\n<6> [3216186.145912] [IGT] skippers: executing\n<6> [3216186.147754] [IGT] skippers: exiting, ret=77\n<6> [3216186.147894] Console: switching to colour frame buffer device 240x75\n"
- }
- },
- "totals":{
- "":{
- "crash":0,
- "pass":2,
- "dmesg-fail":0,
- "dmesg-warn":1,
- "skip":2,
- "incomplete":0,
- "timeout":0,
- "notrun":0,
- "fail":0,
- "warn":0
- },
- "root":{
- "crash":0,
- "pass":2,
- "dmesg-fail":0,
- "dmesg-warn":1,
- "skip":2,
- "incomplete":0,
- "timeout":0,
- "notrun":0,
- "fail":0,
- "warn":0
- },
- "igt@successtest":{
- "crash":0,
- "pass":1,
- "dmesg-fail":0,
- "dmesg-warn":1,
- "skip":0,
- "incomplete":0,
- "timeout":0,
- "notrun":0,
- "fail":0,
- "warn":0
- },
- "igt@no-subtests":{
- "crash":0,
- "pass":1,
- "dmesg-fail":0,
- "dmesg-warn":0,
- "skip":0,
- "incomplete":0,
- "timeout":0,
- "notrun":0,
- "fail":0,
- "warn":0
- },
- "igt@skippers":{
- "crash":0,
- "pass":0,
- "dmesg-fail":0,
- "dmesg-warn":0,
- "skip":2,
- "incomplete":0,
- "timeout":0,
- "notrun":0,
- "fail":0,
- "warn":0
- }
- },
- "runtimes":{
- "igt@successtest":{
- "time":{
- "__type__":"TimeAttribute",
- "start":0,
- "end":0.027
- }
- },
- "igt@no-subtests":{
- "time":{
- "__type__":"TimeAttribute",
- "start":0,
- "end":0.01
- }
- },
- "igt@skippers":{
- "time":{
- "__type__":"TimeAttribute",
- "start":0,
- "end":0.020999999999999998
- }
- }
- }
-}
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/starttime.txt b/runner/json_tests_data/warnings-with-dmesg-warns/starttime.txt
deleted file mode 100644
index ae038f18..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/starttime.txt
+++ /dev/null
@@ -1 +0,0 @@
-1539953735.111039
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/uname.txt b/runner/json_tests_data/warnings-with-dmesg-warns/uname.txt
deleted file mode 100644
index a7aef6f7..00000000
--- a/runner/json_tests_data/warnings-with-dmesg-warns/uname.txt
+++ /dev/null
@@ -1 +0,0 @@
-Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64
diff --git a/runner/runner_json_tests.c b/runner/runner_json_tests.c
index 758700d4..7f8469e4 100644
--- a/runner/runner_json_tests.c
+++ b/runner/runner_json_tests.c
@@ -150,7 +150,6 @@ static void run_results_and_compare(int dirfd, const char *dirname)
static const char *dirnames[] = {
"normal-run",
"warnings",
- "warnings-with-dmesg-warns",
"piglit-style-dmesg",
"incomplete-before-any-subtests",
"dmesg-results",
--
2.18.0