diff options
Diffstat (limited to 'pc')
| -rw-r--r-- | pc/ChangeLog | 6 | ||||
| -rw-r--r-- | pc/Makefile.tst | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog index 10327b10..bf60f218 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,5 +1,11 @@ 2021-05-09 Eli Zaretskii <eliz@gnu.org> + * Makefile.tst (testext): Use $(CMP), not a literal "cmp", so that + end-of-line differences could be ignored on MS-DOS/Windows. + (argcasfile): Use ' /no/such/file', with a leading space, to avoid + MinGW thinking it's a file name, and converting it to C:\foo\bar. + test/argcasfile.ok adjusted accordingly. + * Makefile (VPATH): Adapt to addition of support/malloc directory. (DYNOBJS): New list with dependencies of new files in diff --git a/pc/Makefile.tst b/pc/Makefile.tst index d37233b5..b5197f29 100644 --- a/pc/Makefile.tst +++ b/pc/Makefile.tst @@ -1037,8 +1037,8 @@ testext:: @$(AWK) ' /^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk @$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum'; \ - then cmp "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; \ - else cmp "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; fi + then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; \ + else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; fi getfile: @echo $@ @@ -1244,7 +1244,7 @@ iolint: argcasfile: @echo $@ - @$(AWK) -f "$(srcdir)"/$@.awk ARGC=1 /no/such/file < "$(srcdir)/$@.in" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @$(AWK) -f "$(srcdir)"/$@.awk ARGC=1 ' /no/such/file' < "$(srcdir)/$@.in" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program |