From 85810dac8ccb94a1f46c17387e08bb75e16be08b Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Tue, 12 Mar 2013 09:47:28 +0000 Subject: [PATCH] tests: Add xml output file for check runs for the use with jenkins. We can do pretty graphs with jenkins about our unit tests. But we need the check xml output for that. Enabling it in all suites. --- .gitignore | 9 +++++++++ src/Makefile.am | 1 + src/Makefile_EDBus.am | 4 +++- src/Makefile_Ecore.am | 1 + src/Makefile_Edje.am | 1 + src/Makefile_Eeze.am | 2 +- src/Makefile_Efreet.am | 3 ++- src/Makefile_Eo.am | 1 + src/tests/ecore/ecore_suite.c | 2 ++ src/tests/edbus/edbus_suite.c | 2 ++ src/tests/edje/edje_suite.c | 2 ++ src/tests/eet/eet_suite.c | 1 + src/tests/eeze/eeze_suite.c | 1 + src/tests/efreet/efreet_suite.c | 2 ++ src/tests/eina/eina_suite.c | 2 ++ src/tests/eo/suite/eo_suite.c | 2 ++ src/tests/evas/evas_suite.c | 2 ++ 17 files changed, 35 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b19003eb13..0c2a6603dd 100644 --- a/.gitignore +++ b/.gitignore @@ -318,4 +318,13 @@ Makefile.in /src/tests/evas/evas_suite.log /src/tests/evas/evas_suite.trs /src/test-suite.log +/src/tests/ecore/check-results.xml +/src/tests/edbus/check-results.xml +/src/tests/edje/check-results.xml +/src/tests/eet/check-results.xml +/src/tests/eeze/check-results.xml +/src/tests/efreet/check-results.xml +/src/tests/eina/check-results.xml +/src/tests/eo/check-results.xml +/src/tests/evas/check-results.xml /coverage diff --git a/src/Makefile.am b/src/Makefile.am index d0e176db1a..a903eed962 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -96,3 +96,4 @@ install-examples: clean-local: find . -type f -name '*.gcno' -delete find . -type f -name '*.gcda' -delete + find . -type f -name check-results.xml -delete diff --git a/src/Makefile_EDBus.am b/src/Makefile_EDBus.am index 98f30696ff..99f0c63c2e 100644 --- a/src/Makefile_EDBus.am +++ b/src/Makefile_EDBus.am @@ -71,7 +71,9 @@ tests/edbus/edbus_suite.c \ tests/edbus/edbus_test_edbus_init.c \ tests/edbus/edbus_suite.h -tests_edbus_edbus_suite_CPPFLAGS = @CHECK_CFLAGS@ @EDBUS_CFLAGS@ +tests_edbus_edbus_suite_CPPFLAGS = @CHECK_CFLAGS@ @EDBUS_CFLAGS@ \ +-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/edbus\" + tests_edbus_edbus_suite_LDADD = @CHECK_LIBS@ @USE_EDBUS_LIBS@ tests_edbus_edbus_suite_DEPENDENCIES = @USE_EDBUS_INTERNAL_LIBS@ diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am index b4096158d0..3cc047ef91 100644 --- a/src/Makefile_Ecore.am +++ b/src/Makefile_Ecore.am @@ -72,6 +72,7 @@ tests/ecore/ecore_suite.h tests_ecore_ecore_suite_CPPFLAGS = \ -DTESTS_SRC_DIR=\"`pwd`/$(top_srcdir)\" \ +-DCHECK_SRC_DIR=\"$(top_srcdir)/src/tests/ecore\" \ @CHECK_CFLAGS@ \ @ECORE_CFLAGS@ \ @ECORE_AUDIO_CFLAGS@ \ diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am index 4a4d46c2bc..0b20f8b8f6 100644 --- a/src/Makefile_Edje.am +++ b/src/Makefile_Edje.am @@ -210,6 +210,7 @@ tests/edje/edje_suite.h tests_edje_edje_suite_CPPFLAGS = \ $(EDJE_COMMON_CPPFLAGS) \ +-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/edje\" \ @CHECK_CFLAGS@ tests_edje_edje_suite_LDADD = @CHECK_LIBS@ @USE_EDJE_LIBS@ tests_edje_edje_suite_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am index fad2bc91cb..7bbe383811 100644 --- a/src/Makefile_Eeze.am +++ b/src/Makefile_Eeze.am @@ -137,8 +137,8 @@ TESTS += tests/eeze/eeze_suite tests_eeze_eeze_suite_SOURCES = tests/eeze/eeze_suite.c tests_eeze_eeze_suite_CPPFLAGS = \ --DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eeze\" \ @EEZE_CFLAGS@ \ +-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eeze\" \ @CHECK_CFLAGS@ tests_eeze_eeze_suite_LDADD = @CHECK_LIBS@ @USE_EEZE_LIBS@ tests_eeze_eeze_suite_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@ diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am index 953d34998d..48ae4bea10 100644 --- a/src/Makefile_Efreet.am +++ b/src/Makefile_Efreet.am @@ -197,7 +197,8 @@ tests/efreet/efreet_suite.h \ tests/efreet/efreet_test_efreet.c \ tests/efreet/efreet_test_efreet_cache.c -tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@ +tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@ \ +-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/efreet\" tests_efreet_efreet_suite_LDADD = @CHECK_LIBS@ @USE_EFREET_LIBS@ tests_efreet_efreet_suite_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@ diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am index 873ffac406..201b5b9747 100644 --- a/src/Makefile_Eo.am +++ b/src/Makefile_Eo.am @@ -84,6 +84,7 @@ tests/eo/suite/eo_test_class_errors.c \ tests/eo/suite/eo_test_general.c \ tests/eo/suite/eo_test_init.c tests_eo_eo_suite_CPPFLAGS = \ +-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eo\" \ @CHECK_CFLAGS@ \ @EO_CFLAGS@ TESTS += tests/eo/eo_suite diff --git a/src/tests/ecore/ecore_suite.c b/src/tests/ecore/ecore_suite.c index 090a1e41e8..5cb676b12d 100644 --- a/src/tests/ecore/ecore_suite.c +++ b/src/tests/ecore/ecore_suite.c @@ -102,6 +102,8 @@ main(int argc, char **argv) s = ecore_suite_build(argc - 1, (const char **)argv + 1); sr = srunner_create(s); + srunner_set_xml (sr, CHECK_SRC_DIR "/check-results.xml"); + srunner_run_all(sr, CK_ENV); failed_count = srunner_ntests_failed(sr); srunner_free(sr); diff --git a/src/tests/edbus/edbus_suite.c b/src/tests/edbus/edbus_suite.c index ecd8d4c6b0..8ffe45c1cb 100644 --- a/src/tests/edbus/edbus_suite.c +++ b/src/tests/edbus/edbus_suite.c @@ -98,6 +98,8 @@ main(int argc, char **argv) s = edbus_suite_build(argc - 1, (const char **)argv + 1); sr = srunner_create(s); + srunner_set_xml (sr, TESTS_SRC_DIR "/check-results.xml"); + srunner_run_all(sr, CK_ENV); failed_count = srunner_ntests_failed(sr); srunner_free(sr); diff --git a/src/tests/edje/edje_suite.c b/src/tests/edje/edje_suite.c index dab966f511..8cdabeb5b3 100644 --- a/src/tests/edje/edje_suite.c +++ b/src/tests/edje/edje_suite.c @@ -95,6 +95,8 @@ main(int argc, char **argv) s = edje_suite_build(argc - 1, (const char **)argv + 1); sr = srunner_create(s); + srunner_set_xml (sr, TESTS_SRC_DIR "/check-results.xml"); + srunner_run_all(sr, CK_ENV); failed_count = srunner_ntests_failed(sr); srunner_free(sr); diff --git a/src/tests/eet/eet_suite.c b/src/tests/eet/eet_suite.c index f578d4eb80..351809ba61 100644 --- a/src/tests/eet/eet_suite.c +++ b/src/tests/eet/eet_suite.c @@ -2762,6 +2762,7 @@ main(int argc EINA_UNUSED, char *argv[]) s = eet_suite(); sr = srunner_create(s); + srunner_set_xml (sr, TESTS_SRC_DIR "/check-results.xml"); srunner_run_all(sr, CK_ENV); failed_count = srunner_ntests_failed(sr); srunner_free(sr); diff --git a/src/tests/eeze/eeze_suite.c b/src/tests/eeze/eeze_suite.c index 3e30d1dba6..3f887eb45a 100644 --- a/src/tests/eeze/eeze_suite.c +++ b/src/tests/eeze/eeze_suite.c @@ -677,6 +677,7 @@ main(void) s = eeze_suite(); sr = srunner_create(s); + srunner_set_xml (sr, TESTS_SRC_DIR "/check-results.xml"); srunner_run_all(sr, CK_ENV); failed_count = srunner_ntests_failed(sr); srunner_free(sr); diff --git a/src/tests/efreet/efreet_suite.c b/src/tests/efreet/efreet_suite.c index ed1d82fad7..4455848af8 100644 --- a/src/tests/efreet/efreet_suite.c +++ b/src/tests/efreet/efreet_suite.c @@ -97,6 +97,8 @@ main(int argc, char **argv) s = efreet_suite_build(argc - 1, (const char **)argv + 1); sr = srunner_create(s); + srunner_set_xml (sr, TESTS_SRC_DIR "/check-results.xml"); + srunner_run_all(sr, CK_NORMAL); failed_count = srunner_ntests_failed(sr); srunner_free(sr); diff --git a/src/tests/eina/eina_suite.c b/src/tests/eina/eina_suite.c index 310e9826c0..1cc317f49c 100644 --- a/src/tests/eina/eina_suite.c +++ b/src/tests/eina/eina_suite.c @@ -175,6 +175,8 @@ main(int argc, char **argv) s = eina_build_suite(argc - 1, (const char **)argv + 1); sr = srunner_create(s); + srunner_set_xml (sr, PACKAGE_BUILD_DIR "/check-results.xml"); + _mempool_init(); srunner_run_all(sr, CK_ENV); diff --git a/src/tests/eo/suite/eo_suite.c b/src/tests/eo/suite/eo_suite.c index ea5c1c5813..b0828f0bc7 100644 --- a/src/tests/eo/suite/eo_suite.c +++ b/src/tests/eo/suite/eo_suite.c @@ -98,6 +98,8 @@ main(int argc, char **argv) s = eo_suite_build(argc - 1, (const char **)argv + 1); sr = srunner_create(s); + srunner_set_xml (sr, TESTS_SRC_DIR "/check-results.xml"); + srunner_run_all(sr, CK_ENV); failed_count = srunner_ntests_failed(sr); srunner_free(sr); diff --git a/src/tests/evas/evas_suite.c b/src/tests/evas/evas_suite.c index 7848b3d0da..77ea22dc1e 100644 --- a/src/tests/evas/evas_suite.c +++ b/src/tests/evas/evas_suite.c @@ -100,6 +100,8 @@ main(int argc, char **argv) s = evas_suite_build(argc - 1, (const char **)argv + 1); sr = srunner_create(s); + srunner_set_xml (sr, TESTS_SRC_DIR "/check-results.xml"); + srunner_run_all(sr, CK_ENV); failed_count = srunner_ntests_failed(sr); srunner_free(sr);