summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2013-03-12 11:43:23 +0000
committerTom Hacohen <tom@stosb.com>2013-03-12 11:43:31 +0000
commitb13fe184bfc393f2113a9de5114b3d72458f49f9 (patch)
tree97e1288291bf618ea62f5b64c337eab723ad79ba /src
parenta60f19611a4eb8208965a4d04cb79c023d8f0ad3 (diff)
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.
Diffstat (limited to '')
-rw-r--r--src/Makefile_Ecore.am3
-rw-r--r--src/tests/ecore/ecore_suite.c2
-rw-r--r--src/tests/ecore/ecore_test_ecore_audio.c2
3 files changed, 3 insertions, 4 deletions
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 3cc047e..c78f51b 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -71,8 +71,7 @@ tests/ecore/ecore_test_coroutine.c \
71tests/ecore/ecore_suite.h 71tests/ecore/ecore_suite.h
72 72
73tests_ecore_ecore_suite_CPPFLAGS = \ 73tests_ecore_ecore_suite_CPPFLAGS = \
74-DTESTS_SRC_DIR=\"`pwd`/$(top_srcdir)\" \ 74-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore\" \
75-DCHECK_SRC_DIR=\"$(top_srcdir)/src/tests/ecore\" \
76@CHECK_CFLAGS@ \ 75@CHECK_CFLAGS@ \
77@ECORE_CFLAGS@ \ 76@ECORE_CFLAGS@ \
78@ECORE_AUDIO_CFLAGS@ \ 77@ECORE_AUDIO_CFLAGS@ \
diff --git a/src/tests/ecore/ecore_suite.c b/src/tests/ecore/ecore_suite.c
index 5cb676b..02f1812 100644
--- a/src/tests/ecore/ecore_suite.c
+++ b/src/tests/ecore/ecore_suite.c
@@ -102,7 +102,7 @@ main(int argc, char **argv)
102 s = ecore_suite_build(argc - 1, (const char **)argv + 1); 102 s = ecore_suite_build(argc - 1, (const char **)argv + 1);
103 sr = srunner_create(s); 103 sr = srunner_create(s);
104 104
105 srunner_set_xml (sr, CHECK_SRC_DIR "/check-results.xml"); 105 srunner_set_xml (sr, TESTS_SRC_DIR "/check-results.xml");
106 106
107 srunner_run_all(sr, CK_ENV); 107 srunner_run_all(sr, CK_ENV);
108 failed_count = srunner_ntests_failed(sr); 108 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
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -14,7 +14,7 @@
14#define SF_FORMAT_RAW 0x040000 14#define SF_FORMAT_RAW 0x040000
15#define SF_FORMAT_PCM_U8 0x0005 15#define SF_FORMAT_PCM_U8 0x0005
16 16
17#define SOUNDS_DIR TESTS_SRC_DIR"/src/tests/ecore/" 17#define SOUNDS_DIR TESTS_SRC_DIR
18 18
19#if 0 19#if 0
20/* TODO: must fix these tests to produce no warnings and to be 20/* TODO: must fix these tests to produce no warnings and to be