]>
Commit | Line | Data |
---|---|---|
55e31eb7 AF |
1 | From df890b18fad6ea250b4a44cdbfbbdff947648041 Mon Sep 17 00:00:00 2001 |
2 | From: Morten Welinder <terra@gnome.org> | |
3 | Date: Mon, 10 Jun 2013 19:49:20 +0000 | |
4 | Subject: tests: work around problems with automake 1.13 | |
5 | ||
6 | --- | |
7 | diff --git a/configure.ac b/configure.ac | |
8 | index 3e7413e..cae2146 100644 | |
9 | --- a/configure.ac | |
10 | +++ b/configure.ac | |
11 | @@ -1036,6 +1036,9 @@ AC_ARG_WITH([typelib-dir], | |
12 | ) | |
13 | AC_SUBST(TYPELIBDIR) | |
14 | ||
15 | +AC_SUBST([auto_find_tests], ['$(sort $(wildcard $(srcdir)/t[[0-9]][[0-9]][[0-9]][[0-9]]-*.pl))']) | |
16 | + | |
17 | + | |
18 | dnl ************************************************** | |
19 | dnl * Config defaults | |
20 | dnl ************************************************** | |
21 | diff --git a/test/ChangeLog b/test/ChangeLog | |
22 | index cc9b478..952552f 100644 | |
23 | --- a/test/ChangeLog | |
24 | +++ b/test/ChangeLog | |
25 | @@ -1,3 +1,8 @@ | |
26 | +2013-06-10 Morten Welinder <terra@gnome.org> | |
27 | + | |
28 | + * Makefile.am (TESTS): Work around automake problems with | |
29 | + wildcards by going via configure. | |
30 | + | |
31 | 2013-04-26 Morten Welinder <terra@gnome.org> | |
32 | ||
33 | * Release 1.12.2 | |
34 | diff --git a/test/Makefile.am b/test/Makefile.am | |
35 | index 6b7ee15..f44986d 100644 | |
36 | --- a/test/Makefile.am | |
37 | +++ b/test/Makefile.am | |
38 | @@ -25,7 +25,11 @@ | |
39 | # | |
40 | # 90xx: Misc stuff. | |
41 | ||
42 | -TESTS = $(sort $(wildcard $(srcdir)/t[0-9][0-9][0-9][0-9]-*.pl)) | |
43 | +# This is a working for automake's problem with wildcards. See | |
44 | +# http://permalink.gmane.org/gmane.comp.sysutils.automake.bugs/7413 | |
45 | +TESTS_EXTENSIONS=.pl | |
46 | +TESTS = @auto_find_tests@ | |
47 | + | |
48 | SUPPS = common.supp gui.supp t8003-valgrind-pdf.supp | |
49 | ||
50 | import-db: | |
51 | -- | |
52 | cgit v0.9.2 |