1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
From: Balint Reczey <balint@balintreczey.hu>
Date: Wed, 4 Dec 2013 14:51:13 +0000
Subject: Work around FTBFS due to automake 1.14 bug
Automake generates invalid Makefiles when patsubst is used in
Makefile.am. To work around this problem configure injects the
patsubsts to the Makefile now.
Bug-Debian: http://bugs.debian.org/713353
---
configure.ac | 2 ++
test/Makefile.am | 12 ++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index af72614..b93457a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,6 +142,8 @@ fi
AC_SUBST(BUILD_ENGINES)
AC_SUBST(BUILD_THEMES)
AC_SUBST(BUILD_SCHEMAS)
+AC_SUBST([auto_find_tests], ['$(patsubst %,exported_%,$(BUILD_ENGINES)) torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))'])
+
if test $animation = "yes"; then
AC_DEFINE_UNQUOTED(HAVE_ANIMATION, 1, [Defines whether to compile with animation support])
diff --git a/test/Makefile.am b/test/Makefile.am
index 940df14..a0c5321 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -64,9 +64,10 @@ VALGRIND_ENV=G_SLICE=always-malloc G_DEBUG=gc-friendly,resident-modules
# Exported Symbols Test - Tests all engines unconditionally
#############################################################
# Prefix with exported_
-EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES))
+# disabled to work around automake bug #14561
+# EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES))
-TESTS += $(EXPORTED_SYMBOLS_TESTS)
+#TESTS += $(EXPORTED_SYMBOLS_TESTS)
#############################################################
@@ -85,10 +86,13 @@ SUPPORTED_TORTURE_TEST_ENGINES = \
# Filter engines that are not build from the set of engines
TORTURE_TEST_ENGINES = $(filter $(SUPPORTED_TORTURE_TEST_ENGINES),$(BUILD_ENGINES))
# Prefix with torture_
-TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))
+# disabled to work around automake bug #14561
+# TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))
# Add TORTURE_TEST_ENGINES to list of tests
-TESTS += $(TORTURE_TEST_TESTS)
+# disabled to work around automake bug #14561
+#TESTS += $(TORTURE_TEST_TESTS)
+TESTS += @auto_find_tests@
# Possible other tests:
# - An extensive theme switch tests that loads/unloads the engine
|
