summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorQuentin Glidic <sardemff7+git@sardemff7.net>2013-02-02 17:01:07 +0100
committerAkira TAGOH <akira@tagoh.org>2013-02-06 19:53:36 +0900
commit96220a5ed9d1d761b14a7ac516ac6786c132f280 (patch)
treec040bb6866a782166ac3a1c76d3d24d32554d56b /test
parent62b7d764ce994bb32e7614337fdfa0854445c380 (diff)
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@sardemff7.net>
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am12
1 files changed, 11 insertions, 1 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 664138a5..9d5acdd9 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