summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-02-26 09:00:33 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-03-04 21:45:44 -0500
commitf26b57d12a2ea08a9b2622dfb2a5cc76988318b1 (patch)
tree149e914dad09e1a9f1b4876c9c9b74ca5bf56d58
parent04c760d2fe8615203993829f7724f7e6ba553340 (diff)
Move test-loopback to normal tests
In the normal case lo should be already configured and this should be a noop, even when run under root.
-rw-r--r--Makefile.am2
-rw-r--r--src/test/test-loopback.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 0f17bad8b1..5f5d9f0105 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1387,7 +1387,6 @@ EXTRA_DIST += \
manual_tests += \
test-ns \
- test-loopback \
test-hostname \
test-daemon \
test-cgroup \
@@ -1411,6 +1410,7 @@ manual_tests += \
endif
tests += \
+ test-loopback \
test-engine \
test-cgroup-mask \
test-job-type \
diff --git a/src/test/test-loopback.c b/src/test/test-loopback.c
index 2748395ade..7b67337331 100644
--- a/src/test/test-loopback.c
+++ b/src/test/test-loopback.c
@@ -31,7 +31,7 @@ int main(int argc, char* argv[]) {
r = loopback_setup();
if (r < 0)
- fprintf(stderr, "loopback: %s\n", strerror(-r));
+ log_error("loopback: %m");
- return 0;
+ return r >= 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}