diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-07-03 17:50:55 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-07-03 17:54:24 +0200 |
| commit | 717603e391b52983ca1fd218e7333a1b9dfc5c05 (patch) | |
| tree | 1a4da5a932aeaa9da207d46e4f71b8bc566e2c27 /src/test | |
| parent | 98be1a746ac0d7a17e69ccb05936a4d6b3223e97 (diff) | |
machinectl: show /etc/os-release information of container in status output
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test-fileio.c | 8 | ||||
| -rw-r--r-- | src/test/test-unit-file.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c index 47a0907f90..1de59fa573 100644 --- a/src/test/test-fileio.c +++ b/src/test/test-fileio.c @@ -72,7 +72,7 @@ static void test_parse_env_file(void) { fflush(f); fclose(f); - r = load_env_file(t, NULL, &a); + r = load_env_file(NULL, t, NULL, &a); assert_se(r >= 0); STRV_FOREACH(i, a) @@ -139,7 +139,7 @@ static void test_parse_env_file(void) { r = write_env_file(p, a); assert_se(r >= 0); - r = load_env_file(p, NULL, &b); + r = load_env_file(NULL, p, NULL, &b); assert_se(r >= 0); unlink(t); @@ -179,7 +179,7 @@ static void test_parse_multiline_env_file(void) { fflush(f); fclose(f); - r = load_env_file(t, NULL, &a); + r = load_env_file(NULL, t, NULL, &a); assert_se(r >= 0); STRV_FOREACH(i, a) @@ -193,7 +193,7 @@ static void test_parse_multiline_env_file(void) { r = write_env_file(p, a); assert_se(r >= 0); - r = load_env_file(p, NULL, &b); + r = load_env_file(NULL, p, NULL, &b); assert_se(r >= 0); unlink(t); diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index 48133428df..34865729f2 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -234,7 +234,7 @@ static void test_load_env_file_1(void) { assert(fd >= 0); assert_se(write(fd, env_file_1, sizeof(env_file_1)) == sizeof(env_file_1)); - r = load_env_file(name, NULL, &data); + r = load_env_file(NULL, name, NULL, &data); assert(r == 0); assert(streq(data[0], "a=a")); assert(streq(data[1], "b=bc")); @@ -257,7 +257,7 @@ static void test_load_env_file_2(void) { assert(fd >= 0); assert_se(write(fd, env_file_2, sizeof(env_file_2)) == sizeof(env_file_2)); - r = load_env_file(name, NULL, &data); + r = load_env_file(NULL, name, NULL, &data); assert(r == 0); assert(streq(data[0], "a=a")); assert(data[1] == NULL); @@ -275,7 +275,7 @@ static void test_load_env_file_3(void) { assert(fd >= 0); assert_se(write(fd, env_file_3, sizeof(env_file_3)) == sizeof(env_file_3)); - r = load_env_file(name, NULL, &data); + r = load_env_file(NULL, name, NULL, &data); assert(r == 0); assert(data == NULL); unlink(name); @@ -291,7 +291,7 @@ static void test_load_env_file_4(void) { assert(fd >= 0); assert_se(write(fd, env_file_4, sizeof(env_file_4)) == sizeof(env_file_4)); - r = load_env_file(name, NULL, &data); + r = load_env_file(NULL, name, NULL, &data); assert(r == 0); assert(streq(data[0], "HWMON_MODULES=coretemp f71882fg")); assert(streq(data[1], "MODULE_0=coretemp")); |