summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4>2019-01-07 16:11:57 +0000
committervlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4>2019-01-07 16:11:57 +0000
commitd2b6d92c99a62e6eec9e8246081e757c62a43942 (patch)
tree5f531acf53f266ea499e6619b92eef298ea1d7c0
parent91159361bffb5b2d7ccc8dbfaf7a77e60dd02ead (diff)
downloadmpfr-d2b6d92c99a62e6eec9e8246081e757c62a43942.tar.gz
[tests/Makefile.am] Replaced "env -u DISPLAY" by "env DISPLAY=''" as
the -u option is not supported by NetBSD. (merged changeset r13383 from the trunk) git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/branches/4.0@13384 280ebfd0-de03-0410-8827-d642c229c3f4
-rw-r--r--tests/Makefile.am9
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 54bfb7bb6..1faf781aa 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -83,7 +83,7 @@ $(top_builddir)/src/libmpfr.la:
TESTS = $(check_PROGRAMS)
-# Unset DISPLAY as it is not needed and it can yield error messages when
+# Set DISPLAY='' as it is not needed and it can yield error messages when
# running the tests with LOG_COMPILER=wine (for builds with MinGW). See:
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=914822
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=914949
@@ -91,7 +91,12 @@ TESTS = $(check_PROGRAMS)
# in case old Automake. With Automake 1.13+, where a parallel test harness
# is generated, use LOG_COMPILER instead. For additional information, see:
# https://www.gnu.org/software/automake/manual/automake.html#Parallel-Test-Harness
-TESTS_ENVIRONMENT = env -u DISPLAY MPFR_QUIET=1 $(VALGRIND)
+#
+# Note: We do not use "env -u DISPLAY" as the -u option is a GNU extension
+# and not supported by NetBSD. Setting DISPLAY='' is not equivalent, but
+# it also avoids the bogus "Invalid MIT-MAGIC-COOKIE-1 key" error message
+# that can make the parsing of the output fail.
+TESTS_ENVIRONMENT = env DISPLAY='' MPFR_QUIET=1 $(VALGRIND)
# The -no-install option prevents libtool from generating wrapper scripts
# for the tests.