diff options
author | Arnold D. Robbins <arnold@skeeve.com> | 2012-11-22 19:14:34 +0200 |
---|---|---|
committer | Arnold D. Robbins <arnold@skeeve.com> | 2012-11-22 19:14:34 +0200 |
commit | 5b104d3e3515df3f23cfaa2037de9e535cd0c0a4 (patch) | |
tree | 11b6b324dc44e4694a252c752f71369deba713b3 /pc | |
parent | 86024b7f014c286daa68c3a0a223ce51f6e13dfa (diff) | |
parent | 3a0cd74e7a88803c548f22272e8eba40a9ac4293 (diff) | |
download | egawk-5b104d3e3515df3f23cfaa2037de9e535cd0c0a4.tar.gz egawk-5b104d3e3515df3f23cfaa2037de9e535cd0c0a4.tar.bz2 egawk-5b104d3e3515df3f23cfaa2037de9e535cd0c0a4.zip |
Merge branch 'gawk-4.0-stable'
Diffstat (limited to 'pc')
-rw-r--r-- | pc/ChangeLog | 5 | ||||
-rw-r--r-- | pc/Makefile.tst | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog index 77159fe0..0a53226e 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,8 @@ +2012-11-22 Eli Zaretskii <eliz@gnu.org> + + * Makefile.tst (jarebug): Update. + (GREP_OPTIONS): Add. + 2012-11-12 Arnold D. Robbins <arnold@skeeve.com> * gawkmisc.pc (os_isreadable): Use correct type for first parameter. diff --git a/pc/Makefile.tst b/pc/Makefile.tst index 09baaf32..4f7e06b0 100644 --- a/pc/Makefile.tst +++ b/pc/Makefile.tst @@ -114,6 +114,9 @@ DATE = gdate # MS-DOS and OS/2 use ; as a PATH delimiter PATH_SEPARATOR = ; +# Non-default GREP_OPTIONS might fail the badargs test +export GREP_OPTIONS= + # ============================================================================ # You shouldn't need to modify anything below this line. # ============================================================================ @@ -842,7 +845,7 @@ rri1:: jarebug:: @echo $@ - @echo Expect jarebug to fail with DJGPP. + @echo Expect jarebug to fail with DJGPP and MinGW. @$(srcdir)/$@.sh "$(AWKPROG)" "$(srcdir)/$@.awk" "$(srcdir)/$@.in" "_$@" @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ |