Makefile.am | 1 -
configure.ac | 2 +-
doc/Makefile.am | 5 ++++-
test/Makefile.am | 12 +++++++++++-
4 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit 96220a5ed9d1d761b14a7ac516ac6786c132f280
Author: Quentin Glidic <sardemff7+git@xxxxxxxxxxxxx>
Date: Sat Feb 2 17:01:07 2013 +0100
Use LOG_COMPILER and AM_TESTS_ENVIRONMENT
TESTS_ENVIRONMENT is deprecated and should be reserved to the user to
override the test environment
<ext>_LOG_COMPILER is meant to contain the program that runs the test
with <ext> extension
LOG_COMPILER is for extensionless tests
AM_TESTS_ENVIRONMENT is meant to set the environment for the tests
https://bugs.freedesktop.org/show_bug.cgi?id=60192
Signed-off-by: Quentin Glidic <sardemff7+git@xxxxxxxxxxxxx>
diff --git a/Makefile.am b/Makefile.am
index 22f2354..cc5435e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,6 @@ if ENABLE_DOCS
SUBDIRS += doc
endif
-AUTOMAKE_OPTIONS = dist-bzip2
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = \
diff --git a/configure.ac b/configure.ac
index da19759..81e02ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ dnl version. This same version number must appear in fontconfig/fontconfig.h
dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
dnl not possible to extract the version number here from fontconfig.h
AC_INIT([fontconfig], [2.10.91], [https://bugs.freedesktop.org/enger_bug.cgi?product=fontconfig])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.11 parallel-tests dist-bzip2])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
dnl libtool versioning
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c6b095c..78a7cdb 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -53,7 +53,10 @@ SUFFIXES = \
TESTS = \
check-missing-doc \
$(NULL)
-TESTS_ENVIRONMENT=top_srcdir=${top_srcdir} sh
+TESTS_ENVIRONMENT = \
+ top_srcdir=${top_srcdir}; export top_srcdir; \
+ $(NULL)
+LOG_COMPILER = sh
#
DOC2HTML = docbook2html
DOC2TXT = docbook2txt
diff --git a/test/Makefile.am b/test/Makefile.am
index 664138a..9d5acdd 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,15 @@
check_SCRIPTS=run-test.sh
-TESTS_ENVIRONMENT=src=${srcdir} EXEEXT=${EXEEXT} sh
+TEST_EXTENSIONS = \
+ .sh \
+ $(NULL)
+
+AM_TESTS_ENVIRONMENT= \
+ src=${srcdir}; export src; \
+ EXEEXT=${EXEEXT}; export EXEEXT; \
+ $(NULL)
+
+SH_LOG_COMPILER = sh
+
TESTS=run-test.sh
TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/fontconfig
