Merge branch 'gawk-4.0-stable'

5 files changed, 39 insertions, 5 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 _$@
 
diff --git a/vms/ChangeLog b/vms/ChangeLog
index 5ac0fe1d..a51ccdb5 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-22         Anders Wallin         <anders_s_wallin@yahoo.se>
+
+	* vmstest.com: Updated to match main test/Makefile.
+
 2012-11-14         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* vmsbuild.com: Updated.  Thanks to Anders Wallin.
diff --git a/vms/vms-notes b/vms/vms-notes
new file mode 100644
index 00000000..23943bb9
--- /dev/null
+++ b/vms/vms-notes
@@ -0,0 +1,8 @@
+Thu Nov 22 18:18:47 IST 2012
+============================
+
+Per Anders Wallin, the HP VMS porting guide is available at
+
+	http://h71000.www7.hp.com/portability/portingguidelines.html
+
+This file documents this fact, and anything else of interest.
diff --git a/vms/vmstest.com b/vms/vmstest.com
index ccea8717..029f661d 100644
--- a/vms/vmstest.com
+++ b/vms/vmstest.com
@@ -53,7 +53,7 @@ $		list = "concat2 concat3 concat4 convfmt datanonl defref" -
 		  + " fnamedat fnarray fnarray2 fnaryscl fnasgnm fnmisc" -
 		  + " fordel forref forsimp fsbs fsspcoln fsrs fstabplus" -
 		  + " funsemnl funsmnam funstack getline getline2 getline3" -
-		  + " getline4"
+		  + " getline4 getline5"
 $		gosub list_of_tests
 $		list = "getlnbuf getnr2tb getnr2tm gsubasgn gsubtest" -
 		  + " gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6" -
@@ -67,12 +67,12 @@ $		gosub list_of_tests
 $		list = "nfset nlfldsep nlinstr nlstrina noeffect nofile" -
 		  + " nofmtch noloop1 noloop2 nonl noparms nors nulrsend" -
 		  + " numindex numsubstr octsub ofmt ofmtbig ofmtfidl" -
-		  + " ofmta ofmts onlynl opasnidx opasnslf paramdup" -
+		  + " ofmta ofmts ofs1 onlynl opasnidx opasnslf paramdup" -
 		  + " paramres paramtyp parse1 parsefld parseme pcntplus" -
 		  + " posix2008sub prdupval prec printf0 printf1 prmarscl"
 $		gosub list_of_tests
 $		list = "prmreuse prt1eval prtoeval rand range1 rebt8b1" -
-		  + " redfilnm regeq regrange reindops reparse resplit rs rsnul1nl" -
+		  + " redfilnm regeq regexprange regrange reindops reparse resplit rs rsnul1nl" -
 		  + " rsnulbig rsnulbig2 rstest1 rstest2 rstest3 rstest4" -
 		  + " rstest5 rswhite scalar sclforin sclifin sortempty" -
 		  + " splitargv splitarr splitdef splitvar splitwht" -
@@ -97,7 +97,7 @@ $gnu:
 $gawk_ext:	echo "gawk_ext... (gawk.extensions)"
 $		list = "aadelete1 aadelete2 aarray1 aasort aasorti" -
 		  + " argtest arraysort backw badargs beginfile1 binmode1" -
-		  + " clos1way delsub devfd devfd1 devfd2 dumpvars exit" -
+		  + " clos1way charasbytes delsub devfd devfd1 devfd2 dumpvars exit" -
 		  + " fieldwdth fpat1 fpat2 fpat3 fpatnull funlen fsfwfs" -
 		  + " fwtest fwtest2 fwtest3" -
 		  + " gensub gensub2 getlndir gnuops2 gnuops3 gnureops" -
@@ -237,6 +237,7 @@ $nulrsend:
 $ofmt:
 $ofmtfidl:
 $ofmts:
+$ofs1:
 $onlynl:
 $parse1:
 $parsefld:
@@ -325,6 +326,7 @@ $procinfs:
 $prt1eval:
 $rebt8b1:
 $rebt8b2:
+$regexprange:
 $regrange:
 $regx8bit:
 $sort1:
@@ -346,6 +348,7 @@ $	return
 $
 $double1:
 $double2:
+$getline5:
 $lc_num1:
 $mbprintf1:
 $	echo "''test' skipped"
@@ -1318,6 +1321,17 @@ $	cmp devfd2.ok _devfd2.tmp
 $	if $status then  rm _devfd2.tmp;
 $	return
 $
+$charasbytes:
+$! This test used "od" on Unix to verify the result. As this is not available we must try
+$! as best as possible using DUMP and SEARCH, instead of comparing to charasbytes.ok
+$!
+$	echo "''test'"
+$	gawk -b -f 'test'.awk 'test'.in >_'test'.tmp
+$	pipe dump/byte/block=count:1 _charasbytes.tmp | -
+		search sys$pipe /noout " 00 00 00 00 00 00 00 00 00 00 00 00 0A 5A 5A 5A"
+	if $severity .eq. 1 then	rm _'test'.tmp;*
+$	return
+$
 $mixed1:	echo "mixed1"
 $	set noOn
 $	gawk -f /dev/null --source "BEGIN {return junk}" >_mixed1.tmp 2>&1