summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Hesse <list@eworm.de>2013-07-30 09:07:20 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-07-30 09:29:21 -0400
commit751e75769a0a8a255e1a47656f639768879e9518 (patch)
treeee1fb0816456be0bf1c8997a34547900cb817ca0 /src
parent095b30cbf976b6c82a10c16bef76fa5b4c03f658 (diff)
test-unit-file: return error without dumping core on permission error
Diffstat (limited to 'src')
-rw-r--r--src/test/test-unit-file.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index a7fe77af24..2075e86115 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -36,7 +36,7 @@
#include "strv.h"
#include "fileio.h"
-static void test_unit_file_get_set(void) {
+static int test_unit_file_get_set(void) {
int r;
Hashmap *h;
Iterator i;
@@ -46,13 +46,17 @@ static void test_unit_file_get_set(void) {
assert(h);
r = unit_file_get_list(UNIT_FILE_SYSTEM, NULL, h);
- log_info("unit_file_get_list: %s", strerror(-r));
- assert(r >= 0);
+ log_full(r == 0 ? LOG_INFO : LOG_ERR,
+ "unit_file_get_list: %s", strerror(-r));
+ if (r < 0)
+ return EXIT_FAILURE;
HASHMAP_FOREACH(p, h, i)
printf("%s = %s\n", p->path, unit_file_state_to_string(p->state));
unit_file_list_free(h);
+
+ return 0;
}
static void check_execcommand(ExecCommand *c,
@@ -351,11 +355,12 @@ static void test_install_printf(void) {
#pragma GCC diagnostic pop
int main(int argc, char *argv[]) {
+ int r;
log_parse_environment();
log_open();
- test_unit_file_get_set();
+ r = test_unit_file_get_set();
test_config_parse_exec();
test_load_env_file_1();
test_load_env_file_2();
@@ -363,5 +368,5 @@ int main(int argc, char *argv[]) {
test_load_env_file_4();
test_install_printf();
- return 0;
+ return r;
}