diff options
Diffstat (limited to 'pc')
-rw-r--r-- | pc/ChangeLog | 11 | ||||
-rw-r--r-- | pc/Makefile.tst | 23 | ||||
-rw-r--r-- | pc/config.h | 6 |
3 files changed, 27 insertions, 13 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog index 455bd321..9ed997ba 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,14 @@ +2017-08-27 Juan Manuel Guerrero <juan.guerrero@gmx.de> + + * pc/Makefile.tst (mbstr1, mbstr2, errno, getlndir, clos1way2) + (clos1way3, clos1way4, clos1way5, clos1way6): Update the expected + failure messages for DJGPP. + +2017-08-26 Eli Zaretskii <eliz@gnu.org> + + * Makefile.tst (SLASH, PATH_SEPARATOR, LS): Change the default + values to be less specific to my private setup. + 2017-08-23 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (testext): Fix spelling of testexttmp.txt. diff --git a/pc/Makefile.tst b/pc/Makefile.tst index 0bb073d0..069431b8 100644 --- a/pc/Makefile.tst +++ b/pc/Makefile.tst @@ -69,8 +69,7 @@ AWKPROG = ../gawk.exe # index numbers, because this is what the readdir test expects. # Otherwise, the readdir test will fail. (The MSYS ls.exe doesn't # report full index values.) -#LS = ls.exe -LS = /d/usr/bin/ls.exe +LS = ls.exe # Define PGAWK PGAWK = ../gawk.exe -p @@ -119,13 +118,13 @@ MKDIR = mkdir DATE = gdate # MS-DOS and OS/2 use ; as a PATH delimiter -PATH_SEPARATOR = : +PATH_SEPARATOR = ; # Argument to -F to produce -F/, should be // for MinGW, / otherwise, # because MSYS Bash converts a single slash to the equivalent Windows # directory. -#SLASH = / -SLASH = // +SLASH = / +#SLASH = // # Non-default GREP_OPTIONS might fail the badargs test export GREP_OPTIONS= @@ -487,7 +486,7 @@ devfd:: errno: @echo $@ - @echo Expect errno to fail with MinGW due to error message differences + @echo Expect errno to fail with DJGPP and MinGW due to error message differences @AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -886,14 +885,14 @@ gsubtst6:: mbstr1:: @echo $@ - @echo Expect mbstr1 to fail with MinGW. + @echo Expect mbstr1 to fail with DJGPP and MinGW. @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; \ AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ mbstr2:: @echo $@ - @echo Expect mbstr2 to fail with MinGW. + @echo Expect mbstr2 to fail with DJGPP and MinGW. @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; \ AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -2493,27 +2492,31 @@ backw: clos1way2: @echo $@ + @echo Expect clos1way2 to fail with DJGPP. @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ clos1way3: @echo $@ + @echo Expect clos1way3 to fail with DJGPP. @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ clos1way4: @echo $@ + @echo Expect clos1way4 to fail with DJGPP. @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ clos1way5: @echo $@ + @echo Expect clos1way5 to fail with DJGPP. @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ clos1way6: @echo $@ - @echo Expect clos1way6 to fail with MinGW + @echo Expect clos1way6 to fail with DJGPP and MinGW @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -2644,7 +2647,7 @@ gensub3: getlndir: @echo $@ - @echo Expect getlndir to fail with DJGPP. + @echo Expect getlndir to fail with DJGPP due to error message differences. @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ diff --git a/pc/config.h b/pc/config.h index e0f2cba8..21497f02 100644 --- a/pc/config.h +++ b/pc/config.h @@ -457,7 +457,7 @@ #define PACKAGE_NAME "GNU Awk" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GNU Awk 4.1.62" +#define PACKAGE_STRING "GNU Awk 4.1.63" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gawk" @@ -466,7 +466,7 @@ #define PACKAGE_URL "http://www.gnu.org/software/gawk/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.1.62" +#define PACKAGE_VERSION "4.1.63" /* Define to 1 if *printf supports %F format */ #ifdef __DJGPP__ @@ -523,7 +523,7 @@ /* Version number of package */ -#define VERSION "4.1.62" +#define VERSION "4.1.63" /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE |