[gnome-calculator] build: strip unneeded test env setting and fix test install



commit 69d19eff7c3f00855e1379fa0a756ad256a9418f
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date:   Mon Jul 21 16:58:09 2014 +0200

    build: strip unneeded test env setting and fix test install

 m4/behave-installed-tests.m4 |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/m4/behave-installed-tests.m4 b/m4/behave-installed-tests.m4
index ff188f2..f110c02 100644
--- a/m4/behave-installed-tests.m4
+++ b/m4/behave-installed-tests.m4
@@ -78,15 +78,10 @@ uninstall-am: uninstall-tests-hook
 META_DIRECTORY=${DESTDIR}${datadir}/installed-tests/${PACKAGE}
 EXEC_DIRECTORY=${DESTDIR}${pkglibexecdir}/installed-tests
 
-BEHAVE_FEATURES=$(notdir $(wildcard tests/*.feature))
-BEHAVE_STEP_DEFINITION=$(notdir $(wildcard tests/steps/*.py))
+BEHAVE_FEATURES=$(notdir $(wildcard $(srcdir)/tests/*.feature))
+BEHAVE_STEP_DEFINITION=$(notdir $(wildcard $(srcdir)/tests/steps/*.py))
 BEHAVE_COMMON_FILES=environment.py common_steps.py
 
-FINAL_TEST_ENVIRONMENT=
-ifneq ($(INSTALLED_TESTS_ENVIRONMENT),)
-      FINAL_TEST_ENVIRONMENT="env $(INSTALLED_TESTS_ENVIRONMENT)"
-endif
-
 installed-tests-exec-hook:
        @$(MKDIR_P) $(EXEC_DIRECTORY);
        @for feature in $(BEHAVE_FEATURES); do                                                                
                  \
@@ -135,3 +130,4 @@ endif
   AC_SUBST([BEHAVE_INSTALLED_TESTS_RULE])
   m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([BEHAVE_INSTALLED_TESTS_RULE])])
 ])
+


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]