From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 26 Feb 2016 14:00:33 +0000 (-0500)
Subject: Move test-loopback to normal tests
X-Git-Tag: v230~283^2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f26b57d12a2ea08a9b2622dfb2a5cc76988318b1;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/Makefile.am b/Makefile.am
index 0f17bad8b12..5f5d9f01058 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 2748395adec..7b67337331b 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;
 }