[gnome-calculator] tests: install tests correctly when builddir != srcdir
- From: Vadim Rutkovsky <vrutkovsky src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calculator] tests: install tests correctly when builddir != srcdir
- Date: Thu, 3 Apr 2014 13:20:22 +0000 (UTC)
commit 10b929815615865be0030b9b69025713dfcd2fdd
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date: Thu Apr 3 14:16:00 2014 +0200
tests: install tests correctly when builddir != srcdir
m4/behave-installed-tests.m4 | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/m4/behave-installed-tests.m4 b/m4/behave-installed-tests.m4
index e42ca07..71550f1 100644
--- a/m4/behave-installed-tests.m4
+++ b/m4/behave-installed-tests.m4
@@ -74,16 +74,17 @@ ifeq ($(BEHAVE_INSTALLED_TESTS_ENABLED),yes)
install-exec-am: installed-tests-exec-hook
install-data-am: installed-tests-data-hook
-META_DIRECTORY=${DESTDIR}/${datadir}/installed-tests/${PACKAGE}
-EXEC_DIRECTORY=${DESTDIR}/${pkglibexecdir}/installed-tests
+META_DIRECTORY=${DESTDIR}${datadir}/installed-tests/${PACKAGE}
+EXEC_DIRECTORY=${DESTDIR}${pkglibexecdir}/installed-tests
+
+BEHAVE_FEATURES=$(wildcard $(srcdir)/tests/*.feature)
+BEHAVE_STEP_DEFINITION=$(wildcard $(srcdir)/tests/steps/*.py)
+BEHAVE_COMMON_FILES=$(srcdir)/tests/environment.py $(srcdir)/tests/common_steps.py
FINAL_TEST_ENVIRONMENT=
ifneq ($(INSTALLED_TESTS_ENVIRONMENT),)
FINAL_TEST_ENVIRONMENT="env $(INSTALLED_TESTS_ENVIRONMENT)"
endif
-BEHAVE_FEATURES=$(wildcard tests/*.feature)
-BEHAVE_STEP_DEFINITION=$(wildcard tests/steps/*.py)
-BEHAVE_COMMON_FILES=tests/environment.py tests/common_steps.py
installed-tests-exec-hook:
@$(MKDIR_P) $(EXEC_DIRECTORY);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]