diff options
| -rw-r--r-- | pc/ChangeLog | 9 | ||||
| -rw-r--r-- | pc/Makefile.tst | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog index f5f69206..9f6cf619 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,12 @@ +2013-04-28 Eli Zaretskii <eliz@gnu.org> + + * Makefile.tst (top_srcdir): Define. This avoids failure in a few + tests that use this variable. + (testext): Prepend a space before the /regexp/ argument, to + prevent MSYS Bash mistaking this for an absolute file name that + needs to be converted to the Windows D:/foo/bar form, which fails + the test. + 2013-04-22 Scott Deifik <scottd.mail@sbcglobal.net> * Makefile.tst: Sync with mainline. diff --git a/pc/Makefile.tst b/pc/Makefile.tst index 3555d498..1a657d5d 100644 --- a/pc/Makefile.tst +++ b/pc/Makefile.tst @@ -124,6 +124,7 @@ export GREP_OPTIONS= srcdir = . abs_srcdir = . abs_builddir = . +top_srcdir = $(srcdir)/.. # Get rid of core files when cleaning and generated .ok file CLEANFILES = core core.* fmtspcl.ok @@ -977,7 +978,7 @@ inplace3:: testext:: @echo $@ - @$(AWK) '/^(@load|BEGIN)/,/^}/' $(top_srcdir)/extension/testext.c > testext.awk + @$(AWK) ' /^(@load|BEGIN)/,/^}/' $(top_srcdir)/extension/testext.c > testext.awk @$(AWK) -f testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ testext.awk |