From 3ba9311c0fc2774d9b5aaef395f82144a3312378 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Tue, 12 Mar 2013 12:46:06 +0000 Subject: [PATCH] Tests: Output XML to build dir, not source dir. --- src/Makefile_EDBus.am | 2 +- src/Makefile_Ecore.am | 1 + src/Makefile_Edje.am | 2 +- src/Makefile_Eet.am | 1 + src/Makefile_Eeze.am | 1 + src/Makefile_Efreet.am | 2 +- src/Makefile_Eina.am | 1 + src/Makefile_Eo.am | 2 +- src/Makefile_Evas.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 | 2 +- src/tests/eeze/eeze_suite.c | 2 +- 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 +- 18 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/Makefile_EDBus.am b/src/Makefile_EDBus.am index 99f0c63c2e..b47a40cd36 100644 --- a/src/Makefile_EDBus.am +++ b/src/Makefile_EDBus.am @@ -72,7 +72,7 @@ tests/edbus/edbus_test_edbus_init.c \ tests/edbus/edbus_suite.h tests_edbus_edbus_suite_CPPFLAGS = @CHECK_CFLAGS@ @EDBUS_CFLAGS@ \ --DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/edbus\" +-DTESTS_BUILD_DIR=\"$(top_builddir)/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 c78f51b555..1dcbc84a18 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=\"$(top_srcdir)/src/tests/ecore\" \ +-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore\" \ @CHECK_CFLAGS@ \ @ECORE_CFLAGS@ \ @ECORE_AUDIO_CFLAGS@ \ diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am index 0b20f8b8f6..20ec55288b 100644 --- a/src/Makefile_Edje.am +++ b/src/Makefile_Edje.am @@ -210,7 +210,7 @@ tests/edje/edje_suite.h tests_edje_edje_suite_CPPFLAGS = \ $(EDJE_COMMON_CPPFLAGS) \ --DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/edje\" \ +-DTESTS_BUILD_DIR=\"$(top_builddir)/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_Eet.am b/src/Makefile_Eet.am index 7646f0f880..8f0ebf2892 100644 --- a/src/Makefile_Eet.am +++ b/src/Makefile_Eet.am @@ -64,6 +64,7 @@ tests/eet/eet_suite.h tests_eet_eet_suite_CPPFLAGS = \ -DTESTS_WD=\"`pwd`\" \ -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet\" \ +-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eet\" \ @CHECK_CFLAGS@ \ @EET_CFLAGS@ tests_eet_eet_suite_LDADD = @CHECK_LIBS@ @USE_EET_LIBS@ diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am index 7bbe383811..f81d4016ba 100644 --- a/src/Makefile_Eeze.am +++ b/src/Makefile_Eeze.am @@ -139,6 +139,7 @@ tests_eeze_eeze_suite_SOURCES = tests/eeze/eeze_suite.c tests_eeze_eeze_suite_CPPFLAGS = \ @EEZE_CFLAGS@ \ -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eeze\" \ +-DTESTS_BUILD_DIR=\"$(top_builddir)/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 c5181f1668..0cbdca902a 100644 --- a/src/Makefile_Efreet.am +++ b/src/Makefile_Efreet.am @@ -199,7 +199,7 @@ tests/efreet/efreet_test_efreet.c \ tests/efreet/efreet_test_efreet_cache.c tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@ \ --DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/efreet\" +-DTESTS_BUILD_DIR=\"$(top_builddir)/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_Eina.am b/src/Makefile_Eina.am index 20a2c830ba..9b85a85a83 100644 --- a/src/Makefile_Eina.am +++ b/src/Makefile_Eina.am @@ -269,6 +269,7 @@ tests/eina/eina_test_tmpstr.c tests_eina_eina_suite_CPPFLAGS = \ -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/eina\" \ +-DTESTS_BUILD_DIR=PACKAGE_BUILD_DIR \ @CHECK_CFLAGS@ \ @EINA_CFLAGS@ tests_eina_eina_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@ diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am index 201b5b9747..c0f13076ba 100644 --- a/src/Makefile_Eo.am +++ b/src/Makefile_Eo.am @@ -84,7 +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\" \ +-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eo\" \ @CHECK_CFLAGS@ \ @EO_CFLAGS@ TESTS += tests/eo/eo_suite diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 1bd921ddc1..257d06cc2e 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -1635,6 +1635,7 @@ tests/evas/evas_suite.h tests_evas_evas_suite_CPPFLAGS = \ -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/evas\" \ +-DTESTS_BUILD_DIR=\"$(top_srcdir)/src/tests/evas\" \ @CHECK_CFLAGS@ \ @EVAS_CFLAGS@ diff --git a/src/tests/ecore/ecore_suite.c b/src/tests/ecore/ecore_suite.c index 02f1812ee4..0d89390a99 100644 --- a/src/tests/ecore/ecore_suite.c +++ b/src/tests/ecore/ecore_suite.c @@ -102,7 +102,7 @@ main(int argc, char **argv) s = ecore_suite_build(argc - 1, (const char **)argv + 1); sr = srunner_create(s); - srunner_set_xml (sr, TESTS_SRC_DIR "/check-results.xml"); + srunner_set_xml(sr, TESTS_BUILD_DIR "/check-results.xml"); srunner_run_all(sr, CK_ENV); failed_count = srunner_ntests_failed(sr); diff --git a/src/tests/edbus/edbus_suite.c b/src/tests/edbus/edbus_suite.c index 8ffe45c1cb..ccba525e6d 100644 --- a/src/tests/edbus/edbus_suite.c +++ b/src/tests/edbus/edbus_suite.c @@ -98,7 +98,7 @@ 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_set_xml(sr, TESTS_BUILD_DIR "/check-results.xml"); srunner_run_all(sr, CK_ENV); failed_count = srunner_ntests_failed(sr); diff --git a/src/tests/edje/edje_suite.c b/src/tests/edje/edje_suite.c index 8cdabeb5b3..86216641de 100644 --- a/src/tests/edje/edje_suite.c +++ b/src/tests/edje/edje_suite.c @@ -95,7 +95,7 @@ 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_set_xml(sr, TESTS_BUILD_DIR "/check-results.xml"); srunner_run_all(sr, CK_ENV); failed_count = srunner_ntests_failed(sr); diff --git a/src/tests/eet/eet_suite.c b/src/tests/eet/eet_suite.c index 351809ba61..dec16ed492 100644 --- a/src/tests/eet/eet_suite.c +++ b/src/tests/eet/eet_suite.c @@ -2762,7 +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_set_xml(sr, TESTS_BUILD_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 3f887eb45a..2de49c7979 100644 --- a/src/tests/eeze/eeze_suite.c +++ b/src/tests/eeze/eeze_suite.c @@ -677,7 +677,7 @@ main(void) s = eeze_suite(); sr = srunner_create(s); - srunner_set_xml (sr, TESTS_SRC_DIR "/check-results.xml"); + srunner_set_xml(sr, TESTS_BUILD_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 4455848af8..0ce5fd17ac 100644 --- a/src/tests/efreet/efreet_suite.c +++ b/src/tests/efreet/efreet_suite.c @@ -97,7 +97,7 @@ 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_set_xml(sr, TESTS_BUILD_DIR "/check-results.xml"); srunner_run_all(sr, CK_NORMAL); failed_count = srunner_ntests_failed(sr); diff --git a/src/tests/eina/eina_suite.c b/src/tests/eina/eina_suite.c index 1cc317f49c..1577b3aebb 100644 --- a/src/tests/eina/eina_suite.c +++ b/src/tests/eina/eina_suite.c @@ -175,7 +175,7 @@ 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"); + srunner_set_xml(sr, TESTS_BUILD_DIR "/check-results.xml"); _mempool_init(); diff --git a/src/tests/eo/suite/eo_suite.c b/src/tests/eo/suite/eo_suite.c index b0828f0bc7..5194b32ad8 100644 --- a/src/tests/eo/suite/eo_suite.c +++ b/src/tests/eo/suite/eo_suite.c @@ -98,7 +98,7 @@ 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_set_xml(sr, TESTS_BUILD_DIR "/check-results.xml"); srunner_run_all(sr, CK_ENV); failed_count = srunner_ntests_failed(sr); diff --git a/src/tests/evas/evas_suite.c b/src/tests/evas/evas_suite.c index 77ea22dc1e..057f0988ea 100644 --- a/src/tests/evas/evas_suite.c +++ b/src/tests/evas/evas_suite.c @@ -100,7 +100,7 @@ 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_set_xml(sr, TESTS_BUILD_DIR "/check-results.xml"); srunner_run_all(sr, CK_ENV); failed_count = srunner_ntests_failed(sr); -- 2.34.1