]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemusecuritytest: Honour EXIT_AM_SKIP
authorMichal Privoznik <mprivozn@redhat.com>
Mon, 17 May 2021 19:34:55 +0000 (21:34 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 18 May 2021 11:18:05 +0000 (13:18 +0200)
There is a case where qemusecuritytest is skipped - on MacOS and
MinGW. In such case, EXIT_AM_SKIP should be returned.  However,
my recent patch of 5d99b157bc completely missed that and made the
test return EXIT_FAILURE even though the test exited early
without performing any test case.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
tests/qemusecuritytest.c

index f7186700c4265b05fc1d9aacbeba2b06fb730d16..a7e87fdf8f0ca6d7be63bde9545df1af5012c352 100644 (file)
@@ -143,15 +143,13 @@ mymain(void)
 #endif
     int ret = 0;
 
+    if (!virSecurityXATTRNamespaceDefined())
+        return EXIT_AM_SKIP;
+
     if (virInitialize() < 0 ||
         qemuTestDriverInit(&driver) < 0)
         return -1;
 
-    if (!virSecurityXATTRNamespaceDefined()) {
-        ret = EXIT_AM_SKIP;
-        goto cleanup;
-    }
-
     /* Now fix the secdriver */
     virObjectUnref(driver.securityManager);