From 180981a8b06e74e51e20e6b67e742726374864d1 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 20 Sep 2017 10:35:46 +0300 Subject: Tweak pc/Makefile.tst for MinGW. --- pc/ChangeLog | 6 ++++++ pc/Makefile.tst | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pc/ChangeLog b/pc/ChangeLog index 95d70f59..f7af4fe7 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,9 @@ +2017-09-20 Eli Zaretskii + + * Makefile.tst (jarebug): Don't announce a MinGW failure. + (mpfr-tests, shlib-tests): Fix the command to not fail due to a + second "@". Reported by Scott Deifik . + 2017-09-18 Juan Manuel Guerrero * pc/Makefile.tst (mbprintf5, beginfile1, sigpipe1, backw, nonfatal1) diff --git a/pc/Makefile.tst b/pc/Makefile.tst index 58610a17..b2bf2e67 100644 --- a/pc/Makefile.tst +++ b/pc/Makefile.tst @@ -303,7 +303,7 @@ machine-tests: $(MACHINE_TESTS) # in the next shlib-tests. mpfr-tests: @if $(AWK) --version | $(AWK) ' /MPFR/ { exit 1 }' ; then \ - @echo MPFR tests not supported on this system ; \ + echo MPFR tests not supported on this system ; \ else $(MAKE) $(MPFR_TESTS) ; \ fi @@ -312,7 +312,7 @@ arraydebug-tests: shlib-tests: @if $(AWK) --version | $(AWK) ' /API/ { exit 1 }' ; then \ - @echo shlib tests not supported on this system ; \ + echo shlib tests not supported on this system ; \ else $(MAKE) shlib-real-tests ; \ fi @@ -1068,7 +1068,7 @@ mpfrmemok1: jarebug:: @echo $@ - @echo Expect jarebug to fail with DJGPP and MinGW. + @echo Expect jarebug to fail with DJGPP. @"$(srcdir)"/$@.sh "$(AWKPROG)" "$(srcdir)"/$@.awk "$(srcdir)"/$@.in "_$@" @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ -- cgit v1.2.3 From 9ea0a9c69d62372f54e8c9edb11a69bfe7253ccb Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 20 Sep 2017 10:41:41 +0300 Subject: Tweak pc/Makefile.tst some more. --- pc/ChangeLog | 2 ++ pc/Makefile.tst | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pc/ChangeLog b/pc/ChangeLog index f7af4fe7..1b9e50b4 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -3,6 +3,8 @@ * Makefile.tst (jarebug): Don't announce a MinGW failure. (mpfr-tests, shlib-tests): Fix the command to not fail due to a second "@". Reported by Scott Deifik . + (clean-local): Remove readdir_test.ok, for the case that the test + failed. 2017-09-18 Juan Manuel Guerrero diff --git a/pc/Makefile.tst b/pc/Makefile.tst index b2bf2e67..a3db5e60 100644 --- a/pc/Makefile.tst +++ b/pc/Makefile.tst @@ -3128,7 +3128,7 @@ Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests clean-local: rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 \ seq *~ readfile.ok fork.tmp.* testext.awk fts.ok readdir.ok \ - mmap8k.ok profile1.ok + mmap8k.ok profile1.ok readdir_test.ok # An attempt to print something that can be grepped for in build logs pass-fail: -- cgit v1.2.3