From 73d24cae0db6cc817db209e5e1ea93b0733d1cca Mon Sep 17 00:00:00 2001
From: "Arnold D. Robbins" <arnold@skeeve.com>
Date: Mon, 26 Dec 2011 23:39:48 +0200
Subject: The grand merge: dgawk and pgawk folded into gawk.

---
 test/ChangeLog   | 4 ++++
 test/Makefile.am | 6 +++---
 test/Makefile.in | 6 +++---
 test/badargs.ok  | 3 +++
 4 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'test')

diff --git a/test/ChangeLog b/test/ChangeLog
index 711d8b20..c16e5ecf 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-26         John Haque      <j.eh@mchsi.com>
+
+	* badargs.ok: Adjust for new and changed command line options.
+
 2011-12-26         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* Makefile.am (rri1): New test.
diff --git a/test/Makefile.am b/test/Makefile.am
index 1bf4456e..943dbd9f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1407,19 +1407,19 @@ dumpvars::
 
 profile1:
 	@echo $@
-	@$(AWK) --profile=ap-$@.out -f $(srcdir)/xref.awk $(srcdir)/dtdgport.awk > _$@.out1
+	@$(AWK) --pretty-print=ap-$@.out -f $(srcdir)/xref.awk $(srcdir)/dtdgport.awk > _$@.out1
 	@$(AWK) -f ap-$@.out $(srcdir)/dtdgport.awk > _$@.out2 ; rm ap-$@.out
 	@cmp _$@.out1 _$@.out2 && rm _$@.out[12] || echo EXIT CODE: $$? >>_$@
 
 profile2:
 	@echo $@
-	@$(PGAWK) --profile=ap-$@.out -v sortcmd=sort -f $(srcdir)/xref.awk $(srcdir)/dtdgport.awk > /dev/null
+	@$(AWK) --profile=ap-$@.out -v sortcmd=sort -f $(srcdir)/xref.awk $(srcdir)/dtdgport.awk > /dev/null
 	@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
 profile3:
 	@echo $@
-	@$(PGAWK) --profile=ap-$@.out -f $(srcdir)/$@.awk > /dev/null
+	@$(AWK) --profile=ap-$@.out -f $(srcdir)/$@.awk > /dev/null
 	@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
diff --git a/test/Makefile.in b/test/Makefile.in
index 6eaeb72d..a389929a 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1757,19 +1757,19 @@ dumpvars::
 
 profile1:
 	@echo $@
-	@$(AWK) --profile=ap-$@.out -f $(srcdir)/xref.awk $(srcdir)/dtdgport.awk > _$@.out1
+	@$(AWK) --pretty-print=ap-$@.out -f $(srcdir)/xref.awk $(srcdir)/dtdgport.awk > _$@.out1
 	@$(AWK) -f ap-$@.out $(srcdir)/dtdgport.awk > _$@.out2 ; rm ap-$@.out
 	@cmp _$@.out1 _$@.out2 && rm _$@.out[12] || echo EXIT CODE: $$? >>_$@
 
 profile2:
 	@echo $@
-	@$(PGAWK) --profile=ap-$@.out -v sortcmd=sort -f $(srcdir)/xref.awk $(srcdir)/dtdgport.awk > /dev/null
+	@$(AWK) --profile=ap-$@.out -v sortcmd=sort -f $(srcdir)/xref.awk $(srcdir)/dtdgport.awk > /dev/null
 	@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
 profile3:
 	@echo $@
-	@$(PGAWK) --profile=ap-$@.out -f $(srcdir)/$@.awk > /dev/null
+	@$(AWK) --profile=ap-$@.out -f $(srcdir)/$@.awk > /dev/null
 	@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
diff --git a/test/badargs.ok b/test/badargs.ok
index 66e67b03..cb140161 100644
--- a/test/badargs.ok
+++ b/test/badargs.ok
@@ -10,13 +10,16 @@ Short options:		GNU long options: (extensions)
 	-c			--traditional
 	-C			--copyright
 	-d[file]		--dump-variables[=file]
+	-D[file]		--debug[=file]
 	-e 'program-text'	--source='program-text'
 	-E file			--exec=file
 	-g			--gen-pot
 	-h			--help
+	-l library		--load=library
 	-L [fatal]		--lint[=fatal]
 	-n			--non-decimal-data
 	-N			--use-lc-numeric
+	-o[file]		--pretty-print[=file]
 	-O			--optimize
 	-p[file]		--profile[=file]
 	-P			--posix
-- 
cgit v1.2.3