diff options
| author | Petri Latvala <petri.latvala@intel.com> | 2019-02-19 12:18:10 +0200 |
|---|---|---|
| committer | Petri Latvala <petri.latvala@intel.com> | 2019-02-21 12:20:49 +0200 |
| commit | ebf2d10a95fff590542808ec14c7bce74ad11b37 (patch) | |
| tree | 94412261f19abde6cc0fa923e038a4cdc4e69b1b /runner | |
| parent | 5aa3651ce2f5f562dad74f3e9d1ba47844e7a998 (diff) | |
runner: Exit with 0 on dry-run
v2: Adjust tests accordingly
Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Diffstat (limited to 'runner')
| -rw-r--r-- | runner/executor.c | 2 | ||||
| -rw-r--r-- | runner/runner_tests.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/runner/executor.c b/runner/executor.c index 3f1eb010..d535c276 100644 --- a/runner/executor.c +++ b/runner/executor.c @@ -1208,7 +1208,7 @@ bool execute(struct execute_state *state, if (state->dry) { printf("Dry run, not executing. Invoke igt_resume if you want to execute.\n"); - return false; + return true; } if ((resdirfd = open(settings->results_path, O_DIRECTORY | O_RDONLY)) < 0) { diff --git a/runner/runner_tests.c b/runner/runner_tests.c index 0965612a..e46568ac 100644 --- a/runner/runner_tests.c +++ b/runner/runner_tests.c @@ -773,8 +773,9 @@ igt_main "Dry run initialization didn't create the results directory.\n"); /* Execute from just initialize_execute_state should fail */ - igt_assert(!execute(&state, &settings, &list)); - igt_assert(openat(dirfd, "0", O_DIRECTORY | O_RDONLY) < 0); + igt_assert(execute(&state, &settings, &list)); + igt_assert_f(openat(dirfd, "0", O_DIRECTORY | O_RDONLY) < 0, + "Dry run executed when it should not have.\n"); igt_assert_f((fd = openat(dirfd, "metadata.txt", O_RDONLY)) >= 0, "Dry run initialization didn't serialize settings.\n"); close(fd); |