Attachment 74223 Details for Bug 60192 – Fix tests with automake 1.13

[patch] Fix tests with automake 1.13

0001-test-Use-SH_LOG_COMPILER-and-AM_TESTS_ENVIRONMENT.patch (text/plain), 2.00 KB, created by Quentin "Sardem FF7" Glidic on 2013-02-05 08:55:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Quentin "Sardem FF7" Glidic

Created: 2013-02-05 08:55:17 UTC

Size: 2.00 KB

patch

obsolete

>From 2e6f4d0a0cd5116a5b06fa460dbd7d4a56a6eb21 Mon Sep 17 00:00:00 2001
>From: Quentin Glidic <sardemff7+git@sardemff7.net>
>Date: Sat, 2 Feb 2013 17:01:07 +0100
>Subject: [PATCH] test: Use SH_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
>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>
>---
> Makefile.am      |  1 -
> configure.ac     |  2 +-
> test/Makefile.am | 12 +++++++++++-
> 3 files changed, 12 insertions(+), 3 deletions(-)
>
>diff --git a/Makefile.am b/Makefile.am
>index 8510f55..a593d30 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -31,7 +31,6 @@ else
> DIST_SUBDIRS = $(SUBDIRS) doc
> endif
> 
>-AUTOMAKE_OPTIONS = dist-bzip2
> ACLOCAL_AMFLAGS = -I m4
> 
> EXTRA_DIST = \
>diff --git a/configure.ac b/configure.ac
>index 514890c..83b0970 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/test/Makefile.am b/test/Makefile.am
>index 664138a..3d47da3 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
>+
>+AM_TESTS_ENVIRONMENT= \
>+	src=${srcdir}; \
>+	EXEEXT=${EXEEXT}; \
>+	export src; \
>+	export EXEEXT;
>+
>+SH_LOG_COMPILER = sh
>+
> TESTS=run-test.sh
> 
> TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in
>-- 
>1.8.1.2
>

Actions: View | Splinter Review

Attachments on bug 60192: 74094 | 74223 | 74236 | 74237 | 74254

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.