From e8e581bf256b8c0fbd430935af79fa0e8ee570a1 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mon, 15 Apr 2013 22:25:58 -0400 Subject: Report about syntax errors with metadata The information about the unit for which files are being parsed is passed all the way down. This way messages land in the journal with proper UNIT=... or USER_UNIT=... attribution. 'systemctl status' and 'journalctl -u' not displaying those messages has been a source of confusion for users, since the journal entry for a misspelt setting was often logged quite a bit earlier than the failure to start a unit. Based-on-a-patch-by: Oleksii Shevchuk --- src/test/test-unit-file.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/test/test-unit-file.c') diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index 5cc755bb80..31b0fb2665 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -85,13 +85,13 @@ static void test_config_parse_exec(void) { ExecCommand *c = NULL, *c1; /* basic test */ - r = config_parse_exec("fake", 1, "section", + r = config_parse_exec(NULL, "fake", 1, "section", "LValue", 0, "/RValue r1", &c, NULL); assert_se(r >= 0); check_execcommand(c, "/RValue", "/RValue", "r1", false); - r = config_parse_exec("fake", 2, "section", + r = config_parse_exec(NULL, "fake", 2, "section", "LValue", 0, "/RValue///slashes/// r1", &c, NULL); /* test slashes */ @@ -101,7 +101,7 @@ static void test_config_parse_exec(void) { "r1", false); /* honour_argv0 */ - r = config_parse_exec("fake", 3, "section", + r = config_parse_exec(NULL, "fake", 3, "section", "LValue", 0, "@/RValue///slashes2/// argv0 r1", &c, NULL); assert_se(r >= 0); @@ -109,7 +109,7 @@ static void test_config_parse_exec(void) { check_execcommand(c1, "/RValue/slashes2", "argv0", "r1", false); /* ignore && honour_argv0 */ - r = config_parse_exec("fake", 4, "section", + r = config_parse_exec(NULL, "fake", 4, "section", "LValue", 0, "-@/RValue///slashes3/// argv0a r1", &c, NULL); assert_se(r >= 0); @@ -118,7 +118,7 @@ static void test_config_parse_exec(void) { "/RValue/slashes3", "argv0a", "r1", true); /* ignore && honour_argv0 */ - r = config_parse_exec("fake", 4, "section", + r = config_parse_exec(NULL, "fake", 4, "section", "LValue", 0, "@-/RValue///slashes4/// argv0b r1", &c, NULL); assert_se(r >= 0); @@ -127,21 +127,21 @@ static void test_config_parse_exec(void) { "/RValue/slashes4", "argv0b", "r1", true); /* ignore && ignore */ - r = config_parse_exec("fake", 4, "section", + r = config_parse_exec(NULL, "fake", 4, "section", "LValue", 0, "--/RValue argv0 r1", &c, NULL); assert_se(r == 0); assert_se(c1->command_next == NULL); /* ignore && ignore */ - r = config_parse_exec("fake", 4, "section", + r = config_parse_exec(NULL, "fake", 4, "section", "LValue", 0, "-@-/RValue argv0 r1", &c, NULL); assert_se(r == 0); assert_se(c1->command_next == NULL); /* semicolon */ - r = config_parse_exec("fake", 5, "section", + r = config_parse_exec(NULL, "fake", 5, "section", "LValue", 0, "-@/RValue argv0 r1 ; " "/goo/goo boo", @@ -156,7 +156,7 @@ static void test_config_parse_exec(void) { "/goo/goo", "/goo/goo", "boo", false); /* trailing semicolon */ - r = config_parse_exec("fake", 5, "section", + r = config_parse_exec(NULL, "fake", 5, "section", "LValue", 0, "-@/RValue argv0 r1 ; ", &c, NULL); @@ -168,7 +168,7 @@ static void test_config_parse_exec(void) { assert_se(c1->command_next == NULL); /* escaped semicolon */ - r = config_parse_exec("fake", 5, "section", + r = config_parse_exec(NULL, "fake", 5, "section", "LValue", 0, "/usr/bin/find \\;", &c, NULL); -- cgit v1.2.3-54-g00ecf