chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-dhcp-client: drop event DHCP_EVENT_NO_LEASE
[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 a8d5b65e6d8249b6fb6197ec060789ddfa769d30..34865729f29c0b97748f3a4cd6398c58d7f0f608 100644
(file)
--- a/
src/test/test-unit-file.c
+++ b/
src/test/test-unit-file.c
@@
-48,6
+48,12
@@
static int test_unit_file_get_set(void) {
assert(h);
r = unit_file_get_list(UNIT_FILE_SYSTEM, NULL, h);
assert(h);
r = unit_file_get_list(UNIT_FILE_SYSTEM, NULL, h);
+
+ if (r == -EPERM || r == -EACCES) {
+ printf("Skipping test: unit_file_get_list: %s", strerror(-r));
+ return EXIT_TEST_SKIP;
+ }
+
log_full(r == 0 ? LOG_INFO : LOG_ERR,
"unit_file_get_list: %s", strerror(-r));
if (r < 0)
log_full(r == 0 ? LOG_INFO : LOG_ERR,
"unit_file_get_list: %s", strerror(-r));
if (r < 0)
@@
-228,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));
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"));
assert(r == 0);
assert(streq(data[0], "a=a"));
assert(streq(data[1], "b=bc"));
@@
-251,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));
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);
assert(r == 0);
assert(streq(data[0], "a=a"));
assert(data[1] == NULL);
@@
-269,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));
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);
assert(r == 0);
assert(data == NULL);
unlink(name);
@@
-285,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));
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"));
assert(r == 0);
assert(streq(data[0], "HWMON_MODULES=coretemp f71882fg"));
assert(streq(data[1], "MODULE_0=coretemp"));
@@
-295,9
+301,6
@@
static void test_load_env_file_4(void) {
}
}
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnonnull"
-
static void test_install_printf(void) {
char name[] = "name.service",
path[] = "/run/systemd/system/name.service",
static void test_install_printf(void) {
char name[] = "name.service",
path[] = "/run/systemd/system/name.service",
@@
-343,7
+346,11
@@
static void test_install_printf(void) {
expect(i, "%p", "name");
expect(i, "%i", "");
expect(i, "%u", "xxxx-no-such-user");
expect(i, "%p", "name");
expect(i, "%i", "");
expect(i, "%u", "xxxx-no-such-user");
+
+ DISABLE_WARNING_NONNULL;
expect(i, "%U", NULL);
expect(i, "%U", NULL);
+ REENABLE_WARNING;
+
expect(i, "%m", mid);
expect(i, "%b", bid);
expect(i, "%H", host);
expect(i, "%m", mid);
expect(i, "%b", bid);
expect(i, "%H", host);
@@
-355,7
+362,11
@@
static void test_install_printf(void) {
expect(i3, "%N", "name@inst");
expect(i3, "%p", "name");
expect(i3, "%u", "xxxx-no-such-user");
expect(i3, "%N", "name@inst");
expect(i3, "%p", "name");
expect(i3, "%u", "xxxx-no-such-user");
+
+ DISABLE_WARNING_NONNULL;
expect(i3, "%U", NULL);
expect(i3, "%U", NULL);
+ REENABLE_WARNING;
+
expect(i3, "%m", mid);
expect(i3, "%b", bid);
expect(i3, "%H", host);
expect(i3, "%m", mid);
expect(i3, "%b", bid);
expect(i3, "%H", host);
@@
-363,7
+374,6
@@
static void test_install_printf(void) {
expect(i4, "%u", "root");
expect(i4, "%U", "0");
}
expect(i4, "%u", "root");
expect(i4, "%U", "0");
}
-#pragma GCC diagnostic pop
int main(int argc, char *argv[]) {
int r;
int main(int argc, char *argv[]) {
int r;