test: move the kernel test to the same infrastructure

We previously had this separate because it tested separate things. Now the
setup is generic enough that we should just re-use it.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/test/Makefile.am b/test/Makefile.am
index 78950e97e0a265a01bf9d4f45880a526d414eb4d..b3c0c623b33f8625ec3d7ba17d030ca29d4c5bef 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -83,8 +83,10 @@ test_libevdev_LDADD = $(CHECK_LIBS) $(top_builddir)/libevdev/libevdev.la
 test_libevdev_LDFLAGS = -no-install
 
 test_kernel_SOURCES = \
+                     test-main.c \
                      test-kernel.c \
                      $(common_sources)
+
 test_kernel_CFLAGS = -I$(top_srcdir)
 test_kernel_LDADD = $(CHECK_LIBS) $(top_builddir)/libevdev/libevdev.la
 

diff --git a/test/test-kernel.c b/test/test-kernel.c
index 411306aa4bdc5ad36eff619ad7930651a3a11568..1314d890c826e3a79b2858c7495e4daaf070a973 100644 (file)
--- a/test/test-kernel.c
+++ b/test/test-kernel.c
@@ -160,31 +160,15 @@ out:
 }
 END_TEST
 
-int main(int argc, char **argv)
+TEST_SUITE_ROOT_PRIVILEGES(kernel)
 {
-       SRunner *sr;
-       Suite *s;
-       TCase *tc;
-       int failed;
-
-       if (getuid() != 0) {
-               fprintf(stderr, "This test needs to run as root\n");
-               return 77;
-       }
-
-       s = suite_create("kernel tests");
+       Suite *s = suite_create("kernel");
 
-       tc = tcase_create("EVIOCREVOKE");
+       TCase *tc = tcase_create("EVIOCREVOKE");
        tcase_add_test(tc, test_revoke);
        tcase_add_test(tc, test_revoke_invalid);
        tcase_add_test(tc, test_revoke_fail_after);
        suite_add_tcase(s, tc);
 
-       sr = srunner_create(s);
-       srunner_run_all(sr, CK_NORMAL);
-
-       failed = srunner_ntests_failed(sr);
-       srunner_free(sr);
-
-       return failed;
+       return s;
 }