summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4>2018-11-29 07:48:54 +0000
committervlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4>2018-11-29 07:48:54 +0000
commitd5f516038bcf7384ba90df0ecc7cf47f5bacbb7b (patch)
tree6b5a2c0606f2e9694190ea20b435438ad9f4f608
parent85016208f0754bdbcd8ed6bc4a6d82903f739064 (diff)
downloadmpfr-d5f516038bcf7384ba90df0ecc7cf47f5bacbb7b.tar.gz
[tests/Makefile.am] Unset DISPLAY as it is not needed and it can yield
error messages when running the tests with LOG_COMPILER=wine (for builds with MinGW). [tests/tversion.c] Updated a comment about this issue. (merged changesets r13305,13307-13309 from the trunk) git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/branches/4.0@13310 280ebfd0-de03-0410-8827-d642c229c3f4
-rw-r--r--tests/Makefile.am6
-rw-r--r--tests/tversion.c9
2 files changed, 11 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b05e35c79..5ea250392 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -83,11 +83,15 @@ $(top_builddir)/src/libmpfr.la:
TESTS = $(check_PROGRAMS)
+# Unset 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
# $(VALGRIND) is still there to be able to use a wrapper such as valgrind
# in case old Automake. With Automake 1.13+, where a parallel test harness
# is generated, use LOG_COMPILER instead. For additional information, see:
# http://www.gnu.org/software/automake/manual/automake.html#Parallel-Test-Harness
-TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
+TESTS_ENVIRONMENT = env -u DISPLAY MPFR_QUIET=1 $(VALGRIND)
# The -no-install option prevents libtool from generating wrapper scripts
# for the tests.
diff --git a/tests/tversion.c b/tests/tversion.c
index 188530656..44ce540e5 100644
--- a/tests/tversion.c
+++ b/tests/tversion.c
@@ -57,9 +57,12 @@ main (void)
/*********************** MPFR version and patches ************************/
- /* With i586-mingw32msvc-gcc -D__USE_MINGW_ANSI_STDIO and run under Wine,
- the following line was not output. This is not reproducible. Let's try
- to detect the error in case this happens again. */
+ /* The printf failure test was added because of an output issue under Wine,
+ * eventually not related to this output; this test is kept just in case...
+ * Details:
+ * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=914822
+ * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=914949
+ */
if (printf ("[tversion] MPFR %s\n", MPFR_VERSION_STRING) < 0)
{
perror ("tversion (first printf)");