Pull all tests together into one binary

Easier to monitor gcov coverage that way

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

diff --git a/test/Makefile.am b/test/Makefile.am
index 88b4b8f..080e8e8 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-noinst_PROGRAMS = test-event-names test-libevdev-init test-libevdev-has-event test-int-queue
+noinst_PROGRAMS = test-libevdev
 
 TESTS = $(noinst_PROGRAMS)
 
@@ -11,19 +11,15 @@ common_sources = $(libevdev_sources) test-common-uinput.c test-common-uinput.h
 # include builddir for event-names.h
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)/libevdev $(CHECK_CFLAGS) $(GCOV_CFLAGS)
 
+test_libevdev_SOURCES = \
+                       test-main.c \
+                       test-event-names.c \
+                       test-libevdev-init.c \
+                       test-libevdev-has-event.c \
+                       test-int-queue.c \
+                       $(common_sources)
 
-
-test_event_names_SOURCES = test-event-names.c $(common_sources)
-test_event_names_LDADD =  $(CHECK_LIBS) $(GCOV_LDFLAGS)
-
-test_libevdev_init_SOURCES = test-libevdev-init.c $(common_sources)
-test_libevdev_init_LDADD = $(CHECK_LIBS) $(GCOV_LDFLAGS)
-
-test_libevdev_has_event_SOURCES = test-libevdev-has-event.c $(common_sources)
-test_libevdev_has_event_LDADD = $(CHECK_LIBS) $(GCOV_LDFLAGS)
-
-test_int_queue_SOURCES = test-int-queue.c $(common_sources)
-test_int_queue_LDADD = $(CHECK_LIBS) $(GCOV_LDFLAGS)
+test_libevdev_LDADD =  $(CHECK_LIBS) $(GCOV_LDFLAGS)
 
 if GCOV_ENABLED
 

diff --git a/test/test-event-names.c b/test/test-event-names.c
index 9416e12..fb8e90f 100644 (file)
--- a/test/test-event-names.c
+++ b/test/test-event-names.c
@@ -248,14 +248,3 @@ event_name_suite(void)
        return s;
 }
 
-int main(int argc, char **argv)
-{
-       int failed;
-       Suite *s = event_name_suite();
-       SRunner *sr = srunner_create(s);
-       srunner_run_all(sr, CK_NORMAL);
-       failed = srunner_ntests_failed(sr);
-       srunner_free(sr);
-
-       return failed;
-}

diff --git a/test/test-int-queue.c b/test/test-int-queue.c
index 6bc0a6b..02d1bc9 100644 (file)
--- a/test/test-int-queue.c
+++ b/test/test-int-queue.c
@@ -358,14 +358,3 @@ queue_suite(void)
        return s;
 }
 
-int main(int argc, char **argv)
-{
-       int failed;
-       Suite *s = queue_suite();
-       SRunner *sr = srunner_create(s);
-       srunner_run_all(sr, CK_NORMAL);
-       failed = srunner_ntests_failed(sr);
-       srunner_free(sr);
-
-       return failed;
-}

diff --git a/test/test-libevdev-has-event.c b/test/test-libevdev-has-event.c
index 333dac8..3db23c7 100644 (file)
--- a/test/test-libevdev-has-event.c
+++ b/test/test-libevdev-has-event.c
@@ -286,14 +286,3 @@ libevdev_has_event_test(void)
        return s;
 }
 
-int main(int argc, char **argv)
-{
-       int failed;
-       Suite *s = libevdev_has_event_test();
-       SRunner *sr = srunner_create(s);
-       srunner_run_all(sr, CK_NORMAL);
-       failed = srunner_ntests_failed(sr);
-       srunner_free(sr);
-
-       return failed;
-}

diff --git a/test/test-libevdev-init.c b/test/test-libevdev-init.c
index ec27451..b2bb125 100644 (file)
--- a/test/test-libevdev-init.c
+++ b/test/test-libevdev-init.c
@@ -194,15 +194,3 @@ libevdev_init_test(void)
 
        return s;
 }
-
-int main(int argc, char **argv)
-{
-       int failed;
-       Suite *s = libevdev_init_test();
-       SRunner *sr = srunner_create(s);
-       srunner_run_all(sr, CK_NORMAL);
-       failed = srunner_ntests_failed(sr);
-       srunner_free(sr);
-
-       return failed;
-}

diff --git a/test/test-main.c b/test/test-main.c
new file mode 100644 (file)
index 0000000..eb933d6
--- /dev/null
+++ b/test/test-main.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2013 Red Hat, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+#include <check.h>
+
+extern Suite *event_name_suite(void);
+extern Suite *libevdev_init_test(void);
+extern Suite *queue_suite(void);
+extern Suite *libevdev_has_event_test(void);
+
+int main(int argc, char **argv)
+{
+       int failed;
+       Suite *s = libevdev_has_event_test();
+       SRunner *sr = srunner_create(s);
+       srunner_add_suite(sr, libevdev_init_test());
+       srunner_add_suite(sr, queue_suite());
+       srunner_add_suite(sr, event_name_suite());
+       srunner_run_all(sr, CK_NORMAL);
+
+       failed = srunner_ntests_failed(sr);
+       srunner_free(sr);
+
+       return failed;
+}