Ecore tests: Define TESTS_SRC_DIR in the same way as the other tests.

Deprecate CHECK_SRC_DIR which is not needed anymore because of that.

diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 3cc047e..c78f51b 100644 (file)
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -71,8 +71,7 @@ tests/ecore/ecore_test_coroutine.c \
 tests/ecore/ecore_suite.h
 
 tests_ecore_ecore_suite_CPPFLAGS = \
--DTESTS_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
--DCHECK_SRC_DIR=\"$(top_srcdir)/src/tests/ecore\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore\" \
 @CHECK_CFLAGS@ \
 @ECORE_CFLAGS@ \
 @ECORE_AUDIO_CFLAGS@ \

diff --git a/src/tests/ecore/ecore_suite.c b/src/tests/ecore/ecore_suite.c
index 5cb676b..02f1812 100644 (file)
--- 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, CHECK_SRC_DIR "/check-results.xml");
+   srunner_set_xml (sr, TESTS_SRC_DIR "/check-results.xml");
 
    srunner_run_all(sr, CK_ENV);
    failed_count = srunner_ntests_failed(sr);

diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index 0c914a5..07b0bde 100644 (file)
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -14,7 +14,7 @@
 #define SF_FORMAT_RAW 0x040000
 #define SF_FORMAT_PCM_U8 0x0005
 
-#define SOUNDS_DIR TESTS_SRC_DIR"/src/tests/ecore/"
+#define SOUNDS_DIR TESTS_SRC_DIR
 
 #if 0
 /* TODO: must fix these tests to produce no warnings and to be