aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-03-27 15:31:00 -0400
committerStefan Schmidt <stefan@osg.samsung.com>2018-04-05 11:10:27 +0200
commit492814bf2fae7e95d92bce77f186630d4b9b5f66 (patch)
tree651ad1a5877ddca5125a903a0c039b0d494ca7b2
parenttests: disable xim in ecore_imf test when DISPLAY is not set (diff)
downloadefl-492814bf2fae7e95d92bce77f186630d4b9b5f66.tar.gz
tests: unbreak PACKAGE_BUILD_DIR usage in makefiles
for some reason, a few projects changed this from the expected value of abs_top_builddir for their test suites, breaking the usage of this define within those tests fix https://phab.enlightenment.org/T6812 Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com>
-rw-r--r--src/Makefile_Ector.am4
-rw-r--r--src/Makefile_Eina.am6
-rw-r--r--src/Makefile_Evil.am4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am
index 7baa0767d1..fae39311f4 100644
--- a/src/Makefile_Ector.am
+++ b/src/Makefile_Ector.am
@@ -190,8 +190,8 @@ tests_ector_suite_ector_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/tests/ector \
-DTESTS_WD=\"`pwd`\" \
-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ector/suite\" \
--DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/ector/suite\" \
--DTESTS_BUILD_DIR=PACKAGE_BUILD_DIR \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ector\" \
@CHECK_CFLAGS@ \
@ECTOR_CFLAGS@
tests_ector_suite_ector_suite_LDADD = @CHECK_LIBS@ @USE_ECTOR_LIBS@
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 33c7c660c2..69561512a5 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -364,8 +364,8 @@ tests/eina/eina_test_vpath.c
tests_eina_eina_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DTESTS_WD=\"`pwd`\" \
-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eina\" \
--DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eina\" \
--DTESTS_BUILD_DIR=PACKAGE_BUILD_DIR \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eina\" \
@CHECK_CFLAGS@ \
@EINA_CFLAGS@
tests_eina_eina_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@
@@ -380,7 +380,7 @@ check_LTLIBRARIES = tests/eina/module_dummy.la
tests_eina_module_dummy_la_SOURCES = tests/eina/eina_test_module_dummy.c
tests_eina_module_dummy_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
--DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eina\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/\" \
@CHECK_CFLAGS@ \
@EINA_CFLAGS@
tests_eina_module_dummy_la_LIBADD = @USE_EINA_LIBS@
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index edac73be1f..7fbe99c79d 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -92,8 +92,8 @@ tests/evil/evil_test_unistd.c
tests_evil_evil_suite_CPPFLAGS = \
-I$(top_builddir)/src/lib/efl \
-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/evil\" \
--DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/evil\" \
--DTESTS_BUILD_DIR=PACKAGE_BUILD_DIR \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/evil\" \
@CHECK_CFLAGS@ \
@EVIL_CFLAGS@
tests_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ @CHECK_LIBS@