From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 6 Nov 2020 08:58:33 +0000 (+0100)
Subject: viridentitytest: Run more frequently
X-Git-Tag: v6.10.0-rc1~282
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f88eb77e47c2464e8025114d7aae1bdc028a025;p=thirdparty%2Flibvirt.git

viridentitytest: Run more frequently

The viridentitytest tests our viridentity module which is
compiled on all platforms and OSes. There is no need to have
SELinux secdriver as individual test cases are skipped if SELinux
is missing.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---

diff --git a/tests/meson.build b/tests/meson.build
index 7e7427bb15..f88410ff33 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -313,6 +313,7 @@ tests += [
   { 'name': 'virfirewalltest' },
   { 'name': 'virhostcputest', 'link_whole': [ test_file_wrapper_lib ] },
   { 'name': 'virhostdevtest' },
+  { 'name': 'viridentitytest' },
   { 'name': 'viriscsitest' },
   { 'name': 'virkeycodetest' },
   { 'name': 'virkmodtest' },
@@ -483,7 +484,6 @@ if conf.has('WITH_SECDRIVER_SELINUX')
   if conf.has('WITH_LIBATTR')
     tests += [
       { 'name': 'securityselinuxtest' },
-      { 'name': 'viridentitytest' },
     ]
 
     if conf.has('WITH_QEMU')
diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c
index fd01eeaa80..afb9fdaec4 100644
--- a/tests/viridentitytest.c
+++ b/tests/viridentitytest.c
@@ -88,8 +88,7 @@ static int testIdentityGetSystem(const void *data)
 #if !WITH_SELINUX
     if (context) {
         VIR_DEBUG("libvirt not compiled with SELinux, skipping this test");
-        ret = EXIT_AM_SKIP;
-        return -1;
+        return EXIT_AM_SKIP;
     }
 #endif