diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-02-02 11:22:13 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-02-02 11:22:13 +0200 |
| commit | ed3ce8fb4800e0746726d7d59642518fa4983889 (patch) | |
| tree | 6210075248666453b238f7818549613a91cb72ce | |
| parent | 025a7fcf510c2bd8dde185cc65b5e12b8d506375 (diff) | |
| download | egawk-ed3ce8fb4800e0746726d7d59642518fa4983889.tar.gz egawk-ed3ce8fb4800e0746726d7d59642518fa4983889.tar.bz2 egawk-ed3ce8fb4800e0746726d7d59642518fa4983889.zip | |
Fix typedregex4 test on MinGW.
| -rw-r--r-- | pc/ChangeLog | 6 | ||||
| -rw-r--r-- | pc/GenMakefileTst.awk | 1 | ||||
| -rw-r--r-- | pc/Makefile.tst | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog index c95d1d4f..3e63e209 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,9 @@ +2019-02-02 Eli Zaretskii <eliz@gnu.org> + + * Makefile.tst (typedregex4): + * GenMakefileTst.awk (substitutions): Replace a literal slash with + $(SLASH) in the typedregex4 test. + 2019-01-26 Arnold D. Robbins <arnold@skeeve.com> * GenMakefileTst.awk: Remove BEGIN rule that did cat of diff --git a/pc/GenMakefileTst.awk b/pc/GenMakefileTst.awk index 7fe92885..7fce7eb3 100644 --- a/pc/GenMakefileTst.awk +++ b/pc/GenMakefileTst.awk @@ -90,6 +90,7 @@ function substitutions(test, string) # MSYS needs "/" to be doubled gsub(/-F\//, "-F$(SLASH)", string) + gsub(/=@\//, =@$(SLASH), string) if (string ~ /\$\(CMP\)/ && test in testoutcmp) { gsub(/\$\(CMP\)/, "$(TESTOUTCMP)", string) diff --git a/pc/Makefile.tst b/pc/Makefile.tst index f937c064..b6b116f6 100644 --- a/pc/Makefile.tst +++ b/pc/Makefile.tst @@ -1138,7 +1138,7 @@ spacere: typedregex4: @echo $@ - @$(AWK) -v x=@/foo/ -f "$(srcdir)"/$@.awk y=@/bar/ /dev/null >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @$(AWK) -v x=@$(SLASH)foo/ -f "$(srcdir)"/$@.awk y=@$(SLASH)bar/ /dev/null >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program |