seclabeltest: Update to use VIRT_TEST_MAIN

Our tests should use either VIRT_TEST_MAIN() or
VIRT_TEST_MAIN_PRELOAD() macros which create main() function and
call the passed callback subsequently. This is important because
the wrapper which calls the callback eventually does important
stuff like setting logging based on env variables and such.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index cb72cdf13973df92943324be4ab1037bdfa8a387..75efb902dd1193afa81d41b8acdb28411a9b8e32 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1190,7 +1190,7 @@ virauthconfigtest_SOURCES = \
 virauthconfigtest_LDADD = $(LDADDS)
 
 seclabeltest_SOURCES = \
-       seclabeltest.c
+       seclabeltest.c testutils.h testutils.c
 seclabeltest_LDADD = $(LDADDS)
 
 if WITH_SECDRIVER_SELINUX

diff --git a/tests/seclabeltest.c b/tests/seclabeltest.c
index 6b1e78955a7abfb2bff43e9121d5a46d7a832780..be6e79ff6af9d28c4a709a6e03c7066132293ca5 100644 (file)
--- a/tests/seclabeltest.c
+++ b/tests/seclabeltest.c
@@ -7,9 +7,10 @@
 #include <errno.h>
 #include "security/security_driver.h"
 #include "virrandom.h"
+#include "testutils.h"
 
-int
-main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
+static int
+mymain(void)
 {
     virSecurityManagerPtr mgr;
     const char *doi, *model;
@@ -41,3 +42,5 @@ main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
 
     return 0;
 }
+
+VIRT_TEST_MAIN(mymain)