chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: general cgroup rework
[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 5cc755bb80924e0b32c7bf85e824cb99d72c21ee..a7fe77af240ddaf432a6eaf1b58a8ed23636ba79 100644
(file)
--- 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 */
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);
"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 */
"LValue", 0, "/RValue///slashes/// r1",
&c, NULL);
/* test slashes */
@@
-101,7
+101,7
@@
static void test_config_parse_exec(void) {
"r1", false);
/* honour_argv0 */
"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);
"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 */
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);
"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 */
"/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);
"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 */
"/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 */
"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 */
"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",
"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 */
"/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);
"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 */
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);
"LValue", 0,
"/usr/bin/find \\;",
&c, NULL);
@@
-211,11
+211,11
@@
static void test_config_parse_exec(void) {
static void test_load_env_file_1(void) {
static void test_load_env_file_1(void) {
-
char _cleanup_strv_free_
**data = NULL;
+
_cleanup_strv_free_ char
**data = NULL;
int r;
char name[] = "/tmp/test-load-env-file.XXXXXX";
int r;
char name[] = "/tmp/test-load-env-file.XXXXXX";
-
int _cleanup_close_
fd = mkstemp(name);
+
_cleanup_close_ int
fd = mkstemp(name);
assert(fd >= 0);
assert_se(write(fd, env_file_1, sizeof(env_file_1)) == sizeof(env_file_1));
assert(fd >= 0);
assert_se(write(fd, env_file_1, sizeof(env_file_1)) == sizeof(env_file_1));
@@
-232,11
+232,11
@@
static void test_load_env_file_1(void) {
}
static void test_load_env_file_2(void) {
}
static void test_load_env_file_2(void) {
-
char _cleanup_strv_free_
**data = NULL;
+
_cleanup_strv_free_ char
**data = NULL;
int r;
char name[] = "/tmp/test-load-env-file.XXXXXX";
int r;
char name[] = "/tmp/test-load-env-file.XXXXXX";
-
int _cleanup_close_
fd = mkstemp(name);
+
_cleanup_close_ int
fd = mkstemp(name);
assert(fd >= 0);
assert_se(write(fd, env_file_2, sizeof(env_file_2)) == sizeof(env_file_2));
assert(fd >= 0);
assert_se(write(fd, env_file_2, sizeof(env_file_2)) == sizeof(env_file_2));
@@
-248,11
+248,11
@@
static void test_load_env_file_2(void) {
}
static void test_load_env_file_3(void) {
}
static void test_load_env_file_3(void) {
-
char _cleanup_strv_free_
**data = NULL;
+
_cleanup_strv_free_ char
**data = NULL;
int r;
char name[] = "/tmp/test-load-env-file.XXXXXX";
int r;
char name[] = "/tmp/test-load-env-file.XXXXXX";
-
int _cleanup_close_
fd = mkstemp(name);
+
_cleanup_close_ int
fd = mkstemp(name);
assert(fd >= 0);
assert_se(write(fd, env_file_3, sizeof(env_file_3)) == sizeof(env_file_3));
assert(fd >= 0);
assert_se(write(fd, env_file_3, sizeof(env_file_3)) == sizeof(env_file_3));
@@
-263,11
+263,11
@@
static void test_load_env_file_3(void) {
}
static void test_load_env_file_4(void) {
}
static void test_load_env_file_4(void) {
-
char _cleanup_strv_free_
**data = NULL;
+
_cleanup_strv_free_ char
**data = NULL;
int r;
char name[] = "/tmp/test-load-env-file.XXXXXX";
int r;
char name[] = "/tmp/test-load-env-file.XXXXXX";
-
int _cleanup_close_
fd = mkstemp(name);
+
_cleanup_close_ int
fd = mkstemp(name);
assert(fd >= 0);
assert_se(write(fd, env_file_4, sizeof(env_file_4)) == sizeof(env_file_4));
assert(fd >= 0);
assert_se(write(fd, env_file_4, sizeof(env_file_4)) == sizeof(env_file_4));
@@
-295,7
+295,7
@@
static void test_install_printf(void) {
InstallInfo i3 = {name3, path3, user};
InstallInfo i4 = {name3, path3, NULL};
InstallInfo i3 = {name3, path3, user};
InstallInfo i4 = {name3, path3, NULL};
-
char _cleanup_free_
*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((mid = specifier_machine_id('m', NULL, NULL)));
assert_se((bid = specifier_boot_id('b', NULL, NULL)));
@@
-303,8
+303,8
@@
static void test_install_printf(void) {
#define expect(src, pattern, result) \
do { \
#define expect(src, pattern, result) \
do { \
-
char _cleanup_free_
*t = install_full_printf(&src, pattern); \
-
char _cleanup_free_
\
+
_cleanup_free_ char
*t = install_full_printf(&src, pattern); \
+
_cleanup_free_ char
\
*d1 = strdup(i.name), \
*d2 = strdup(i.path), \
*d3 = strdup(i.user); \
*d1 = strdup(i.name), \
*d2 = strdup(i.path), \
*d3 = strdup(i.user); \