From ec9792ad770d5055d6f42e2a481b8314754c9218 Mon Sep 17 00:00:00 2001 From: Arkadiusz Hiler Date: Mon, 1 Apr 2019 09:40:28 +0300 Subject: runner: Add --dmesg-warn-level switch This switch allows users to select which dmesg log level is treated as warning resulting in overriding the test results to dmesg-fail/dmesg-warn. Signed-off-by: Arkadiusz Hiler Reviewed-by: Petri Latvala --- .../dmesg-warn-level-piglit-style/0/dmesg.txt | 6 ++ .../dmesg-warn-level-piglit-style/0/err.txt | 2 + .../dmesg-warn-level-piglit-style/0/journal.txt | 2 + .../dmesg-warn-level-piglit-style/0/out.txt | 3 + .../dmesg-warn-level-piglit-style/README.txt | 7 +++ .../dmesg-warn-level-piglit-style/endtime.txt | 1 + .../dmesg-warn-level-piglit-style/joblist.txt | 1 + .../dmesg-warn-level-piglit-style/metadata.txt | 13 ++++ .../dmesg-warn-level-piglit-style/reference.json | 73 ++++++++++++++++++++++ .../dmesg-warn-level-piglit-style/starttime.txt | 1 + .../dmesg-warn-level-piglit-style/uname.txt | 1 + 11 files changed, 110 insertions(+) create mode 100644 runner/json_tests_data/dmesg-warn-level-piglit-style/0/dmesg.txt create mode 100644 runner/json_tests_data/dmesg-warn-level-piglit-style/0/err.txt create mode 100644 runner/json_tests_data/dmesg-warn-level-piglit-style/0/journal.txt create mode 100644 runner/json_tests_data/dmesg-warn-level-piglit-style/0/out.txt create mode 100644 runner/json_tests_data/dmesg-warn-level-piglit-style/README.txt create mode 100644 runner/json_tests_data/dmesg-warn-level-piglit-style/endtime.txt create mode 100644 runner/json_tests_data/dmesg-warn-level-piglit-style/joblist.txt create mode 100644 runner/json_tests_data/dmesg-warn-level-piglit-style/metadata.txt create mode 100644 runner/json_tests_data/dmesg-warn-level-piglit-style/reference.json create mode 100644 runner/json_tests_data/dmesg-warn-level-piglit-style/starttime.txt create mode 100644 runner/json_tests_data/dmesg-warn-level-piglit-style/uname.txt (limited to 'runner/json_tests_data/dmesg-warn-level-piglit-style') diff --git a/runner/json_tests_data/dmesg-warn-level-piglit-style/0/dmesg.txt b/runner/json_tests_data/dmesg-warn-level-piglit-style/0/dmesg.txt new file mode 100644 index 00000000..546a29ff --- /dev/null +++ b/runner/json_tests_data/dmesg-warn-level-piglit-style/0/dmesg.txt @@ -0,0 +1,6 @@ +15,952,3216186095097,-;[IGT] successtest: executing +15,953,3216186101115,-;[IGT] successtest: starting subtest first-subtest +6,951,3216186095083,-;drm_ KERN_INFO, should be a warning here too +7,952,3216186095097,-;drm_ KERN_DEBUG, should not be a warning +4,953,3216186101159,-;drm_ A proper KERN_WARNING +15,955,3216186101160,-;[IGT] successtest: exiting, ret=0 diff --git a/runner/json_tests_data/dmesg-warn-level-piglit-style/0/err.txt b/runner/json_tests_data/dmesg-warn-level-piglit-style/0/err.txt new file mode 100644 index 00000000..5dc78057 --- /dev/null +++ b/runner/json_tests_data/dmesg-warn-level-piglit-style/0/err.txt @@ -0,0 +1,2 @@ +Starting subtest: first-subtest +Subtest first-subtest: SUCCESS (0.000s) diff --git a/runner/json_tests_data/dmesg-warn-level-piglit-style/0/journal.txt b/runner/json_tests_data/dmesg-warn-level-piglit-style/0/journal.txt new file mode 100644 index 00000000..86a30e07 --- /dev/null +++ b/runner/json_tests_data/dmesg-warn-level-piglit-style/0/journal.txt @@ -0,0 +1,2 @@ +first-subtest +exit:0 (0.014s) diff --git a/runner/json_tests_data/dmesg-warn-level-piglit-style/0/out.txt b/runner/json_tests_data/dmesg-warn-level-piglit-style/0/out.txt new file mode 100644 index 00000000..5946bf31 --- /dev/null +++ b/runner/json_tests_data/dmesg-warn-level-piglit-style/0/out.txt @@ -0,0 +1,3 @@ +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/dmesg-warn-level-piglit-style/README.txt b/runner/json_tests_data/dmesg-warn-level-piglit-style/README.txt new file mode 100644 index 00000000..d2981708 --- /dev/null +++ b/runner/json_tests_data/dmesg-warn-level-piglit-style/README.txt @@ -0,0 +1,7 @@ +When --dmesg-warn-level is set to 6 also KERN_INFO level messages should be +treated as warnings triggering a result change to dmesg-warn/dmesg-fail. + +This makes sure that the piglit-style-dmesg does not clash with +dmesg-warn-level. All the messages are prefixed with drm_ to fit the filters. + +IGT messages were artificially bumped to KERN_DEBUG to not pollute the warnings. diff --git a/runner/json_tests_data/dmesg-warn-level-piglit-style/endtime.txt b/runner/json_tests_data/dmesg-warn-level-piglit-style/endtime.txt new file mode 100644 index 00000000..635f6ae9 --- /dev/null +++ b/runner/json_tests_data/dmesg-warn-level-piglit-style/endtime.txt @@ -0,0 +1 @@ +1539953735.172373 diff --git a/runner/json_tests_data/dmesg-warn-level-piglit-style/joblist.txt b/runner/json_tests_data/dmesg-warn-level-piglit-style/joblist.txt new file mode 100644 index 00000000..81f914a7 --- /dev/null +++ b/runner/json_tests_data/dmesg-warn-level-piglit-style/joblist.txt @@ -0,0 +1 @@ +successtest first-subtest diff --git a/runner/json_tests_data/dmesg-warn-level-piglit-style/metadata.txt b/runner/json_tests_data/dmesg-warn-level-piglit-style/metadata.txt new file mode 100644 index 00000000..b05377a9 --- /dev/null +++ b/runner/json_tests_data/dmesg-warn-level-piglit-style/metadata.txt @@ -0,0 +1,13 @@ +abort_mask : 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 : 1 +dmesg_warn_level : 6 +test_root : /path/does/not/exist +results_path : /path/does/not/exist diff --git a/runner/json_tests_data/dmesg-warn-level-piglit-style/reference.json b/runner/json_tests_data/dmesg-warn-level-piglit-style/reference.json new file mode 100644 index 00000000..8cd2eeee --- /dev/null +++ b/runner/json_tests_data/dmesg-warn-level-piglit-style/reference.json @@ -0,0 +1,73 @@ +{ + "__type__":"TestrunResult", + "results_version":10, + "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.0, + "end":0.0 + }, + "err":"Starting subtest: first-subtest\nSubtest first-subtest: SUCCESS (0.000s)\n", + "dmesg":"<7> [3216186.095097] [IGT] successtest: executing\n<7> [3216186.101115] [IGT] successtest: starting subtest first-subtest\n<6> [3216186.095083] drm_ KERN_INFO, should be a warning here too\n<7> [3216186.095097] drm_ KERN_DEBUG, should not be a warning\n<4> [3216186.101159] drm_ A proper KERN_WARNING\n<7> [3216186.101160] [IGT] successtest: exiting, ret=0\n", + "dmesg-warnings":"<6> [3216186.095083] drm_ KERN_INFO, should be a warning here too\n<4> [3216186.101159] drm_ A proper KERN_WARNING\n" + } + }, + "totals":{ + "":{ + "crash":0, + "pass":0, + "dmesg-fail":0, + "dmesg-warn":1, + "skip":0, + "incomplete":0, + "timeout":0, + "notrun":0, + "fail":0, + "warn":0 + }, + "root":{ + "crash":0, + "pass":0, + "dmesg-fail":0, + "dmesg-warn":1, + "skip":0, + "incomplete":0, + "timeout":0, + "notrun":0, + "fail":0, + "warn":0 + }, + "igt@successtest":{ + "crash":0, + "pass":0, + "dmesg-fail":0, + "dmesg-warn":1, + "skip":0, + "incomplete":0, + "timeout":0, + "notrun":0, + "fail":0, + "warn":0 + } + }, + "runtimes":{ + "igt@successtest":{ + "time":{ + "__type__":"TimeAttribute", + "start":0.0, + "end":0.014 + } + } + } +} \ No newline at end of file diff --git a/runner/json_tests_data/dmesg-warn-level-piglit-style/starttime.txt b/runner/json_tests_data/dmesg-warn-level-piglit-style/starttime.txt new file mode 100644 index 00000000..ae038f18 --- /dev/null +++ b/runner/json_tests_data/dmesg-warn-level-piglit-style/starttime.txt @@ -0,0 +1 @@ +1539953735.111039 diff --git a/runner/json_tests_data/dmesg-warn-level-piglit-style/uname.txt b/runner/json_tests_data/dmesg-warn-level-piglit-style/uname.txt new file mode 100644 index 00000000..a7aef6f7 --- /dev/null +++ b/runner/json_tests_data/dmesg-warn-level-piglit-style/uname.txt @@ -0,0 +1 @@ +Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64 -- cgit v1.2.3