diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-04-29 12:54:26 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2019-05-24 10:48:28 +0200 |
| commit | 18f8c5d4661195ac142d4e9554982ffbbe3b199e (patch) | |
| tree | 9ba1aeb169ee321565995b441ac4bd3b25e13d01 /src/test/test-execute.c | |
| parent | 727a1a06077ed8395f72a142b04f37d6058d381b (diff) | |
| download | systemd-18f8c5d4661195ac142d4e9554982ffbbe3b199e.tar.gz | |
test-execute: check exit code before exit status
The meaning of the status changes depending on the code, hence let's
always compare the code first, status second.
Diffstat (limited to 'src/test/test-execute.c')
| -rw-r--r-- | src/test/test-execute.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/test/test-execute.c b/src/test/test-execute.c index 9f1cb0ca38..a27de296a4 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -62,18 +62,20 @@ static void check(const char *func, Manager *m, Unit *unit, int status_expected, } } exec_status_dump(&service->main_exec_status, stdout, "\t"); - if (service->main_exec_status.status != status_expected) { - log_error("%s: %s: exit status %d, expected %d", - func, unit->id, - service->main_exec_status.status, status_expected); - abort(); - } + if (service->main_exec_status.code != code_expected) { log_error("%s: %s: exit code %d, expected %d", func, unit->id, service->main_exec_status.code, code_expected); abort(); } + + if (service->main_exec_status.status != status_expected) { + log_error("%s: %s: exit status %d, expected %d", + func, unit->id, + service->main_exec_status.status, status_expected); + abort(); + } } static bool check_nobody_user_and_group(void) { |