diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-12 08:43:34 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-12 08:43:34 -0400 |
| commit | 670b77ddfab0f4eddbe539964aba83d446d48129 (patch) | |
| tree | 5b159fe9bd52169e05cdc60db5a48a5c5ac9602a /src/test/test-namespace.c | |
| parent | 23708daf3ba69ba9880102b4f720a3842883332e (diff) | |
| parent | 34dbdee3b2f122d2ef903a368b172e75f962b66a (diff) | |
Merge branch 'lukeshu/postmove' into 'lukeshu/master'
Diffstat (limited to 'src/test/test-namespace.c')
| -rw-r--r-- | src/test/test-namespace.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c index 0b2f9e9173..ff9f35cecd 100644 --- a/src/test/test-namespace.c +++ b/src/test/test-namespace.c @@ -69,8 +69,10 @@ static void test_netns(void) { int r, n = 0; siginfo_t si; - if (geteuid() > 0) - return; + if (geteuid() > 0) { + log_info("Skipping test: not root"); + exit(EXIT_TEST_SKIP); + } assert_se(socketpair(AF_UNIX, SOCK_DGRAM, 0, s) >= 0); @@ -124,6 +126,9 @@ int main(int argc, char *argv[]) { char boot_id[SD_ID128_STRING_MAX]; _cleanup_free_ char *x = NULL, *y = NULL, *z = NULL, *zz = NULL; + log_parse_environment(); + log_open(); + assert_se(sd_id128_get_boot(&bid) >= 0); sd_id128_to_string(bid, boot_id); |