[evolution] tests: rename test m4 to a nice name
- From: Vadim Rutkovsky <vrutkovsky src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] tests: rename test m4 to a nice name
- Date: Fri, 11 Apr 2014 00:13:28 +0000 (UTC)
commit 67c933958b44b3db6427a9898407e39e0b5416ed
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date: Thu Apr 3 15:24:12 2014 +0200
tests: rename test m4 to a nice name
The new m4 also fixes srcdir != builddir issue
...installed-test.m4 => behave-installed-tests.m4} | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/m4/behave-installed-test.m4 b/m4/behave-installed-tests.m4
similarity index 88%
rename from m4/behave-installed-test.m4
rename to m4/behave-installed-tests.m4
index f1f13cf..386fe5f 100644
--- a/m4/behave-installed-test.m4
+++ b/m4/behave-installed-tests.m4
@@ -75,28 +75,29 @@ install-exec-am: installed-tests-exec-hook
install-data-am: installed-tests-data-hook
uninstall-am: uninstall-tests-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=$(notdir $(wildcard tests/*.feature))
-BEHAVE_STEP_DEFINITION=$(notdir $(wildcard tests/steps/*.py))
-BEHAVE_COMMON_FILES=environment.py common_steps.py
installed-tests-exec-hook:
@$(MKDIR_P) $(EXEC_DIRECTORY);
@for feature in $(BEHAVE_FEATURES); do
\
- $(LIBTOOL) --mode=install $(INSTALL) --mode=777 tests/$$feature $(EXEC_DIRECTORY);\
+ $(LIBTOOL) --mode=install $(INSTALL) --mode=777 $$feature $(EXEC_DIRECTORY);\
done
@for common_file in $(BEHAVE_COMMON_FILES); do
\
- $(LIBTOOL) --mode=install $(INSTALL) --mode=777 tests/$$common_file $(EXEC_DIRECTORY);\
+ $(LIBTOOL) --mode=install $(INSTALL) --mode=777 $$common_file $(EXEC_DIRECTORY);\
done
@$(MKDIR_P) $(EXEC_DIRECTORY)/steps;
@for step_definition in $(BEHAVE_STEP_DEFINITION); do
\
- $(LIBTOOL) --mode=install $(INSTALL) --mode=777 tests/steps/$$step_definition
$(EXEC_DIRECTORY)/steps;\
+ $(LIBTOOL) --mode=install $(INSTALL) --mode=777 $$step_definition $(EXEC_DIRECTORY)/steps;\
done
@@ -126,10 +127,11 @@ uninstall-tests-hook:
@for test in $(INSTALLED_TESTS); do\
$(LIBTOOL) --mode=uninstall $(RM) $(META_DIRECTORY)/$$test.test;\
done
+
endif
'
# substitute @BEHAVE_INSTALLED_TESTS_RULE@ in Makefiles
AC_SUBST([BEHAVE_INSTALLED_TESTS_RULE])
m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([BEHAVE_INSTALLED_TESTS_RULE])])
-])
\ No newline at end of file
+])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]