chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trivial coding style clean ups
[elogind.git]
/
src
/
test
/
test-unit-file.c
diff --git
a/src/test/test-unit-file.c
b/src/test/test-unit-file.c
index 2075e8611551766ed45a137c76a89cb1c3041741..1b4133b5d34004ba999d02b6cffc027541f52bd2 100644
(file)
--- a/
src/test/test-unit-file.c
+++ b/
src/test/test-unit-file.c
@@
-35,6
+35,7
@@
#include "load-fragment.h"
#include "strv.h"
#include "fileio.h"
#include "load-fragment.h"
#include "strv.h"
#include "fileio.h"
+#include "test-helper.h"
static int test_unit_file_get_set(void) {
int r;
static int test_unit_file_get_set(void) {
int r;
@@
-79,6
+80,7
@@
static void test_config_parse_exec(void) {
/* const char *filename, */
/* unsigned line, */
/* const char *section, */
/* const char *filename, */
/* unsigned line, */
/* const char *section, */
+ /* unsigned section_line, */
/* const char *lvalue, */
/* int ltype, */
/* const char *rvalue, */
/* const char *lvalue, */
/* int ltype, */
/* const char *rvalue, */
@@
-89,13
+91,13
@@
static void test_config_parse_exec(void) {
ExecCommand *c = NULL, *c1;
/* basic test */
ExecCommand *c = NULL, *c1;
/* basic test */
- r = config_parse_exec(NULL, "fake", 1, "section",
+ r = config_parse_exec(NULL, "fake", 1, "section",
1,
"LValue", 0, "/RValue r1",
&c, NULL);
assert_se(r >= 0);
check_execcommand(c, "/RValue", "/RValue", "r1", false);
"LValue", 0, "/RValue r1",
&c, NULL);
assert_se(r >= 0);
check_execcommand(c, "/RValue", "/RValue", "r1", false);
- r = config_parse_exec(NULL, "fake", 2, "section",
+ r = config_parse_exec(NULL, "fake", 2, "section",
1,
"LValue", 0, "/RValue///slashes/// r1",
&c, NULL);
/* test slashes */
"LValue", 0, "/RValue///slashes/// r1",
&c, NULL);
/* test slashes */
@@
-105,7
+107,7
@@
static void test_config_parse_exec(void) {
"r1", false);
/* honour_argv0 */
"r1", false);
/* honour_argv0 */
- r = config_parse_exec(NULL, "fake", 3, "section",
+ r = config_parse_exec(NULL, "fake", 3, "section",
1,
"LValue", 0, "@/RValue///slashes2/// argv0 r1",
&c, NULL);
assert_se(r >= 0);
"LValue", 0, "@/RValue///slashes2/// argv0 r1",
&c, NULL);
assert_se(r >= 0);
@@
-113,7
+115,7
@@
static void test_config_parse_exec(void) {
check_execcommand(c1, "/RValue/slashes2", "argv0", "r1", false);
/* ignore && honour_argv0 */
check_execcommand(c1, "/RValue/slashes2", "argv0", "r1", false);
/* ignore && honour_argv0 */
- r = config_parse_exec(NULL, "fake", 4, "section",
+ r = config_parse_exec(NULL, "fake", 4, "section",
1,
"LValue", 0, "-@/RValue///slashes3/// argv0a r1",
&c, NULL);
assert_se(r >= 0);
"LValue", 0, "-@/RValue///slashes3/// argv0a r1",
&c, NULL);
assert_se(r >= 0);
@@
-122,7
+124,7
@@
static void test_config_parse_exec(void) {
"/RValue/slashes3", "argv0a", "r1", true);
/* ignore && honour_argv0 */
"/RValue/slashes3", "argv0a", "r1", true);
/* ignore && honour_argv0 */
- r = config_parse_exec(NULL, "fake", 4, "section",
+ r = config_parse_exec(NULL, "fake", 4, "section",
1,
"LValue", 0, "@-/RValue///slashes4/// argv0b r1",
&c, NULL);
assert_se(r >= 0);
"LValue", 0, "@-/RValue///slashes4/// argv0b r1",
&c, NULL);
assert_se(r >= 0);
@@
-131,21
+133,21
@@
static void test_config_parse_exec(void) {
"/RValue/slashes4", "argv0b", "r1", true);
/* ignore && ignore */
"/RValue/slashes4", "argv0b", "r1", true);
/* ignore && ignore */
- r = config_parse_exec(NULL, "fake", 4, "section",
+ r = config_parse_exec(NULL, "fake", 4, "section",
1,
"LValue", 0, "--/RValue argv0 r1",
&c, NULL);
assert_se(r == 0);
assert_se(c1->command_next == NULL);
/* ignore && ignore */
"LValue", 0, "--/RValue argv0 r1",
&c, NULL);
assert_se(r == 0);
assert_se(c1->command_next == NULL);
/* ignore && ignore */
- r = config_parse_exec(NULL, "fake", 4, "section",
+ r = config_parse_exec(NULL, "fake", 4, "section",
1,
"LValue", 0, "-@-/RValue argv0 r1",
&c, NULL);
assert_se(r == 0);
assert_se(c1->command_next == NULL);
/* semicolon */
"LValue", 0, "-@-/RValue argv0 r1",
&c, NULL);
assert_se(r == 0);
assert_se(c1->command_next == NULL);
/* semicolon */
- r = config_parse_exec(NULL, "fake", 5, "section",
+ r = config_parse_exec(NULL, "fake", 5, "section",
1,
"LValue", 0,
"-@/RValue argv0 r1 ; "
"/goo/goo boo",
"LValue", 0,
"-@/RValue argv0 r1 ; "
"/goo/goo boo",
@@
-160,7
+162,7
@@
static void test_config_parse_exec(void) {
"/goo/goo", "/goo/goo", "boo", false);
/* trailing semicolon */
"/goo/goo", "/goo/goo", "boo", false);
/* trailing semicolon */
- r = config_parse_exec(NULL, "fake", 5, "section",
+ r = config_parse_exec(NULL, "fake", 5, "section",
1,
"LValue", 0,
"-@/RValue argv0 r1 ; ",
&c, NULL);
"LValue", 0,
"-@/RValue argv0 r1 ; ",
&c, NULL);
@@
-172,7
+174,7
@@
static void test_config_parse_exec(void) {
assert_se(c1->command_next == NULL);
/* escaped semicolon */
assert_se(c1->command_next == NULL);
/* escaped semicolon */
- r = config_parse_exec(NULL, "fake", 5, "section",
+ r = config_parse_exec(NULL, "fake", 5, "section",
1,
"LValue", 0,
"/usr/bin/find \\;",
&c, NULL);
"LValue", 0,
"/usr/bin/find \\;",
&c, NULL);
@@
-301,17
+303,18
@@
static void test_install_printf(void) {
_cleanup_free_ char *mid, *bid, *host;
_cleanup_free_ char *mid, *bid, *host;
- assert_se(
(mid = specifier_machine_id('m', NULL, NULL))
);
- assert_se(
(bid = specifier_boot_id('b', NULL, NULL))
);
+ assert_se(
specifier_machine_id('m', NULL, NULL, &mid) >= 0 && mid
);
+ assert_se(
specifier_boot_id('b', NULL, NULL, &bid) >= 0 && bid
);
assert_se((host = gethostname_malloc()));
#define expect(src, pattern, result) \
do { \
assert_se((host = gethostname_malloc()));
#define expect(src, pattern, result) \
do { \
- _cleanup_free_ char *t =
install_full_printf(&src, pattern);
\
+ _cleanup_free_ char *t =
NULL;
\
_cleanup_free_ char \
*d1 = strdup(i.name), \
*d2 = strdup(i.path), \
*d3 = strdup(i.user); \
_cleanup_free_ char \
*d1 = strdup(i.name), \
*d2 = strdup(i.path), \
*d3 = strdup(i.user); \
+ assert_se(install_full_printf(&src, pattern, &t) >= 0 || !result); \
memzero(i.name, strlen(i.name)); \
memzero(i.path, strlen(i.path)); \
memzero(i.user, strlen(i.user)); \
memzero(i.name, strlen(i.name)); \
memzero(i.path, strlen(i.path)); \
memzero(i.user, strlen(i.user)); \
@@
-366,7
+369,7
@@
int main(int argc, char *argv[]) {
test_load_env_file_2();
test_load_env_file_3();
test_load_env_file_4();
test_load_env_file_2();
test_load_env_file_3();
test_load_env_file_4();
-
test_install_printf(
);
+
TEST_REQ_RUNNING_SYSTEMD(test_install_printf()
);
return r;
}
return r;
}