diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-02-13 11:35:43 +0100 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-02-15 10:36:40 +0100 |
commit | ab5baafb4994bda219d87f6c15b562a9f24a203a (patch) | |
tree | 5b302f7a2f5664580344ee77012b8a1fadca4d5d /lib/tests/igt_simulation.c | |
parent | 395eaffd7e1390c9d6043c2980dc14ce3e08b154 (diff) |
lib/tests: Drop NIH exit status handling
Spotted by Chris.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'lib/tests/igt_simulation.c')
-rw-r--r-- | lib/tests/igt_simulation.c | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/lib/tests/igt_simulation.c b/lib/tests/igt_simulation.c index 32830ba7..2efccac4 100644 --- a/lib/tests/igt_simulation.c +++ b/lib/tests/igt_simulation.c @@ -99,7 +99,7 @@ static int do_fork(void) internal_assert(WIFEXITED(status)); - return WEXITSTATUS(status); + return status; } } @@ -108,10 +108,10 @@ int main(int argc, char **argv) /* simple tests */ simple = true; internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0); - internal_assert(do_fork() == IGT_EXIT_SKIP); + internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SKIP); internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0); - internal_assert(do_fork() == IGT_EXIT_SUCCESS); + internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS); /* subtests, list mode */ simple = false; @@ -119,25 +119,29 @@ int main(int argc, char **argv) in_fixture = false; internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0); - internal_assert(do_fork() == IGT_EXIT_SUCCESS); + internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS); internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0); - internal_assert(do_fork() == IGT_EXIT_SUCCESS); + internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS); in_fixture = true; internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0); - internal_assert(do_fork() == IGT_EXIT_SUCCESS); + internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS); + internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0); - internal_assert(do_fork() == IGT_EXIT_SUCCESS); + internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS); + in_fixture = false; in_subtest = true; internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0); - internal_assert(do_fork() == IGT_EXIT_SUCCESS); + internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS); + internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0); - internal_assert(do_fork() == IGT_EXIT_SUCCESS); + internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS); + /* subtest, run mode */ simple = false; @@ -145,25 +149,30 @@ int main(int argc, char **argv) in_fixture = false; internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0); - internal_assert(do_fork() == IGT_EXIT_SKIP); + internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SKIP); internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0); - internal_assert(do_fork() == IGT_EXIT_SUCCESS); + internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS); + in_fixture = true; internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0); - internal_assert(do_fork() == IGT_EXIT_SKIP); + internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SKIP); + internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0); - internal_assert(do_fork() == IGT_EXIT_SUCCESS); + internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS); + in_fixture = false; in_subtest = true; internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0); - internal_assert(do_fork() == IGT_EXIT_SKIP); + internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SKIP); + internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0); - internal_assert(do_fork() == IGT_EXIT_SUCCESS); + internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS); + return 0; } |