summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2015-05-14 14:43:05 +0200
committerLubomir Rintel <lkundrak@v3.sk>2015-05-26 13:51:44 +0200
commit14f4674f64310509a18dc2812759d8f77994b70f (patch)
tree76ee9e68d3352271021b5e5229aa60802cccd85e
parentd0e25ac8be339e4ddcae93978281493d6dee551c (diff)
downloadNetworkManager-14f4674f64310509a18dc2812759d8f77994b70f.tar.gz
tests: call g_test_run() even when skipping the test
It will return the 77 exit code itself. For TAP output it will also generate the proper test skip marker.
-rw-r--r--include/nm-test-utils.h3
-rw-r--r--src/platform/tests/test-common.c2
-rw-r--r--src/rdisc/tests/test-rdisc-fake.c2
3 files changed, 2 insertions, 5 deletions
diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h
index c236a1381e..3b5b946281 100644
--- a/include/nm-test-utils.h
+++ b/include/nm-test-utils.h
@@ -103,9 +103,6 @@
#include "nm-keyfile-internal.h"
#endif
-/* Analog to EXIT_SUCCESS and EXIT_FAILURE. */
-#define EXIT_SKIP (77)
-
/*******************************************************************************/
/* general purpose functions that have no dependency on other nmtst functions */
diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c
index 2d37fb837d..2eda47cc8b 100644
--- a/src/platform/tests/test-common.c
+++ b/src/platform/tests/test-common.c
@@ -295,7 +295,7 @@ main (int argc, char **argv)
return EXIT_FAILURE;
#else
g_print ("Skipping test: requires root privileges (%s)\n", program);
- return EXIT_SKIP;
+ return g_test_run ();
#endif
}
diff --git a/src/rdisc/tests/test-rdisc-fake.c b/src/rdisc/tests/test-rdisc-fake.c
index 3b525203a2..33672637d0 100644
--- a/src/rdisc/tests/test-rdisc-fake.c
+++ b/src/rdisc/tests/test-rdisc-fake.c
@@ -439,7 +439,7 @@ main (int argc, char **argv)
if (nmtst_test_quick ()) {
g_print ("Skipping test: don't run long running test %s (NMTST_DEBUG=slow)\n", str_if_set (g_get_prgname (), "test-rdisc-fake"));
- return EXIT_SKIP;
+ return g_test_run ();
}
nm_fake_platform_setup ();