tests: Return EXIT_FAILURE/EXIT_SUCCESS instead of -1/0

When using VIR_TEST_MAIN() or VIR_TEST_MAIN_PRELOAD() macros, the
retval of mymain() will become retval of main(). Hence, mymain()
should use EXIT_FAILURE and EXIT_SUCCESS return values for
greater portability. Another reason is that otherwise our summary
printing of failed tests doesn't work (see following commit for
more info).

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/tests/fchosttest.c b/tests/fchosttest.c
index 44e7f1159956c8949c36c65247167df38d73aaa0..53d02241cad0e449df5f52e70ab86513890d75be 100644 (file)
--- a/tests/fchosttest.c
+++ b/tests/fchosttest.c
@@ -374,7 +374,7 @@ mymain(void)
         ret = -1;
 
     VIR_FREE(fchost_prefix);
-    return ret;
+    return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
 VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virrandom"))

diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c
index 184ffca15f8f96631545a6bc024043596e3345ad..f7186700c4265b05fc1d9aacbeba2b06fb730d16 100644 (file)
--- a/tests/qemusecuritytest.c
+++ b/tests/qemusecuritytest.c
@@ -261,7 +261,7 @@ mymain(void)
 #endif
     virObjectUnref(dac);
     virObjectUnref(stack);
-    return ret;
+    return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
 VIR_TEST_MAIN_PRELOAD(mymain,

diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c
index 17825bba354bdea09bba5c3a5d3ae400e7b4ad30..7508ac37a3d936043a047252f0b3ac326a9e6c17 100644 (file)
--- a/tests/scsihosttest.c
+++ b/tests/scsihosttest.c
@@ -282,7 +282,7 @@ mymain(void)
     VIR_FREE(fakerootdir);
     VIR_FREE(fakesysfsdir);
     VIR_FREE(scsihost_class_path);
-    return ret;
+    return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
 VIR_TEST_MAIN(mymain)

diff --git a/tests/seclabeltest.c b/tests/seclabeltest.c
index 39a96d0fc00f759dfee185fccc323446612cd4cd..b2a11b278c9de52ee8e5df66cec664e73a78e344 100644 (file)
--- a/tests/seclabeltest.c
+++ b/tests/seclabeltest.c
@@ -33,7 +33,7 @@ mymain(void)
 
     virObjectUnref(mgr);
 
-    return 0;
+    return EXIT_SUCCESS;
 }
 
 VIR_TEST_MAIN(mymain)

diff --git a/tests/storagepoolcapstest.c b/tests/storagepoolcapstest.c
index f937670aa7d8d59a0540d9efadc173c4f089863b..526c9ad0454dbdcb52cd3f95d59944a96cfbd65c 100644 (file)
--- a/tests/storagepoolcapstest.c
+++ b/tests/storagepoolcapstest.c
@@ -101,7 +101,7 @@ mymain(void)
     DO_TEST("full", fullCaps);
     DO_TEST("fs", fsCaps);
 
-    return ret;
+    return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
 VIR_TEST_MAIN(mymain)

diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c
index a376a613dba668c0f8bcaedb6227c185f10e6faf..02241c4c20e95ed7b860d6fa30943f0c0adcd224 100644 (file)
--- a/tests/virbitmaptest.c
+++ b/tests/virbitmaptest.c
@@ -784,7 +784,7 @@ mymain(void)
     if (virTestRun("test16", test16, NULL) < 0)
         ret = -1;
 
-    return ret;
+    return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
 VIR_TEST_MAIN(mymain)

diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c
index ead3fb88ff6e76b00bb3dcfc62bbb9d39480b078..5b1b60124a22412ea62863d912f8c65b3195e840 100644 (file)
--- a/tests/vircaps2xmltest.c
+++ b/tests/vircaps2xmltest.c
@@ -113,7 +113,7 @@ mymain(void)
     DO_TEST_FULL("resctrl-skx-twocaches", VIR_ARCH_X86_64, true, true);
     DO_TEST_FULL("resctrl-fake-feature", VIR_ARCH_X86_64, true, true);
 
-    return ret;
+    return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
 VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virnuma"))

diff --git a/tests/vircapstest.c b/tests/vircapstest.c
index 9299b42bf37c47dca22b2853111a6ced186dc0da..8cb6fafd1d8ab296f2a8a40fffe5f50b58679f5b 100644 (file)
--- a/tests/vircapstest.c
+++ b/tests/vircapstest.c
@@ -249,7 +249,7 @@ mymain(void)
         ret = -1;
 #endif /* WITH_LXC */
 
-    return ret;
+    return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
 VIR_TEST_MAIN(mymain)

diff --git a/tests/virconftest.c b/tests/virconftest.c
index 52f68287d65a4017ef99df6b829ab0c8432e3fe4..f1a58b01cffaac30c110997310265f2e5aebc75e 100644 (file)
--- a/tests/virconftest.c
+++ b/tests/virconftest.c
@@ -465,7 +465,7 @@ mymain(void)
     if (virTestRun("string-list", testConfParseStringList, NULL) < 0)
         ret = -1;
 
-    return ret;
+    return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
 

diff --git a/tests/virendiantest.c b/tests/virendiantest.c
index 38adef93535aabe7986218ba70c76182033bdbc4..8a6d2f5e2dd47ef23df2275e06d93e77f195be9c 100644 (file)
--- a/tests/virendiantest.c
+++ b/tests/virendiantest.c
@@ -108,7 +108,7 @@ mymain(void)
     if (virTestRun("test2", test2, NULL) < 0)
         ret = -1;
 
-    return ret;
+    return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
 VIR_TEST_MAIN(mymain)

diff --git a/tests/virlogtest.c b/tests/virlogtest.c
index 44d71015d539a844b0c49dd5527f9ca0bf49dfd4..582ac5c5b8794a9346d2c3400c1d99068b1cdfd6 100644 (file)
--- a/tests/virlogtest.c
+++ b/tests/virlogtest.c
@@ -151,7 +151,7 @@ mymain(void)
     TEST_PARSE_FILTERS_FAIL(":foo", 1);
     TEST_PARSE_FILTERS_FAIL("1:+", 1);
 
-    return ret;
+    return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
 VIR_TEST_MAIN(mymain)

diff --git a/tests/virresctrltest.c b/tests/virresctrltest.c
index 00f9f552e5032682a837d2adb85620f04a36923a..26fbde3668959c7a912453d482a64d91f3eda320 100644 (file)
--- a/tests/virresctrltest.c
+++ b/tests/virresctrltest.c
@@ -93,7 +93,7 @@ mymain(void)
     DO_TEST_UNUSED("resctrl-skx");
     DO_TEST_UNUSED("resctrl-skx-twocaches");
 
-    return ret;
+    return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
 VIR_TEST_MAIN(mymain)

diff --git a/tests/virscsitest.c b/tests/virscsitest.c
index 84b6f15ec666ff0332d833970e9b65643b68278a..0d7c35a2615cfd60aaa5166ecf3ece9e9186c410 100644 (file)
--- a/tests/virscsitest.c
+++ b/tests/virscsitest.c
@@ -229,7 +229,7 @@ mymain(void)
     if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
         virFileDeleteTree(tmpdir);
     VIR_FREE(virscsi_prefix);
-    return ret;
+    return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
 VIR_TEST_MAIN(mymain)