lib/tests: Extract fork helpers
Subsystems (2)
PATCH 1/9 lib/tests: Extract fork helpers
Because of excessive 'copy and paste' we ended up with multiple copies of almost the same fork helper. This patch extracts the do_fork helper out and switches all the tests over to it.
Additionally, preemptively I have extracted the more fancy fork helper that captures stderr/out + related functions out of igt_describe tests.
--- lib/tests/igt_assert.c | 35 +++---- lib/tests/igt_conflicting_args.c | 25 ++--- lib/tests/igt_describe.c | 135 ++++++--------------------- lib/tests/igt_dynamic_subtests.c | 18 ---- lib/tests/igt_fork.c | 71 ++++++-------- lib/tests/igt_invalid_subtest_name.c | 18 ---- lib/tests/igt_no_exit.c | 18 ---- lib/tests/igt_segfault.c | 59 +++++------- lib/tests/igt_simulation.c | 101 +++++++++----------- lib/tests/igt_tests_common.h | 91 ++++++++++++++++++ 10 files changed, 232 insertions(+), 339 deletions(-)
lib/tests/igt_assert.c +12 -23
@@ -38,8 +38,6 @@#include "igt_tests_common.h" -char test[] ="test" ; -char *argv_run[] = { test };void (*test_to_run)(void ) =NULL ;/*
@@ -55,26 +53,17 @@ void (*test_to_run)(void) = NULL; exec_total++; \ } -static int do_fork (void ) +static void fake_test (void ) { -int pid, status; -int argc; - -switch (pid =fork ()) { -case -1 : -internal_assert (0 ); -case 0 : - argc =ARRAY_SIZE (argv_run); -igt_simple_init (argc, argv_run); -test_to_run (); -igt_exit (); -default : -while (waitpid (pid, &status,0 ) ==-1 && - errno ==EINTR ) - ; - -return status; - } +char test[] ="test" ; +char *argv_run[] = { test }; +int argc =ARRAY_SIZE (argv_run); + +igt_simple_init (argc, argv_run); + +test_to_run (); + +igt_exit (); }static void test_cmpint_negative (void )
@@ -150,7 +139,7 @@ igt_main* we inherit the state from the parent, so ... */ test_to_run = test_cmpint_negative; - ret =do_fork (); + ret =do_fork (fake_test); igt_subtest("igt_cmpint_negative")internal_assert_wexited (ret,IGT_EXIT_FAILURE );
@@ -158,7 +147,7 @@ igt_maintest_fd (); test_to_run = test_fd_negative; - ret =do_fork (); + ret =do_fork (fake_test); igt_subtest("igt_assert_fd_negative")internal_assert_wexited (ret,IGT_EXIT_FAILURE ); }
lib/tests/igt_conflicting_args.c +6 -19
@@ -43,25 +43,12 @@ static int opt_handler(int option, int option_index, void *input)return 0 ; } -static int do_fork (void ) +static void fake_test (void ) {char test_name[] ="test" ; -char *argv[] = { test_name };int argc =ARRAY_SIZE (argv); -pid_t pid =fork (); -internal_assert (pid !=-1 ); - -if (pid) { -int status; -while (waitpid (pid, &status,0 ) ==-1 && errno ==EINTR ) - ; - -return status; - } - -igt_subtest_init_parse_opts (&argc, argv, short_options, long_options,"" , opt_handler,NULL ); igt_subtest("dummy") {}
@@ -73,27 +60,27 @@ int main(int argc, char **argv)/* no conflict */ long_options[0 ] = (struct option ) {"iterations" , required_argument,NULL ,'i' }; short_options ="" ; -internal_assert_wexited (do_fork (),0 ); +internal_assert_wexited (do_fork (fake_test),0 );/* conflict on short option */ long_options[0 ] = (struct option ) {"iterations" , required_argument,NULL ,'i' }; short_options ="h" ; -internal_assert_wsignaled (do_fork (),SIGABRT ); +internal_assert_wsignaled (do_fork (fake_test),SIGABRT );/* conflict on long option name */ long_options[0 ] = (struct option ) {"help" , required_argument,NULL ,'i' }; short_options ="" ; -internal_assert_wsignaled (do_fork (),SIGABRT ); +internal_assert_wsignaled (do_fork (fake_test),SIGABRT );/* conflict on long option 'val' representation vs short option */ long_options[0 ] = (struct option ) {"iterations" , required_argument,NULL ,'h' }; short_options ="" ; -internal_assert_wsignaled (do_fork (),SIGABRT ); +internal_assert_wsignaled (do_fork (fake_test),SIGABRT );/* conflict on long option 'val' representations */ long_options[0 ] = (struct option ) {"iterations" , required_argument,NULL ,500 }; short_options ="" ; -internal_assert_wsignaled (do_fork (),SIGABRT ); +internal_assert_wsignaled (do_fork (fake_test),SIGABRT );return 0 ; }
lib/tests/igt_describe.c +31 -104
231 lines not on this page · raw message
lib/tests/igt_dynamic_subtests.c +0 -18
@@ -29,24 +29,6 @@#include "igt_tests_common.h" -static int do_fork (void (*test_to_run)(void )) -{ -int pid, status; - -switch (pid =fork ()) { -case -1 : -internal_assert (0 ); -case 0 : -test_to_run (); -default : -while (waitpid (pid, &status,0 ) ==-1 && - errno ==EINTR ) - ; - -return status; - } -} -static void dynamic_subtest_in_normal_subtest (void ) {char prog[] ="igt_no_exit" ;
lib/tests/igt_fork.c +26 -45
140 lines not on this page · raw message
lib/tests/igt_invalid_subtest_name.c +0 -18
@@ -60,24 +60,6 @@ static void nonexisting_subtest(void)igt_exit (); } -static int do_fork (void (*test_to_run)(void )) -{ -int pid, status; - -switch (pid =fork ()) { -case -1 : -internal_assert (0 ); -case 0 : -test_to_run (); -default : -while (waitpid (pid, &status,0 ) ==-1 && - errno ==EINTR ) - ; - -return status; - } -} -int main (int argc,char **argv) {int ret;
lib/tests/igt_no_exit.c +0 -18
@@ -56,24 +56,6 @@ static void no_exit(void) ; } -static int do_fork (void (*test_to_run)(void )) -{ -int pid, status; - -switch (pid =fork ()) { -case -1 : -internal_assert (0 ); -case 0 : -test_to_run (); -default : -while (waitpid (pid, &status,0 ) ==-1 && - errno ==EINTR ) - ; - -return status; - } -} -int main (int argc,char **argv) {int ret;
lib/tests/igt_segfault.c +23 -36
101 lines not on this page · raw message
lib/tests/igt_simulation.c +43 -58
169 lines not on this page · raw message
lib/tests/igt_tests_common.h +91 -0
101 lines not on this page · raw message
Signature · 6 lines
2.24.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH 2/9 lib/tests: Add support for redirecting fork output to /dev/null
Trying to read interleaved writes is a bit tricky, so let's just use /dev/null if we care about contents on only one of those pipes.
--- lib/tests/igt_tests_common.h | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-)
lib/tests/igt_tests_common.h +27 -8
@@ -28,6 +28,8 @@#include <assert.h> #include <sys/wait.h> #include <errno.h> +#include <sys/stat.h> +#include <fcntl.h> /* * We need to hide assert from the cocci igt test refactor spatch.
@@ -72,19 +74,32 @@ static inline pid_t do_fork_bg_with_pipes(void (*test_to_run)(void), int *out, iint outfd[2 ], errfd[2 ];pid_t pid; -internal_assert (pipe (outfd) !=-1 ); -internal_assert (pipe (errfd) !=-1 ); +if (out !=NULL ) +internal_assert (pipe (outfd) !=-1 ); + +if (err !=NULL ) +internal_assert (pipe (errfd) !=-1 ); pid =fork ();internal_assert (pid !=-1 );if (pid ==0 ) { +/* we'll leak the /dev/null fds, let them die with the forked +* process, also close reading ends if they are any */ +if (out ==NULL ) + outfd[1 ] =open ("/dev/null" ,O_WRONLY ); +else +close (outfd[0 ]); + +if (err ==NULL ) + errfd[1 ] =open ("/dev/null" ,O_WRONLY ); +else +close (errfd[0 ]); +while (dup2 (outfd[1 ],STDOUT_FILENO ) ==-1 && errno ==EINTR ) {}while (dup2 (errfd[1 ],STDERR_FILENO ) ==-1 && errno ==EINTR ) {} -close (outfd[0 ]);close (outfd[1 ]); -close (errfd[0 ]);close (errfd[1 ]);test_to_run ();
@@ -92,11 +107,15 @@ static inline pid_t do_fork_bg_with_pipes(void (*test_to_run)(void), int *out, iexit (-1 ); }else {/* close the writing ends */ -close (outfd[1 ]); -close (errfd[1 ]); +if (out !=NULL ) { +close (outfd[1 ]); + *out = outfd[0 ]; + } - *out = outfd[0 ]; - *err = errfd[0 ]; +if (err !=NULL ) { +close (errfd[1 ]); + *err = errfd[0 ]; + }return pid; }
Signature · 6 lines
2.24.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH 3/9 lib: Make it possible to abort the whole execution from inside of a test
In reply to Arkadiusz Hilerigt_abort_on_f() is introduced which does very little cleanup and causes a hard exit() of the test binary with a unique exit code (IGT_EXIT_ABORT).
The exit code informs the monitoring process that there is a critical issue with the testing environment which may have an impact on the results if testing continues.
v2: Add a meta_test
--- lib/igt_core.c | 48 ++++++++- lib/igt_core.h | 29 ++++++ lib/tests/igt_abort.c | 227 ++++++++++++++++++++++++++++++++++++++++++ lib/tests/meson.build | 1 + tests/meta_test.c | 3 + 5 files changed, 305 insertions(+), 3 deletions(-) create mode 100644 lib/tests/igt_abort.c
lib/igt_core.c +45 -3
@@ -587,6 +587,7 @@ static void ftrace_dump_on_oops(bool enable) }bool igt_exit_called; +bool igt_is_aborting;static void common_exit_handler (int sig) {if (!igt_only_list_subtests ()) {
@@ -595,7 +596,7 @@ static void common_exit_handler(int sig)/* When not killed by a signal check that igt_exit() has been properly * called. */ -assert (sig !=0 || igt_exit_called); +assert (sig !=0 || igt_exit_called || igt_is_aborting); }static void print_line_wrapping (const char *indent,const char *text)
@@ -1944,6 +1945,48 @@ void __igt_fail_assert(const char *domain, const char *file, const int line,igt_fail (IGT_EXIT_FAILURE ); } +static void kill_children (void ) +{ +for (int c =0 ; c < num_test_children; c++) +kill (test_children[c],SIGKILL ); +} + +void __igt_abort (const char *domain,const char *file,const int line, +const char *func,const char *expression, +const char *f, ...) +{ +va_list args; +int err = errno; + + igt_is_aborting = true; + +igt_log (domain,IGT_LOG_CRITICAL , +"Test abort in function %s, file %s:%i:\n" , func, file, + line); +igt_log (domain,IGT_LOG_CRITICAL ,"abort condition: %s\n" , expression); +if (err) +igt_log (domain,IGT_LOG_CRITICAL ,"Last errno: %i, %s\n" , err, +strerror (err)); + +if (f) { +va_start (args, f); +igt_vlog (domain,IGT_LOG_CRITICAL , f, args); +va_end (args); + } + +/* just try our best, we are aborting the execution anyway */ +kill_children (); + +print_backtrace (); + +if (running_under_gdb ()) +abort (); + +_igt_log_buffer_dump (); + +exit (IGT_EXIT_ABORT ); +} +/** * igt_exit: *
@@ -1993,8 +2036,7 @@ void igt_exit(void) command_str, igt_exitcode);igt_debug ("Exiting with status code %d\n" , igt_exitcode); -for (int c =0 ; c < num_test_children; c++) -kill (test_children[c],SIGKILL ); +kill_children ();assert (!num_test_children);assert (waitpid (-1 , &tmp,WNOHANG ) ==-1 && errno ==ECHILD );
lib/igt_core.h +29 -0
@@ -123,6 +123,14 @@ struct _GKeyFile *igt_load_igtrc(void);*/ #define IGT_EXIT_FAILURE 98 +/** +* IGT_EXIT_ABORT +* +* Exit status indicating a severe test/enviroment failure, any continued +* testing past this point can yeild unexpected reasults and is not recommended +*/ +#define IGT_EXIT_ABORT 112 +bool __igt_fixture (void );void __igt_fixture_complete (void );void __igt_fixture_end (void ) __attribute__((noreturn));
@@ -499,6 +507,11 @@ void __igt_fail_assert(const char *domain, const char *file, const int line, const char *func, const char *assertion, const char *format, ...) __attribute__((noreturn)); +__attribute__((format (printf,6 ,7 ))) +void __igt_abort (const char *domain,const char *file,const int line, +const char *func,const char *expression, +const char *f, ...) + __attribute__((noreturn));void igt_exit (void ) __attribute__((noreturn));void igt_fatal_error (void ) __attribute__((noreturn));
@@ -1027,6 +1040,22 @@ void igt_describe_f(const char *fmt, ...); else igt_debug("Test requirement passed: !(%s)\n", #expr); \ } while (0) + +/** +* igt_abort_on_f: +* @expr: condition to test +* @...: format string and optional arguments +* +* Aborts current execution if a condition is met. +* +* Should be used only when there is a serious issue with the environment and +* any further testing may be affected by it. +*/ +#define igt_abort_on_f(expr, f...) \ + do { if ((expr)) \ + __igt_abort(IGT_LOG_DOMAIN, __FILE__, __LINE__, __func__, #expr , f); \ + } while (0) +/* fork support code */ bool __igt_fork (void );
lib/tests/igt_abort.c new file +227 -0
227 lines not on this page · raw message
lib/tests/meson.build +1 -0
@@ -1,5 +1,6 @@ lib_tests = [ 'igt_assert', + 'igt_abort', 'igt_can_fail', 'igt_can_fail_simple', 'igt_conflicting_args',
tests/meta_test.c +3 -0
@@ -149,6 +149,9 @@ igt_main igt_subtest("piglit-timeout")test_piglit_timeout (); + igt_subtest("abort") +igt_abort_on_f (true,"ojoj\n" ); + igt_subtest("generate-panic")test_panic (); }
Signature · 6 lines
2.24.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH 4/9 runner/runner_tests: Extract helper for inspecting test result
In reply to Arkadiusz Hilerto make this bit of code more readable and to reuse it in the following patch
--- runner/runner_tests.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-)
runner/runner_tests.c +24 -13
@@ -32,6 +32,23 @@ static const char testdatadir[] = TESTDATA_DIRECTORY;/* The total number of test binaries in runner/testdata/ */ #define NUM_TESTDATA_BINARIES 4 +static const char *igt_get_result (struct json_object *tests,const char * testname) +{ +struct json_object *obj; + +igt_assert (json_object_object_get_ex (tests, testname, &obj)); +igt_assert (json_object_object_get_ex (obj,"result" , &obj)); + +return json_object_get_string (obj); +} + +static void igt_assert_no_result_for (struct json_object *tests,const char * testname) +{ +struct json_object *obj; +igt_assert (!json_object_object_get_ex (tests, testname, &obj)); +} + +static void igt_assert_eqstr (const char *one,const char *two) {if (one ==NULL && two ==NULL )
@@ -1438,7 +1455,7 @@ igt_main igt_subtest("dynamic-subtests-in-testlist") {struct execute_state state; -struct json_object *results, *obj; +struct json_object *results, *tests;const char *argv[] = {"runner" ,"--test-list" , filename, testdatadir,
@@ -1459,16 +1476,13 @@ igt_mainigt_assert_f ((results =generate_results_json (dirfd)) !=NULL ,"Results parsing failed\n" ); - obj = results; -igt_assert (json_object_object_get_ex (obj,"tests" , &obj)); +igt_assert (json_object_object_get_ex (results,"tests" , &tests));/* Check that the dynamic subtest we didn't request is not reported */ -igt_assert (!json_object_object_get_ex (obj,"igt@dynamic@dynamic-subtest@failing" ,NULL )); +igt_assert_no_result_for (tests,"igt@dynamic@dynamic-subtest@failing" );/* Check that the dynamic subtest we did request is */ -igt_assert (json_object_object_get_ex (obj,"igt@dynamic@dynamic-subtest@passing" , &obj)); -igt_assert (json_object_object_get_ex (obj,"result" , &obj)); -igt_assert_eqstr (json_object_get_string (obj),"pass" ); +igt_assert_eqstr (igt_get_result (tests,"igt@dynamic@dynamic-subtest@passing" ),"pass" );igt_assert_eq (json_object_put (results),1 ); }
@@ -1496,7 +1510,7 @@ igt_main igt_subtest("dynamic-subtest-failure-should-not-cause-warn") {struct execute_state state; -struct json_object *results, *obj; +struct json_object *results, *tests;const char *argv[] = {"runner" ,"-t" ,"dynamic" , testdatadir,
@@ -1513,12 +1527,9 @@ igt_mainigt_assert_f ((results =generate_results_json (dirfd)) !=NULL ,"Results parsing failed\n" ); - obj = results; -igt_assert (json_object_object_get_ex (obj,"tests" , &obj)); -igt_assert (json_object_object_get_ex (obj,"igt@dynamic@dynamic-subtest@passing" , &obj)); -igt_assert (json_object_object_get_ex (obj,"result" , &obj)); +igt_assert (json_object_object_get_ex (results,"tests" , &tests)); -igt_assert_eqstr (json_object_get_string (obj),"pass" ); +igt_assert_eqstr (igt_get_result (tests,"igt@dynamic@dynamic-subtest@passing" ),"pass" );igt_assert_eq (json_object_put (results),1 ); }
Signature · 6 lines
2.24.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH 5/9 runner: Abort the run when test exits with IGT_EXIT_ABORT
In reply to Arkadiusz HilerNow that the IGT tests have a mechanism for signaling broken testing conditions we can stop the run on the first test that has noticed it, and possibly has triggered that state.
Traditionally run would have continued with that test failing and the side effects would trickle down into the other tests causing a lot of skip/fails.
v2: extra explanations, small cleanup (Petri)
--- runner/executor.c | 3 + .../aborted-after-a-test/reference.json | 6 + .../aborted-on-boot/reference.json | 6 + .../dmesg-escapes/reference.json | 3 + .../dmesg-results/reference.json | 5 + .../reference.json | 3 + .../reference.json | 3 + .../dmesg-warn-level/reference.json | 3 + .../reference.json | 3 + .../dynamic-subtests/reference.json | 3 + .../empty-result-files/reference.json | 3 + .../reference.json | 5 + .../json_tests_data/normal-run/reference.json | 5 + .../reference.json | 4 + .../notrun-results/reference.json | 5 + .../piglit-style-dmesg/reference.json | 5 + .../unprintable-characters/reference.json | 5 +- .../warnings-with-dmesg-warns/reference.json | 5 + .../json_tests_data/warnings/reference.json | 5 + runner/resultgen.c | 31 ++ runner/runner_tests.c | 290 +++++++++++++++++- runner/testdata/abort-dynamic.c | 46 +++ runner/testdata/abort-fixture.c | 37 +++ runner/testdata/abort-simple.c | 29 ++ runner/testdata/abort.c | 36 +++ runner/testdata/meson.build | 4 + 26 files changed, 547 insertions(+), 6 deletions(-) create mode 100644 runner/testdata/abort-dynamic.c create mode 100644 runner/testdata/abort-fixture.c create mode 100644 runner/testdata/abort-simple.c create mode 100644 runner/testdata/abort.c
runner/executor.c +3 -0
@@ -1065,6 +1065,9 @@ static int monitor_output(pid_t child,fdatasync (outputs[_F_JOURNAL]); } +if (status ==IGT_EXIT_ABORT ) + aborting = true; +if (time_spent) *time_spent = time; }
runner/json_tests_data/aborted-after-a-test/reference.json +6 -0
@@ -60,6 +60,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":4, "fail":1,
@@ -72,6 +73,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":4, "fail":1,
@@ -84,6 +86,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":1, "fail":0,
@@ -96,6 +99,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":1, "fail":0,
@@ -108,6 +112,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":2, "fail":0,
@@ -120,6 +125,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":1,
runner/json_tests_data/aborted-on-boot/reference.json +6 -0
@@ -54,6 +54,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":5, "fail":1,
@@ -66,6 +67,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":5, "fail":1,
@@ -78,6 +80,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":2, "fail":0,
@@ -90,6 +93,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":1, "fail":0,
@@ -102,6 +106,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":2, "fail":0,
@@ -114,6 +119,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":1,
runner/json_tests_data/dmesg-escapes/reference.json +3 -0
@@ -30,6 +30,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -42,6 +43,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -54,6 +56,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
runner/json_tests_data/dmesg-results/reference.json +5 -0
@@ -81,6 +81,7 @@ "dmesg-warn":2, "skip":2, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -93,6 +94,7 @@ "dmesg-warn":2, "skip":2, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -105,6 +107,7 @@ "dmesg-warn":1, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -117,6 +120,7 @@ "dmesg-warn":1, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -129,6 +133,7 @@ "dmesg-warn":0, "skip":2, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
runner/json_tests_data/dmesg-warn-level-one-piglit-style/reference.json +3 -0
@@ -31,6 +31,7 @@ "dmesg-warn":1, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -43,6 +44,7 @@ "dmesg-warn":1, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -55,6 +57,7 @@ "dmesg-warn":1, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
runner/json_tests_data/dmesg-warn-level-piglit-style/reference.json +3 -0
@@ -31,6 +31,7 @@ "dmesg-warn":1, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -43,6 +44,7 @@ "dmesg-warn":1, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -55,6 +57,7 @@ "dmesg-warn":1, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
runner/json_tests_data/dmesg-warn-level/reference.json +3 -0
@@ -31,6 +31,7 @@ "dmesg-warn":1, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -43,6 +44,7 @@ "dmesg-warn":1, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -55,6 +57,7 @@ "dmesg-warn":1, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
runner/json_tests_data/dynamic-subtest-name-in-multiple-subtests/reference.json +3 -0
@@ -42,6 +42,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -54,6 +55,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -66,6 +68,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
runner/json_tests_data/dynamic-subtests/reference.json +3 -0
@@ -90,6 +90,7 @@ "dmesg-warn":0, "skip":1, "incomplete":1, + "abort":0, "timeout":0, "notrun":0, "fail":2,
@@ -102,6 +103,7 @@ "dmesg-warn":0, "skip":1, "incomplete":1, + "abort":0, "timeout":0, "notrun":0, "fail":2,
@@ -114,6 +116,7 @@ "dmesg-warn":0, "skip":1, "incomplete":1, + "abort":0, "timeout":0, "notrun":0, "fail":2,
runner/json_tests_data/empty-result-files/reference.json +3 -0
@@ -24,6 +24,7 @@ "dmesg-warn":0, "skip":0, "incomplete":1, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -36,6 +37,7 @@ "dmesg-warn":0, "skip":0, "incomplete":1, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -48,6 +50,7 @@ "dmesg-warn":0, "skip":0, "incomplete":1, + "abort":0, "timeout":0, "notrun":0, "fail":0,
runner/json_tests_data/incomplete-before-any-subtests/reference.json +5 -0
@@ -49,6 +49,7 @@ "dmesg-warn":0, "skip":0, "incomplete":1, + "abort":0, "timeout":0, "notrun":4, "fail":0,
@@ -61,6 +62,7 @@ "dmesg-warn":0, "skip":0, "incomplete":1, + "abort":0, "timeout":0, "notrun":4, "fail":0,
@@ -73,6 +75,7 @@ "dmesg-warn":0, "skip":0, "incomplete":1, + "abort":0, "timeout":0, "notrun":1, "fail":0,
@@ -85,6 +88,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":1, "fail":0,
@@ -97,6 +101,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":2, "fail":0,
runner/json_tests_data/normal-run/reference.json +5 -0
@@ -78,6 +78,7 @@ "dmesg-warn":0, "skip":2, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":1,
@@ -90,6 +91,7 @@ "dmesg-warn":0, "skip":2, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":1,
@@ -102,6 +104,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":1,
@@ -114,6 +117,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -126,6 +130,7 @@ "dmesg-warn":0, "skip":2, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
runner/json_tests_data/notrun-results-multiple-mode/reference.json +4 -0
@@ -48,6 +48,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":3, "fail":0,
@@ -60,6 +61,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":3, "fail":0,
@@ -72,6 +74,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":1, "fail":0,
@@ -84,6 +87,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":2, "fail":0,
runner/json_tests_data/notrun-results/reference.json +5 -0
@@ -54,6 +54,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":4, "fail":0,
@@ -66,6 +67,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":4, "fail":0,
@@ -78,6 +80,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":1, "fail":0,
@@ -90,6 +93,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":1, "fail":0,
@@ -102,6 +106,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":2, "fail":0,
runner/json_tests_data/piglit-style-dmesg/reference.json +5 -0
@@ -78,6 +78,7 @@ "dmesg-warn":0, "skip":2, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -90,6 +91,7 @@ "dmesg-warn":0, "skip":2, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -102,6 +104,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -114,6 +117,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -126,6 +130,7 @@ "dmesg-warn":0, "skip":2, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
runner/json_tests_data/unprintable-characters/reference.json +4 -1
@@ -30,6 +30,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -42,6 +43,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -54,6 +56,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -69,4 +72,4 @@ } } } -} +}
runner/json_tests_data/warnings-with-dmesg-warns/reference.json +5 -0
@@ -79,6 +79,7 @@ "dmesg-warn":1, "skip":2, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -91,6 +92,7 @@ "dmesg-warn":1, "skip":2, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -103,6 +105,7 @@ "dmesg-warn":1, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -115,6 +118,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -127,6 +131,7 @@ "dmesg-warn":0, "skip":2, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
runner/json_tests_data/warnings/reference.json +5 -0
@@ -78,6 +78,7 @@ "dmesg-warn":0, "skip":2, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -90,6 +91,7 @@ "dmesg-warn":0, "skip":2, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -102,6 +104,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -114,6 +117,7 @@ "dmesg-warn":0, "skip":0, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
@@ -126,6 +130,7 @@ "dmesg-warn":0, "skip":2, "incomplete":0, + "abort":0, "timeout":0, "notrun":0, "fail":0,
runner/resultgen.c +31 -0
@@ -645,6 +645,23 @@ static void process_dynamic_subtest_output(const char *piglit_name, &dynresulttext, &dyntime, dyn_result_idx <0 ?NULL : matches.items[dyn_result_idx].where, dynend); + +/* +* If a dynamic subsubtest is considered incomplete we +* need to check parent's status first, to be sure that +* the binary hasn't aborted (exit code). If it has +* aborted then we have to attribute this status to our +* subsubtest. +*/ +if (!strcmp (dynresulttext,"incomplete" )) { +struct json_object *parent_subtest; + +if (json_object_object_get_ex (tests, piglit_name, &parent_subtest) && +json_object_object_get_ex (parent_subtest,"result" , &parent_subtest) && + !strcmp (json_object_get_string (parent_subtest),"abort" )) + dynresulttext ="abort" ; + } +set_result (current_dynamic_test, dynresulttext);set_runtime (current_dynamic_test, dyntime); }
@@ -1078,6 +1095,8 @@ static const char *result_from_exitcode(int exitcode)return "pass" ;case IGT_EXIT_INVALID :return "skip" ; +case IGT_EXIT_ABORT : +return "abort" ;case INCOMPLETE_EXITCODE :return "incomplete" ;default :
@@ -1154,6 +1173,17 @@ static void fill_from_journal(int fd, } } +if (subtests->size && exitcode ==IGT_EXIT_ABORT ) { +char *last_subtest = subtests->subs[subtests->size -1 ].name; +char subtest_piglit_name[256 ]; +struct json_object *subtest_obj; + +generate_piglit_name (entry->binary, last_subtest, subtest_piglit_name,sizeof (subtest_piglit_name)); + subtest_obj =get_or_create_json_object (tests, subtest_piglit_name); + +set_result (subtest_obj,"abort" ); + } +if (subtests->size ==0 ) {char *subtestname =NULL ;char piglit_name[256 ];
@@ -1322,6 +1352,7 @@ static struct json_object *get_totals_object(struct json_object *totals,json_object_object_add (obj,"dmesg-warn" ,json_object_new_int (0 ));json_object_object_add (obj,"skip" ,json_object_new_int (0 ));json_object_object_add (obj,"incomplete" ,json_object_new_int (0 )); +json_object_object_add (obj,"abort" ,json_object_new_int (0 ));json_object_object_add (obj,"timeout" ,json_object_new_int (0 ));json_object_object_add (obj,"notrun" ,json_object_new_int (0 ));json_object_object_add (obj,"fail" ,json_object_new_int (0 ));
runner/runner_tests.c +285 -5
327 lines not on this page · raw message
runner/testdata/abort-dynamic.c new file +46 -0
46 lines not on this page · raw message
runner/testdata/abort-fixture.c new file +37 -0
@@ -0,0 +1,37 @@ +/* +* Copyright © 2020 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +*/ + +#include "igt.h" + +igt_main +{ + igt_fixture { +igt_abort_on_f (true,"I'm out!\n" ); + } + +igt_subtest ("a-subtest" ) + ; + +igt_subtest ("b-subtest" ) + ; +}
runner/testdata/abort-simple.c new file +29 -0
@@ -0,0 +1,29 @@ +/* +* Copyright © 2020 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +*/ + +#include "igt.h" + +igt_simple_main +{ +igt_abort_on_f (true,"I'm out!\n" ); +}
runner/testdata/abort.c new file +36 -0
@@ -0,0 +1,36 @@ +/* +* Copyright © 2020 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +*/ + +#include "igt.h" + +igt_main +{ +igt_subtest ("a-subtest" ) + ; + + igt_subtest("b-subtest") +igt_abort_on_f (true,"I'm out!\n" ); + +igt_subtest ("c-subtest" ) + ; +}
runner/testdata/meson.build +4 -0
@@ -3,6 +3,10 @@ testdata_progs = [ 'successtest', 'no-subtests', 'skippers', 'dynamic', + 'abort', + 'abort-dynamic', + 'abort-fixture', + 'abort-simple', ] testdata_executables = []
Signature · 6 lines
2.24.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH 6/9 lib/chamelium: Clear error after checking if chamelium is reachable
In reply to Arkadiusz HilerOtherwise this may get us stuck in perpetual failure mode.
--- lib/igt_chamelium.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
lib/igt_chamelium.c +8 -2
@@ -361,11 +361,17 @@ static bool __chamelium_is_reachable(struct chamelium *chamelium)if (res !=NULL )xmlrpc_DECREF (res); -if (chamelium->env.fault_occurred) +if (chamelium->env.fault_occurred) {igt_debug ("Chamelium RPC call failed: %s\n" , chamelium->env.fault_string); -return !chamelium->env.fault_occurred; +xmlrpc_env_clean (&chamelium->env); +xmlrpc_env_init (&chamelium->env); + +return false; + } + +return true; }void chamelium_wait_reachable (struct chamelium *chamelium,int timeout)
Signature · 6 lines
2.24.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH 7/9 lib/chamelium: Make it clear that function asserts
In reply to Arkadiusz Hilerchamelium_wait_reachable() is asserting internally if the chamelium not reachable. Let's make it return bool instead and create
void chamelium_assert_reachable() that fails the run.
v2: Add docs (Petri)
--- lib/igt_chamelium.c | 24 +++++++++++++++++++++--- lib/igt_chamelium.h | 3 ++- tests/kms_chamelium.c | 4 ++-- 3 files changed, 25 insertions(+), 6 deletions(-)
lib/igt_chamelium.c +21 -3
@@ -374,11 +374,29 @@ static bool __chamelium_is_reachable(struct chamelium *chamelium)return true; } -void chamelium_wait_reachable (struct chamelium *chamelium,int timeout) +/** +* chamelium_wait_reachable: +* @chamelium: The Chamelium instance to use +* @timeout: Time (in seconds) to wait for chamelium to be reachable +* +* Returns: %true if the Chamelium is reachable, %false otherwise. +*/ +bool chamelium_wait_reachable (struct chamelium *chamelium,int timeout) { -bool chamelium_online =igt_wait (__chamelium_is_reachable (chamelium), - timeout *1000 ,100 ); +return igt_wait (__chamelium_is_reachable (chamelium), + timeout *1000 ,100 ); +} +/** +* chamelium_assert_reachable: +* @chamelium: The Chamelium instance to use +* @timeout: Time (in seconds) to wait for chamelium to be reachable +* +* Asserts that the chamelium is reachable. +*/ +void chamelium_assert_reachable (struct chamelium *chamelium,int timeout) +{ +bool chamelium_online =chamelium_wait_reachable (chamelium, timeout);igt_assert_f (chamelium_online,"Couldn't connect to Chamelium for %ds" , timeout); }
lib/igt_chamelium.h +2 -1
@@ -112,7 +112,8 @@ drmModeConnector *chamelium_port_get_connector(struct chamelium *chamelium, bool reprobe);const char *chamelium_port_get_name (struct chamelium_port *port); -void chamelium_wait_reachable (struct chamelium *chamelium,int timeout); +bool chamelium_wait_reachable (struct chamelium *chamelium,int timeout); +void chamelium_assert_reachable (struct chamelium *chamelium,int timeout);void chamelium_plug (struct chamelium *chamelium,struct chamelium_port *port);void chamelium_unplug (struct chamelium *chamelium,struct chamelium_port *port); bool chamelium_is_plugged(struct chamelium *chamelium,
tests/kms_chamelium.c +2 -2
@@ -376,7 +376,7 @@ try_suspend_resume_hpd(data_t *data, struct chamelium_port *port,igt_system_suspend_autoresume (state, test);igt_assert (wait_for_hotplug (mon, &timeout)); -chamelium_wait_reachable (data->chamelium,ONLINE_TIMEOUT ); +chamelium_assert_reachable (data->chamelium,ONLINE_TIMEOUT );if (port) {igt_assert_eq (reprobe_connector (data, port), target_state);
@@ -493,7 +493,7 @@ test_suspend_resume_edid_change(data_t *data, struct chamelium_port *port,igt_system_suspend_autoresume (state, test);igt_assert (igt_hotplug_detected (mon,HOTPLUG_TIMEOUT )); -chamelium_wait_reachable (data->chamelium,ONLINE_TIMEOUT ); +chamelium_assert_reachable (data->chamelium,ONLINE_TIMEOUT );get_connectors_link_status_failed (data, link_status_failed[1 ]);
Signature · 6 lines
2.24.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH 8/9 lib/chamelium: Add functions to initialize XMLRPC only
In reply to Arkadiusz HilerLet's extract the bit that reads the config and initializes xmlrpc so we can do some basic things with chamelium without the need to do port auto-discovery and connector mapping.
--- lib/igt_chamelium.c | 89 +++++++++++++++++++++++++++++++++------------ lib/igt_chamelium.h | 2 + 2 files changed, 68 insertions(+), 23 deletions(-)
lib/igt_chamelium.c +66 -23
@@ -2308,7 +2308,7 @@ static bool chamelium_autodiscover(struct chamelium *chamelium, int drm_fd)return true; } -static bool chamelium_read_config (struct chamelium *chamelium,int drm_fd) +static bool chamelium_read_config (struct chamelium *chamelium) {GError *error =NULL ;
@@ -2325,10 +2325,7 @@ static bool chamelium_read_config(struct chamelium *chamelium, int drm_fd)return false; } -if (!chamelium_read_port_mappings (chamelium, drm_fd)) { -return false; - } -return chamelium_autodiscover (chamelium, drm_fd); +return true; }/**
@@ -2352,6 +2349,64 @@ static void chamelium_exit_handler(int sig)chamelium_deinit (cleanup_instance); } +/** +* chamelium_deinit_rpc_only: +* @chamelium: The Chamelium instance to use +* +* Frees the resources used by a connection to the chamelium that was set up +* with #chamelium_init_rpc_only. +*/ +void chamelium_deinit_rpc_only (struct chamelium *chamelium) +{ +xmlrpc_env_clean (&chamelium->env); +free (chamelium); +} + +/** +* chamelium_init_rpc_only: +* +* Sets up a connection with a chamelium, using the URL specified in the +* Chamelium configuration. The function initializes only the RPC - no port +* autodiscovery happens, which means only the functions that do not require +* struct #chamelium_port can be called with an instance produced by this +* function. +* +* #chamelium_init is almost always a better choice. +* +* Returns: A newly initialized chamelium struct, or NULL on lack of +* configuration +*/ +struct chamelium *chamelium_init_rpc_only (void ) +{ +struct chamelium *chamelium =malloc (sizeof (struct chamelium )); + +if (!chamelium) +return NULL ; + +memset (chamelium,0 ,sizeof (*chamelium)); + + chamelium->drm_fd =-1 ; + +/* Setup the libxmlrpc context */ +xmlrpc_env_init (&chamelium->env); +xmlrpc_client_setup_global_const (&chamelium->env); +xmlrpc_client_create (&chamelium->env,XMLRPC_CLIENT_NO_FLAGS ,PACKAGE , +PACKAGE_VERSION ,NULL ,0 , &chamelium->client); +if (chamelium->env.fault_occurred) { +igt_debug ("Failed to init xmlrpc: %s\n" , + chamelium->env.fault_string); + goto error; + } + +if (!chamelium_read_config (chamelium)) + goto error; + +return chamelium; +error: +chamelium_deinit_rpc_only (chamelium); +return NULL ; +} +/** * chamelium_init: * @chamelium: The Chamelium instance to use
@@ -2368,9 +2423,9 @@ static void chamelium_exit_handler(int sig)*/ struct chamelium *chamelium_init (int drm_fd) { -struct chamelium *chamelium =malloc (sizeof (struct chamelium )); +struct chamelium *chamelium =chamelium_init_rpc_only (); -if (!chamelium) +if (chamelium ==NULL )return NULL ;/* A chamelium instance was set up previously, so clean it up before
@@ -2379,34 +2434,22 @@ struct chamelium *chamelium_init(int drm_fd)if (cleanup_instance)chamelium_deinit (cleanup_instance); -memset (chamelium,0 ,sizeof (*chamelium)); chamelium->drm_fd = drm_fd;IGT_INIT_LIST_HEAD (&chamelium->edids); -/* Setup the libxmlrpc context */ -xmlrpc_env_init (&chamelium->env); -xmlrpc_client_setup_global_const (&chamelium->env); -xmlrpc_client_create (&chamelium->env,XMLRPC_CLIENT_NO_FLAGS ,PACKAGE , -PACKAGE_VERSION ,NULL ,0 , &chamelium->client); -if (chamelium->env.fault_occurred) { -igt_debug ("Failed to init xmlrpc: %s\n" , - chamelium->env.fault_string); +if (!chamelium_read_port_mappings (chamelium, drm_fd)) goto error; - } -if (!chamelium_read_config (chamelium, drm_fd)) +if (!chamelium_autodiscover (chamelium, drm_fd)) goto error; cleanup_instance = chamelium;igt_install_exit_handler (chamelium_exit_handler);return chamelium; - error: -xmlrpc_env_clean (&chamelium->env); -free (chamelium); - -return NULL ; +chamelium_deinit_rpc_only (chamelium); +return chamelium; }/**
lib/igt_chamelium.h +2 -0
@@ -100,6 +100,8 @@ struct chamelium_edid;*/ #define CHAMELIUM_MAX_AUDIO_CHANNELS 8 +void chamelium_deinit_rpc_only (struct chamelium *chamelium); +struct chamelium *chamelium_init_rpc_only (void );struct chamelium *chamelium_init (int drm_fd);void chamelium_deinit (struct chamelium *chamelium);void chamelium_reset (struct chamelium *chamelium);
Signature · 6 lines
2.24.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH 9/9 lib/kms: Try to plug all Chamelium ports, abort if it fails
In reply to Arkadiusz HilerUsing chamelium as a display for non-chamelium-aware test is challenging. The board can be left in multiple different states after kms_chamelium tests even though we have atexit() handlers and other measures which try to assure that all ports are plugged in. Sadly this is not 100% reliable. We also had a few boards hard hanging (happens very seldom) and requiring manual intervention.
This leads to changes in the testing configuration - we may end up with any number of connectors plugged in which makes a lot of kms_ tests to flip between skip and pass depending on a run.
In an attempt to make connectors state less random this patch makes igt_display_require() chamelium-aware. If chamelium is configured for given machine we try to reach it and make sure everything is plugged in. If we fail to do so we abort the execution because the testing configuration is an unknown.
For machines without a configured chamelium this boils down to a nop.
I have run a bunch of tests and measured how much time we spend in the Chamelium section of igt_display_require() (n = 1000) with chamelium configured:
Min: 0.0030s Max: 0.0113s
Avg: 0.0089s Median: 0.0089sWith ~1000 of KMS subtests in a run it's only a mere 9s.
This will however add a bit of extra execution time to test skips because of doing kmstest_set_vt_graphics_mode() and igt_display_require() before even checking whether Chamelium is configured.
v2: do kmstest_set_vt_graphics_mode() before requiring display (Petri)
--- lib/igt_chamelium.c | 55 +++++++++++++++++++++++++++++++++++-- lib/igt_chamelium.h | 1 + lib/igt_kms.c | 18 ++++++++++++ tests/kms_chamelium.c | 13 +++++---- tests/kms_color_chamelium.c | 7 +++-- 5 files changed, 83 insertions(+), 11 deletions(-)
lib/igt_chamelium.c +52 -3
@@ -1992,7 +1992,13 @@ static size_t chamelium_get_video_ports(struct chamelium *chamelium,int res_len, i, port_id;size_t port_ids_len =0 ; - res =chamelium_rpc (chamelium,NULL ,"GetSupportedInputs" ,"()" ); + res =__chamelium_rpc (chamelium,NULL ,"GetSupportedInputs" ,"()" ); +if (chamelium->env.fault_occurred) { +igt_debug ("Chamelium RPC call failed: %s\n" , + chamelium->env.fault_string); + +return -1 ; + } res_len =xmlrpc_array_size (&chamelium->env, res);for (i =0 ; i < res_len; i++) {xmlrpc_array_read_item (&chamelium->env, res, i, &res_port);
@@ -2195,6 +2201,8 @@ static bool chamelium_autodiscover(struct chamelium *chamelium, int drm_fd) candidate_ports_len =chamelium_get_video_ports (chamelium, candidate_ports); +igt_assert (candidate_ports_len >0 ); +igt_debug ("Starting Chamelium port auto-discovery on %zu ports\n" , candidate_ports_len);igt_gettime (&start);
@@ -2313,14 +2321,14 @@ static bool chamelium_read_config(struct chamelium *chamelium)GError *error =NULL ;if (!igt_key_file) { -igt_warn ("No configuration file available for chamelium\n" ); +igt_debug ("No configuration file available for chamelium\n" );return false; } chamelium->url =g_key_file_get_string (igt_key_file,"Chamelium" ,"URL" , &error);if (!chamelium->url) { -igt_warn ("Couldn't read chamelium URL from config file: %s\n" , +igt_debug ("Couldn't read chamelium URL from config file: %s\n" , error->message);return false; }
@@ -2416,6 +2424,9 @@ error:* Chamelium configuration. This must be called first before trying to use the * chamelium. * +* Needs to happen *after* igt_display_require() as otherwise the board will +* get reset. +* * If we fail to establish a connection with the chamelium, fail to find a * configured connector, etc. we fail the current test. *
@@ -2495,6 +2506,44 @@ void chamelium_deinit(struct chamelium *chamelium)free (chamelium); } +bool chamelium_plug_all (struct chamelium *chamelium) +{ +size_t port_count; +int port_ids[CHAMELIUM_MAX_PORTS ]; +xmlrpc_value *v; + v =__chamelium_rpc (chamelium,NULL ,"Reset" ,"()" ); + +if (v !=NULL ) +xmlrpc_DECREF (v); + +if (chamelium->env.fault_occurred) { +igt_debug ("Chamelium RPC call failed: %s\n" , + chamelium->env.fault_string); + +return false; + } + + port_count =chamelium_get_video_ports (chamelium, port_ids); +if (port_count <=0 ) +return false; + +for (int i =0 ; i < port_count; ++i) { + v =__chamelium_rpc (chamelium,NULL ,"Plug" ,"(i)" , port_ids[i]); + +if (v !=NULL ) +xmlrpc_DECREF (v); + +if (chamelium->env.fault_occurred) { +igt_debug ("Chamelium RPC call failed: %s\n" , + chamelium->env.fault_string); + +return false; + } + } + +return true; +} + igt_constructor {/* Frame dumps can be large, so we need to be able to handle very large * responses
lib/igt_chamelium.h +1 -0
@@ -217,5 +217,6 @@ void chamelium_crop_analog_frame(struct chamelium_frame_dump *dump, int width,void chamelium_destroy_frame_dump (struct chamelium_frame_dump *dump);void chamelium_destroy_audio_file (struct chamelium_audio_file *audio_file);void chamelium_infoframe_destroy (struct chamelium_infoframe *infoframe); +bool chamelium_plug_all (struct chamelium *chamelium);#endif /* IGT_CHAMELIUM_H */
lib/igt_kms.c +18 -0
@@ -58,6 +58,9 @@#include "igt_device.h" #include "igt_sysfs.h" #include "sw_sync.h" +#ifdef HAVE_CHAMELIUM +#include "igt_chamelium.h" +#endif /** * SECTION:igt_kms
@@ -1886,6 +1889,21 @@ void igt_display_require(igt_display_t *display, int drm_fd)if (!resources) goto out; +#ifdef HAVE_CHAMELIUM + { +struct chamelium *chamelium; + + chamelium =chamelium_init_rpc_only (); +if (chamelium) { +igt_abort_on_f (!chamelium_wait_reachable (chamelium,20 ), +"cannot reach the configured chamelium!\n" ); +igt_abort_on_f (!chamelium_plug_all (chamelium), +"failed to plug all the chamelium ports!\n" ); +chamelium_deinit_rpc_only (chamelium); + } + } +#endif +/* * We cache the number of pipes, that number is a physical limit of the * hardware and cannot change of time (for now, at least).
tests/kms_chamelium.c +7 -6
@@ -2622,7 +2622,14 @@ igt_mainsize_t i; igt_fixture { +/* So fbcon doesn't try to reprobe things itself */ +kmstest_set_vt_graphics_mode (); + data.drm_fd =drm_open_driver_master (DRIVER_ANY ); +igt_display_require (&data.display, data.drm_fd); +igt_require (data.display.is_atomic); + +/* we need to initalize chamelium after igt_display_require */ data.chamelium =chamelium_init (data.drm_fd);igt_require (data.chamelium);
@@ -2633,12 +2640,6 @@ igt_main data.edids[i] =chamelium_new_edid (data.chamelium,get_edid (i)); } - -/* So fbcon doesn't try to reprobe things itself */ -kmstest_set_vt_graphics_mode (); - -igt_display_require (&data.display, data.drm_fd); -igt_require (data.display.is_atomic); }igt_describe ("DisplayPort tests" );
tests/kms_color_chamelium.c +5 -2
@@ -724,6 +724,11 @@ igt_main data.drm_fd =drm_open_driver_master (DRIVER_ANY );if (is_i915_device (data.drm_fd)) data.devid =intel_get_drm_devid (data.drm_fd); + +igt_display_require (&data.display, data.drm_fd); +igt_require (data.display.is_atomic); + +/* we need to initalize chamelium after igt_display_require */ data.chamelium =chamelium_init (data.drm_fd);igt_require (data.chamelium);
@@ -734,8 +739,6 @@ igt_mainigt_skip ("No ports connected\n" );kmstest_set_vt_graphics_mode (); -igt_display_require (&data.display, data.drm_fd); -igt_require (data.display.is_atomic); }for_each_pipe_static (pipe)
Signature · 6 lines
2.24.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✗ GitLab.Pipeline: failure for series starting with [i-g-t,1/9] lib/tests: Extract fork helpers
In reply to Arkadiusz Hiler== Series Details ==
== Series Details ==
Series: series starting with [i-g-t,1/9] lib/tests: Extract fork helpers
URL : https://patchwork.freedesktop.org/series/73920/
State : failure
== Summary ==
ERROR! This series introduces new undocumented tests:
meta_test@abort
Can you document them as per the requirement in the [CONTRIBUTING.md]?
[Documentation] has more details on how to do this.
Here are few examples:
https://gitlab.freedesktop.org/drm/igt-gpu-tools/commit/0316695d03aa46108296b27f3982ec93200c7a6e
https://gitlab.freedesktop.org/drm/igt-gpu-tools/commit/443cc658e1e6b492ee17bf4f4d891029eb7a205d
Thanks in advance!
[CONTRIBUTING.md]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/blob/master/CONTRIBUTING.md#L19
[Documentation]: https://drm.pages.freedesktop.org/igt-gpu-tools/igt-gpu-tools-Core.html#igt-describe
Other than that, pipeline status: SUCCESS.
see https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/pipelines/112757 for the overview.
== Logs ==
For more details see: https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/pipelines/112757
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/9] lib/tests: Extract fork helpers
In reply to Arkadiusz Hiler== Series Details ==
== Series Details ==
Series: series starting with [i-g-t,1/9] lib/tests: Extract fork helpers
URL : https://patchwork.freedesktop.org/series/73920/
State : success
== Summary ==
CI Bug Log - changes from IGT_5467 -> IGTPW_4223
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/index.html
Known issues
------------
Here are the changes found in IGTPW_4223 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_chamelium@dp-crc-fast:
- fi-cml-u2: [PASS][1] -> [FAIL][2] ([i915#217])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/fi-cml-u2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/fi-cml-u2/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [PASS][3] -> [FAIL][4] ([fdo#111407])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/fi-kbl-7500u/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/fi-kbl-7500u/igt@[email protected]
#### Warnings ####
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-pnv-d510: [SKIP][5] ([fdo#109271] / [fdo#111827]) -> [SKIP][6] ([fdo#109271]) +8 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/fi-pnv-d510/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/fi-pnv-d510/igt@[email protected]
* igt@kms_chamelium@dp-crc-fast:
- fi-bwr-2160: [SKIP][7] ([fdo#109271] / [fdo#111827]) -> [SKIP][8] ([fdo#109271]) +8 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/fi-bwr-2160/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/fi-bwr-2160/igt@[email protected]
- fi-gdg-551: [SKIP][9] ([fdo#109271] / [fdo#111827]) -> [SKIP][10] ([fdo#109271]) +8 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/fi-gdg-551/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/fi-gdg-551/igt@[email protected]
* igt@kms_chamelium@hdmi-edid-read:
- fi-blb-e6850: [SKIP][11] ([fdo#109271] / [fdo#111827]) -> [SKIP][12] ([fdo#109271]) +8 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/fi-blb-e6850/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/fi-blb-e6850/igt@[email protected]
- fi-kbl-8809g: [SKIP][13] ([fdo#109271] / [fdo#111827]) -> [SKIP][14] ([fdo#109271]) +8 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/fi-kbl-8809g/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/fi-kbl-8809g/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1233]: https://gitlab.freedesktop.org/drm/intel/issues/1233
[i915#217]: https://gitlab.freedesktop.org/drm/intel/issues/217
Participating hosts (49 -> 45)
------------------------------
Additional (1): fi-tgl-y
Missing (5): fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5467 -> IGTPW_4223
CI-20190529: 20190529
CI_DRM_8005: 81f641f60edbfa1ccb169689206f0af360a06e31 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4223: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/index.html
IGT_5467: 2684f182424582c66e67bcbbda77cd60901627b8 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Testlist changes ==
+igt@meta_test@abort
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/index.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✗ Fi.CI.IGT: failure for series starting with [i-g-t,1/9] lib/tests: Extract fork helpers
In reply to Arkadiusz Hiler== Series Details ==
== Series Details ==
Series: series starting with [i-g-t,1/9] lib/tests: Extract fork helpers
URL : https://patchwork.freedesktop.org/series/73920/
State : failure
== Summary ==
CI Bug Log - changes from IGT_5467_full -> IGTPW_4223_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with IGTPW_4223_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in IGTPW_4223_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_4223_full:
### IGT changes ###
#### Possible regressions ####
* igt@sw_sync@sync_multi_producer_single_consumer:
- shard-tglb: NOTRUN -> [TIMEOUT][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-tglb1/igt@sw_sync@sync_multi_producer_single_consumer.html
#### Warnings ####
* igt@i915_pm_rpm@modeset-non-lpsp-stress:
- shard-tglb: [SKIP][2] ([fdo#111644]) -> [SKIP][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-tglb3/igt@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-tglb2/igt@[email protected]
- shard-iclb: [SKIP][4] ([fdo#110892]) -> [SKIP][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-iclb5/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-iclb5/igt@[email protected]
Known issues
------------
Here are the changes found in IGTPW_4223_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@rcs0-s3:
- shard-kbl: [PASS][6] -> [DMESG-WARN][7] ([i915#180]) +3 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-kbl6/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-kbl7/igt@[email protected]
* igt@gem_exec_balancer@smoke:
- shard-iclb: [PASS][8] -> [SKIP][9] ([fdo#110854])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-iclb4/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-iclb8/igt@[email protected]
* igt@gem_exec_schedule@pi-userfault-bsd:
- shard-iclb: [PASS][10] -> [SKIP][11] ([i915#677])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-iclb7/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-iclb1/igt@[email protected]
* igt@gem_exec_schedule@preempt-queue-bsd1:
- shard-iclb: [PASS][12] -> [SKIP][13] ([fdo#109276]) +16 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-iclb4/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-iclb8/igt@[email protected]
* igt@gem_exec_schedule@reorder-wide-bsd:
- shard-iclb: [PASS][14] -> [SKIP][15] ([fdo#112146]) +4 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-iclb3/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-iclb1/igt@[email protected]
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-kbl: [PASS][16] -> [FAIL][17] ([i915#644])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-kbl4/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-kbl1/igt@[email protected]
* igt@gem_userptr_blits@sync-unmap-cycles:
- shard-snb: [PASS][18] -> [DMESG-WARN][19] ([fdo#111870] / [i915#478]) +1 similar issue
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-snb2/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-snb2/igt@[email protected]
- shard-hsw: [PASS][20] -> [DMESG-WARN][21] ([fdo#111870]) +1 similar issue
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-hsw6/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-hsw4/igt@[email protected]
* igt@i915_pm_rpm@modeset-non-lpsp-stress:
- shard-hsw: [PASS][22] -> [SKIP][23] ([fdo#109271]) +2 similar issues
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-hsw5/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-hsw4/igt@[email protected]
- shard-glk: [PASS][24] -> [SKIP][25] ([fdo#109271]) +2 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-glk5/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-glk9/igt@[email protected]
* igt@i915_pm_rps@waitboost:
- shard-iclb: [PASS][26] -> [FAIL][27] ([i915#413])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-iclb8/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-iclb5/igt@[email protected]
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [PASS][28] -> [DMESG-WARN][29] ([i915#180]) +1 similar issue
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-apl4/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-apl6/igt@[email protected]
* igt@kms_flip@flip-vs-suspend:
- shard-kbl: [PASS][30] -> [INCOMPLETE][31] ([fdo#103665] / [i915#600])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-kbl3/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-kbl7/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-y:
- shard-glk: [PASS][32] -> [FAIL][33] ([i915#899])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-glk3/igt@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-glk1/igt@[email protected]
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [PASS][34] -> [SKIP][35] ([fdo#109441])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-iclb3/igt@kms_psr@psr2_primary_page_flip.html
* igt@perf_pmu@busy-check-all-vcs1:
- shard-iclb: [PASS][36] -> [SKIP][37] ([fdo#112080]) +9 similar issues
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-iclb1/igt@[email protected]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-iclb3/igt@[email protected]
* igt@perf_pmu@rc6-runtime-pm-long:
- shard-iclb: [PASS][38] -> [SKIP][39] ([i915#293])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-iclb3/igt@[email protected]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-iclb5/igt@[email protected]
- shard-tglb: [PASS][40] -> [SKIP][41] ([fdo#111719])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-tglb3/igt@[email protected]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-tglb2/igt@[email protected]
#### Possible fixes ####
* igt@gem_busy@busy-vcs1:
- shard-iclb: [SKIP][42] ([fdo#112080]) -> [PASS][43] +9 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-iclb5/igt@[email protected]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-iclb2/igt@[email protected]
* {igt@gem_ctx_persistence@close-replace-race}:
- shard-tglb: [INCOMPLETE][44] ([i915#1291]) -> [PASS][45]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-tglb6/igt@[email protected]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-tglb2/igt@[email protected]
* {igt@gem_exec_schedule@implicit-read-write-bsd1}:
- shard-iclb: [SKIP][46] ([fdo#109276] / [i915#677]) -> [PASS][47] +1 similar issue
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-iclb5/igt@[email protected]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-iclb2/igt@[email protected]
* igt@gem_exec_schedule@pi-common-bsd1:
- shard-iclb: [SKIP][48] ([fdo#109276]) -> [PASS][49] +19 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-iclb8/igt@[email protected]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-iclb1/igt@[email protected]
* igt@gem_exec_schedule@pi-shared-iova-bsd:
- shard-iclb: [SKIP][50] ([i915#677]) -> [PASS][51]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-iclb2/igt@[email protected]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-iclb7/igt@[email protected]
* igt@gem_exec_schedule@preemptive-hang-bsd:
- shard-iclb: [SKIP][52] ([fdo#112146]) -> [PASS][53] +2 similar issues
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-iclb4/igt@[email protected]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-iclb8/igt@[email protected]
* igt@gem_mmap_offset@pf-nonblock:
- shard-hsw: [DMESG-WARN][54] -> [PASS][55]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-hsw6/igt@[email protected]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-hsw7/igt@[email protected]
- shard-snb: [DMESG-WARN][56] ([i915#478]) -> [PASS][57]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-snb2/igt@[email protected]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-snb2/igt@[email protected]
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-glk: [FAIL][58] ([i915#644]) -> [PASS][59]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-glk1/igt@[email protected]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-glk2/igt@[email protected]
* igt@gem_workarounds@suspend-resume-fd:
- shard-kbl: [DMESG-WARN][60] ([i915#180]) -> [PASS][61] +2 similar issues
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-kbl3/igt@[email protected]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-kbl1/igt@[email protected]
* igt@kms_big_fb@x-tiled-32bpp-rotate-180:
- shard-kbl: [DMESG-FAIL][62] ([i915#95]) -> [PASS][63]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-kbl6/igt@[email protected]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-kbl7/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-apl: [DMESG-WARN][64] ([i915#180]) -> [PASS][65] +2 similar issues
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-apl4/igt@[email protected]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-apl7/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-glk: [FAIL][66] ([IGT#5] / [i915#697]) -> [PASS][67]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-glk6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-glk8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_frontbuffer_tracking@fbc-2p-shrfb-fliptrack:
- shard-glk: [FAIL][68] ([i915#49]) -> [PASS][69]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-glk9/igt@[email protected]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-glk4/igt@[email protected]
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [SKIP][70] ([fdo#109441]) -> [PASS][71] +2 similar issues
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-iclb7/igt@kms_psr@psr2_primary_mmap_cpu.html
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
* igt@perf@gen12-mi-rpc:
- shard-tglb: [FAIL][72] -> [PASS][73]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-tglb1/igt@[email protected]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-tglb1/igt@[email protected]
#### Warnings ####
* igt@gem_ctx_isolation@vcs1-nonpriv:
- shard-iclb: [SKIP][74] ([fdo#112080]) -> [FAIL][75] ([IGT#28])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-iclb7/igt@[email protected]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-iclb4/igt@[email protected]
* igt@gem_userptr_blits@map-fixed-invalidate-busy-gup:
- shard-hsw: [DMESG-WARN][76] ([fdo#110789] / [fdo#111870]) -> [DMESG-WARN][77] ([fdo#111870])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-hsw6/igt@[email protected]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-hsw7/igt@[email protected]
- shard-snb: [DMESG-WARN][78] ([fdo#110789] / [fdo#111870] / [i915#478]) -> [DMESG-WARN][79] ([fdo#111870] / [i915#478])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-snb5/igt@[email protected]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-snb2/igt@[email protected]
* igt@i915_pm_rpm@dpms-non-lpsp:
- shard-tglb: [SKIP][80] ([fdo#111644]) -> [SKIP][81] ([i915#1316])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-tglb8/igt@[email protected]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-tglb2/igt@[email protected]
- shard-iclb: [SKIP][82] ([fdo#110892]) -> [SKIP][83] ([i915#1316])
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-iclb7/igt@[email protected]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-iclb5/igt@[email protected]
* igt@i915_selftest@live_gt_lrc:
- shard-tglb: [INCOMPLETE][84] ([i915#1233]) -> [DMESG-FAIL][85] ([i915#1233])
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-tglb7/igt@i915_selftest@live_gt_lrc.html
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-tglb3/igt@i915_selftest@live_gt_lrc.html
* igt@kms_content_protection@srm:
- shard-kbl: [TIMEOUT][86] ([i915#1319]) -> [TIMEOUT][87] ([i915#1319] / [i915#727])
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-kbl3/igt@[email protected]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-kbl1/igt@[email protected]
* igt@kms_flip@flip-vs-suspend:
- shard-apl: [DMESG-WARN][88] ([i915#180]) -> [INCOMPLETE][89] ([fdo#103927])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5467/shard-apl1/igt@[email protected]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/shard-apl4/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[IGT#28]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/28
[IGT#5]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/5
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110789]: https://bugs.freedesktop.org/show_bug.cgi?id=110789
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#110892]: https://bugs.freedesktop.org/show_bug.cgi?id=110892
[fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
[fdo#111719]: https://bugs.freedesktop.org/show_bug.cgi?id=111719
[fdo#111870]: https://bugs.freedesktop.org/show_bug.cgi?id=111870
[fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080
[fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146
[i915#1233]: https://gitlab.freedesktop.org/drm/intel/issues/1233
[i915#1291]: https://gitlab.freedesktop.org/drm/intel/issues/1291
[i915#1316]: https://gitlab.freedesktop.org/drm/intel/issues/1316
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#293]: https://gitlab.freedesktop.org/drm/intel/issues/293
[i915#413]: https://gitlab.freedesktop.org/drm/intel/issues/413
[i915#478]: https://gitlab.freedesktop.org/drm/intel/issues/478
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#58]: https://gitlab.freedesktop.org/drm/intel/issues/58
[i915#600]: https://gitlab.freedesktop.org/drm/intel/issues/600
[i915#644]: https://gitlab.freedesktop.org/drm/intel/issues/644
[i915#677]: https://gitlab.freedesktop.org/drm/intel/issues/677
[i915#697]: https://gitlab.freedesktop.org/drm/intel/issues/697
[i915#727]: https://gitlab.freedesktop.org/drm/intel/issues/727
[i915#899]: https://gitlab.freedesktop.org/drm/intel/issues/899
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (8 -> 8)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5467 -> IGTPW_4223
CI-20190529: 20190529
CI_DRM_8005: 81f641f60edbfa1ccb169689206f0af360a06e31 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4223: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/index.html
IGT_5467: 2684f182424582c66e67bcbbda77cd60901627b8 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4223/index.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev