From 30d37abbc012886089a674f329b693f47caac12c Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 14 May 2015 14:43:05 +0200 Subject: [PATCH] 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. (cherry picked from commit 14f4674f64310509a18dc2812759d8f77994b70f) --- include/nm-test-utils.h | 3 --- src/platform/tests/test-common.c | 2 +- src/rdisc/tests/test-rdisc-fake.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h index 36b0cbd9df..7d5a35aa36 100644 --- a/include/nm-test-utils.h +++ b/include/nm-test-utils.h @@ -97,9 +97,6 @@ #include "gsystem-local-alloc.h" -/* 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 ();