diff options
author | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2020-06-16 16:55:24 +0300 |
---|---|---|
committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2020-06-22 13:32:01 +0300 |
commit | 1f96796c27d4f7a3783baa935165bbe1122543e1 (patch) | |
tree | b84c44452ddf0074c397ed0c40fe66ab980959f7 /lib | |
parent | d2e4cb0cf92c7e3f3d8e88841ed9160e97aebbe4 (diff) |
igt/core: Disallow igt_require/skip in non-main threads
Handling magic control blocks and longjmp() out of them in threads is
hard.
The test should state the requirements before it starts spinning
threads.
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/igt_core.c | 3 | ||||
-rw-r--r-- | lib/tests/igt_thread.c | 34 |
2 files changed, 36 insertions, 1 deletions
diff --git a/lib/igt_core.c b/lib/igt_core.c index ccf06cf44..cedd8168e 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -1475,6 +1475,9 @@ void __igt_skip_check(const char *file, const int line, int err = errno; char *err_str = NULL; + if (!igt_thread_is_main()) + assert(!"igt_require/skip allowed only in the main thread!"); + if (err) igt_assert_neq(asprintf(&err_str, "Last errno: %i, %s\n", err, strerror(err)), -1); diff --git a/lib/tests/igt_thread.c b/lib/tests/igt_thread.c index 7185dd5d1..e9d37584c 100644 --- a/lib/tests/igt_thread.c +++ b/lib/tests/igt_thread.c @@ -43,6 +43,12 @@ static void *failure_thread(void *data) return NULL; } +static void *require_thread(void *data) +{ + igt_require(false); + return NULL; +} + static void one_subtest_fail(void) { igt_subtest_init(fake_argc, fake_argv); @@ -103,10 +109,21 @@ static void simple_failure(void) { igt_exit(); } +static void require_non_main_thread(void) { + pthread_t thread; + + igt_simple_init(fake_argc, fake_argv); + + pthread_create(&thread, 0, require_thread, NULL); + pthread_join(thread, NULL); + + igt_exit(); +} + int main(int argc, char **argv) { int status; - int outfd; + int outfd, errfd; pid_t pid; /* failing should be limited just to a single subtest */ { @@ -190,5 +207,20 @@ int main(int argc, char **argv) close(outfd); } + /* require in a thread should SIGABRT */ { + static char err[4096]; + + pid = do_fork_bg_with_pipes(require_non_main_thread, NULL, &errfd); + + read_whole_pipe(errfd, err, sizeof(err)); + + internal_assert(safe_wait(pid, &status) != -1); + internal_assert_wsignaled(status, SIGABRT); + + internal_assert(strstr(err, "allowed only in the main thread")); + + close(errfd); + } + return 0; } |