From 111593c49d812a4f4ff9ab0ef053a3ab88a6f73f Mon Sep 17 00:00:00 2001 From: Petri Latvala Date: Fri, 9 Nov 2018 13:13:03 +0200 Subject: runner: Implement --abort-on-monitored-error Deviating a bit from the piglit command line flag, igt_runner takes an optional comma-separated list as an argument to --abort-on-monitored-error for the list of conditions to abort on. Without a list all possible conditions will be checked. Two conditions implemented: - "taint" checks the kernel taint level for TAINT_PAGE, TAINT_DIE and TAINT_OOPS - "lockdep" checks the kernel lockdep status Checking is done after every test binary execution, and if an abort condition is met, the reason is printed to stderr (unless log level is quiet) and the runner doesn't execute any further tests. Aborting between subtests (when running in --multiple-mode) is not done. v2: - Remember to fclose - Taints are unsigned long (Chris) - Use getline instead of fgets (Chris) v3: - Fix brainfart with lockdep v4: - Rebase - Refactor the abort condition checking to pass down strings - Present the abort result in results.json as a pseudo test result - Unit tests for the pseudo result v5: - Refactors (Chris) - Don't claim lockdep was triggered if debug_locks is not on anymore. Just say it's not active. - Dump lockdep_stats when aborting due to lockdep (Chris) - Use igt@runner@aborted instead for the pseudo result (Martin) v6: - If aborting after a test, generate results.json. Like was already done for aborting at startup. - Print the test that would be executed next as well when aborting, as requested by Tomi. v7: - Remove the resolved TODO item from commit message Signed-off-by: Petri Latvala Cc: Arkadiusz Hiler Cc: Tomi Sarvela Cc: Martin Peres Cc: Daniel Vetter Cc: Chris Wilson Reviewed-by: Arkadiusz Hiler --- .../aborted-after-a-test/0/dmesg.txt | 5 ++ .../json_tests_data/aborted-after-a-test/0/err.txt | 2 + .../aborted-after-a-test/0/journal.txt | 2 + .../json_tests_data/aborted-after-a-test/0/out.txt | 3 + .../aborted-after-a-test/README.txt | 1 + .../aborted-after-a-test/aborted.txt | 3 + .../aborted-after-a-test/endtime.txt | 1 + .../aborted-after-a-test/joblist.txt | 5 ++ .../aborted-after-a-test/metadata.txt | 12 +++ .../aborted-after-a-test/reference.json | 90 ++++++++++++++++++++++ .../aborted-after-a-test/starttime.txt | 1 + .../json_tests_data/aborted-after-a-test/uname.txt | 1 + runner/json_tests_data/aborted-on-boot/README.txt | 1 + runner/json_tests_data/aborted-on-boot/aborted.txt | 3 + runner/json_tests_data/aborted-on-boot/endtime.txt | 1 + runner/json_tests_data/aborted-on-boot/joblist.txt | 5 ++ .../json_tests_data/aborted-on-boot/metadata.txt | 12 +++ .../json_tests_data/aborted-on-boot/reference.json | 59 ++++++++++++++ .../json_tests_data/aborted-on-boot/starttime.txt | 1 + runner/json_tests_data/aborted-on-boot/uname.txt | 1 + runner/json_tests_data/dmesg-results/metadata.txt | 2 +- .../incomplete-before-any-subtests/metadata.txt | 2 +- runner/json_tests_data/normal-run/metadata.txt | 2 +- .../piglit-style-dmesg/metadata.txt | 2 +- .../warnings-with-dmesg-warns/metadata.txt | 2 +- runner/json_tests_data/warnings/metadata.txt | 2 +- 26 files changed, 215 insertions(+), 6 deletions(-) create mode 100644 runner/json_tests_data/aborted-after-a-test/0/dmesg.txt create mode 100644 runner/json_tests_data/aborted-after-a-test/0/err.txt create mode 100644 runner/json_tests_data/aborted-after-a-test/0/journal.txt create mode 100644 runner/json_tests_data/aborted-after-a-test/0/out.txt create mode 100644 runner/json_tests_data/aborted-after-a-test/README.txt create mode 100644 runner/json_tests_data/aborted-after-a-test/aborted.txt create mode 100644 runner/json_tests_data/aborted-after-a-test/endtime.txt create mode 100644 runner/json_tests_data/aborted-after-a-test/joblist.txt create mode 100644 runner/json_tests_data/aborted-after-a-test/metadata.txt create mode 100644 runner/json_tests_data/aborted-after-a-test/reference.json create mode 100644 runner/json_tests_data/aborted-after-a-test/starttime.txt create mode 100644 runner/json_tests_data/aborted-after-a-test/uname.txt create mode 100644 runner/json_tests_data/aborted-on-boot/README.txt create mode 100644 runner/json_tests_data/aborted-on-boot/aborted.txt create mode 100644 runner/json_tests_data/aborted-on-boot/endtime.txt create mode 100644 runner/json_tests_data/aborted-on-boot/joblist.txt create mode 100644 runner/json_tests_data/aborted-on-boot/metadata.txt create mode 100644 runner/json_tests_data/aborted-on-boot/reference.json create mode 100644 runner/json_tests_data/aborted-on-boot/starttime.txt create mode 100644 runner/json_tests_data/aborted-on-boot/uname.txt (limited to 'runner/json_tests_data') diff --git a/runner/json_tests_data/aborted-after-a-test/0/dmesg.txt b/runner/json_tests_data/aborted-after-a-test/0/dmesg.txt new file mode 100644 index 00000000..a189e704 --- /dev/null +++ b/runner/json_tests_data/aborted-after-a-test/0/dmesg.txt @@ -0,0 +1,5 @@ +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 +14,954,3216186101160,-;[IGT] successtest: exiting, ret=0 +6,955,3216186101299,-;Console: switching to colour frame buffer device 240x75 diff --git a/runner/json_tests_data/aborted-after-a-test/0/err.txt b/runner/json_tests_data/aborted-after-a-test/0/err.txt new file mode 100644 index 00000000..5dc78057 --- /dev/null +++ b/runner/json_tests_data/aborted-after-a-test/0/err.txt @@ -0,0 +1,2 @@ +Starting subtest: first-subtest +Subtest first-subtest: SUCCESS (0.000s) diff --git a/runner/json_tests_data/aborted-after-a-test/0/journal.txt b/runner/json_tests_data/aborted-after-a-test/0/journal.txt new file mode 100644 index 00000000..86a30e07 --- /dev/null +++ b/runner/json_tests_data/aborted-after-a-test/0/journal.txt @@ -0,0 +1,2 @@ +first-subtest +exit:0 (0.014s) diff --git a/runner/json_tests_data/aborted-after-a-test/0/out.txt b/runner/json_tests_data/aborted-after-a-test/0/out.txt new file mode 100644 index 00000000..5946bf31 --- /dev/null +++ b/runner/json_tests_data/aborted-after-a-test/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/aborted-after-a-test/README.txt b/runner/json_tests_data/aborted-after-a-test/README.txt new file mode 100644 index 00000000..1ad89053 --- /dev/null +++ b/runner/json_tests_data/aborted-after-a-test/README.txt @@ -0,0 +1 @@ +A run that aborted after running the first test. diff --git a/runner/json_tests_data/aborted-after-a-test/aborted.txt b/runner/json_tests_data/aborted-after-a-test/aborted.txt new file mode 100644 index 00000000..3c8f2707 --- /dev/null +++ b/runner/json_tests_data/aborted-after-a-test/aborted.txt @@ -0,0 +1,3 @@ +Aborted after: successtest (first-subtest) + +Kernel tainted (0x200) diff --git a/runner/json_tests_data/aborted-after-a-test/endtime.txt b/runner/json_tests_data/aborted-after-a-test/endtime.txt new file mode 100644 index 00000000..635f6ae9 --- /dev/null +++ b/runner/json_tests_data/aborted-after-a-test/endtime.txt @@ -0,0 +1 @@ +1539953735.172373 diff --git a/runner/json_tests_data/aborted-after-a-test/joblist.txt b/runner/json_tests_data/aborted-after-a-test/joblist.txt new file mode 100644 index 00000000..31ef8413 --- /dev/null +++ b/runner/json_tests_data/aborted-after-a-test/joblist.txt @@ -0,0 +1,5 @@ +successtest first-subtest +successtest second-subtest +no-subtests +skippers skip-one +skippers skip-two diff --git a/runner/json_tests_data/aborted-after-a-test/metadata.txt b/runner/json_tests_data/aborted-after-a-test/metadata.txt new file mode 100644 index 00000000..785076e9 --- /dev/null +++ b/runner/json_tests_data/aborted-after-a-test/metadata.txt @@ -0,0 +1,12 @@ +abort_mask : 3 +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/aborted-after-a-test/reference.json b/runner/json_tests_data/aborted-after-a-test/reference.json new file mode 100644 index 00000000..1e08deca --- /dev/null +++ b/runner/json_tests_data/aborted-after-a-test/reference.json @@ -0,0 +1,90 @@ +{ + "__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":"pass", + "time":{ + "__type__":"TimeAttribute", + "start":0, + "end":0 + }, + "err":"Starting subtest: first-subtest\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<6> [3216186.101160] [IGT] successtest: exiting, ret=0\n<6> [3216186.101299] Console: switching to colour frame buffer device 240x75\n" + }, + "igt@runner@aborted":{ + "out":"Aborted after: successtest (first-subtest)\n\nKernel tainted (0x200)\n", + "result":"fail", + "err":"", + "dmesg":"", + } + }, + "totals":{ + "":{ + "crash":0, + "pass":1, + "dmesg-fail":0, + "dmesg-warn":0, + "skip":0, + "incomplete":0, + "timeout":0, + "notrun":0, + "fail":1, + "warn":0 + }, + "root":{ + "crash":0, + "pass":1, + "dmesg-fail":0, + "dmesg-warn":0, + "skip":0, + "incomplete":0, + "timeout":0, + "notrun":0, + "fail":1, + "warn":0 + }, + "igt@successtest":{ + "crash":0, + "pass":1, + "dmesg-fail":0, + "dmesg-warn":0, + "skip":0, + "incomplete":0, + "timeout":0, + "notrun":0, + "fail":0, + "warn":0 + }, + "igt@runner":{ + "crash":0, + "pass":0, + "dmesg-fail":0, + "dmesg-warn":0, + "skip":0, + "incomplete":0, + "timeout":0, + "notrun":0, + "fail":1, + "warn":0 + }, + }, + "runtimes":{ + "igt@successtest":{ + "time":{ + "__type__":"TimeAttribute", + "start":0, + "end":0.014 + } + }, + } +} diff --git a/runner/json_tests_data/aborted-after-a-test/starttime.txt b/runner/json_tests_data/aborted-after-a-test/starttime.txt new file mode 100644 index 00000000..ae038f18 --- /dev/null +++ b/runner/json_tests_data/aborted-after-a-test/starttime.txt @@ -0,0 +1 @@ +1539953735.111039 diff --git a/runner/json_tests_data/aborted-after-a-test/uname.txt b/runner/json_tests_data/aborted-after-a-test/uname.txt new file mode 100644 index 00000000..a7aef6f7 --- /dev/null +++ b/runner/json_tests_data/aborted-after-a-test/uname.txt @@ -0,0 +1 @@ +Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64 diff --git a/runner/json_tests_data/aborted-on-boot/README.txt b/runner/json_tests_data/aborted-on-boot/README.txt new file mode 100644 index 00000000..e957c40f --- /dev/null +++ b/runner/json_tests_data/aborted-on-boot/README.txt @@ -0,0 +1 @@ +A run that aborted before running any tests. diff --git a/runner/json_tests_data/aborted-on-boot/aborted.txt b/runner/json_tests_data/aborted-on-boot/aborted.txt new file mode 100644 index 00000000..4a1c1a32 --- /dev/null +++ b/runner/json_tests_data/aborted-on-boot/aborted.txt @@ -0,0 +1,3 @@ +Aborted after: startup + +Kernel tainted (0x200) diff --git a/runner/json_tests_data/aborted-on-boot/endtime.txt b/runner/json_tests_data/aborted-on-boot/endtime.txt new file mode 100644 index 00000000..635f6ae9 --- /dev/null +++ b/runner/json_tests_data/aborted-on-boot/endtime.txt @@ -0,0 +1 @@ +1539953735.172373 diff --git a/runner/json_tests_data/aborted-on-boot/joblist.txt b/runner/json_tests_data/aborted-on-boot/joblist.txt new file mode 100644 index 00000000..31ef8413 --- /dev/null +++ b/runner/json_tests_data/aborted-on-boot/joblist.txt @@ -0,0 +1,5 @@ +successtest first-subtest +successtest second-subtest +no-subtests +skippers skip-one +skippers skip-two diff --git a/runner/json_tests_data/aborted-on-boot/metadata.txt b/runner/json_tests_data/aborted-on-boot/metadata.txt new file mode 100644 index 00000000..785076e9 --- /dev/null +++ b/runner/json_tests_data/aborted-on-boot/metadata.txt @@ -0,0 +1,12 @@ +abort_mask : 3 +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/aborted-on-boot/reference.json b/runner/json_tests_data/aborted-on-boot/reference.json new file mode 100644 index 00000000..bfaee1bb --- /dev/null +++ b/runner/json_tests_data/aborted-on-boot/reference.json @@ -0,0 +1,59 @@ +{ + "__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@runner@aborted":{ + "out":"Aborted after: startup\n\nKernel tainted (0x200)\n", + "result":"fail", + "err":"", + "dmesg":"", + } + }, + "totals":{ + "":{ + "crash":0, + "pass":0, + "dmesg-fail":0, + "dmesg-warn":0, + "skip":0, + "incomplete":0, + "timeout":0, + "notrun":0, + "fail":1, + "warn":0 + }, + "root":{ + "crash":0, + "pass":0, + "dmesg-fail":0, + "dmesg-warn":0, + "skip":0, + "incomplete":0, + "timeout":0, + "notrun":0, + "fail":1, + "warn":0 + }, + "igt@runner":{ + "crash":0, + "pass":0, + "dmesg-fail":0, + "dmesg-warn":0, + "skip":0, + "incomplete":0, + "timeout":0, + "notrun":0, + "fail":1, + "warn":0 + }, + }, + "runtimes":{ + } +} diff --git a/runner/json_tests_data/aborted-on-boot/starttime.txt b/runner/json_tests_data/aborted-on-boot/starttime.txt new file mode 100644 index 00000000..ae038f18 --- /dev/null +++ b/runner/json_tests_data/aborted-on-boot/starttime.txt @@ -0,0 +1 @@ +1539953735.111039 diff --git a/runner/json_tests_data/aborted-on-boot/uname.txt b/runner/json_tests_data/aborted-on-boot/uname.txt new file mode 100644 index 00000000..a7aef6f7 --- /dev/null +++ b/runner/json_tests_data/aborted-on-boot/uname.txt @@ -0,0 +1 @@ +Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64 diff --git a/runner/json_tests_data/dmesg-results/metadata.txt b/runner/json_tests_data/dmesg-results/metadata.txt index 1316560d..c501ae0e 100644 --- a/runner/json_tests_data/dmesg-results/metadata.txt +++ b/runner/json_tests_data/dmesg-results/metadata.txt @@ -1,4 +1,4 @@ -abort_on_error : 0 +abort_mask : 0 name : normal-run dry_run : 0 sync : 0 diff --git a/runner/json_tests_data/incomplete-before-any-subtests/metadata.txt b/runner/json_tests_data/incomplete-before-any-subtests/metadata.txt index 1316560d..c501ae0e 100644 --- a/runner/json_tests_data/incomplete-before-any-subtests/metadata.txt +++ b/runner/json_tests_data/incomplete-before-any-subtests/metadata.txt @@ -1,4 +1,4 @@ -abort_on_error : 0 +abort_mask : 0 name : normal-run dry_run : 0 sync : 0 diff --git a/runner/json_tests_data/normal-run/metadata.txt b/runner/json_tests_data/normal-run/metadata.txt index 1316560d..c501ae0e 100644 --- a/runner/json_tests_data/normal-run/metadata.txt +++ b/runner/json_tests_data/normal-run/metadata.txt @@ -1,4 +1,4 @@ -abort_on_error : 0 +abort_mask : 0 name : normal-run dry_run : 0 sync : 0 diff --git a/runner/json_tests_data/piglit-style-dmesg/metadata.txt b/runner/json_tests_data/piglit-style-dmesg/metadata.txt index 7f1372c1..3eca78cd 100644 --- a/runner/json_tests_data/piglit-style-dmesg/metadata.txt +++ b/runner/json_tests_data/piglit-style-dmesg/metadata.txt @@ -1,4 +1,4 @@ -abort_on_error : 0 +abort_mask : 0 name : normal-run dry_run : 0 sync : 0 diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/metadata.txt b/runner/json_tests_data/warnings-with-dmesg-warns/metadata.txt index 1316560d..c501ae0e 100644 --- a/runner/json_tests_data/warnings-with-dmesg-warns/metadata.txt +++ b/runner/json_tests_data/warnings-with-dmesg-warns/metadata.txt @@ -1,4 +1,4 @@ -abort_on_error : 0 +abort_mask : 0 name : normal-run dry_run : 0 sync : 0 diff --git a/runner/json_tests_data/warnings/metadata.txt b/runner/json_tests_data/warnings/metadata.txt index 1316560d..c501ae0e 100644 --- a/runner/json_tests_data/warnings/metadata.txt +++ b/runner/json_tests_data/warnings/metadata.txt @@ -1,4 +1,4 @@ -abort_on_error : 0 +abort_mask : 0 name : normal-run dry_run : 0 sync : 0 -- cgit v1.2.3