Revise fwtest* test names and files to match.

11 files changed, 38 insertions, 32 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 46c52626..d684e73a 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2017-03-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* fwtest4: Renamed from fwtest3.
+	* fwtest3: Renamed from fwtest2b.
+	* Makefile.am: Updated.
+
 2017-03-21         Andrew J. Schorr     <aschorr@telemetry-investments.com>
 
 	* Makefile.am (fwtest2b): Add new test of enhanced FIELDWIDTHS syntax.
diff --git a/test/Makefile.am b/test/Makefile.am
index b46f36e3..b1a97621 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -385,11 +385,11 @@ EXTRA_DIST = \
 	fwtest2.awk \
 	fwtest2.in \
 	fwtest2.ok \
-	fwtest2b.awk \
-	fwtest2b.ok \
 	fwtest3.awk \
-	fwtest3.in \
 	fwtest3.ok \
+	fwtest4.awk \
+	fwtest4.in \
+	fwtest4.ok \
 	genpot.awk \
 	genpot.ok \
 	gensub.awk \
@@ -1223,7 +1223,7 @@ GAWK_EXT_TESTS = \
 	crlf dbugeval dbugeval2 dbugtypedre1 dbugtypedre2 delsub \
 	devfd devfd1 devfd2 dumpvars errno exit \
 	fieldwdth forcenum fpat1 fpat2 fpat3 fpat4 fpat5 fpatnull fsfwfs funlen \
-	functab1 functab2 functab3 fwtest fwtest2 fwtest2b fwtest3 \
+	functab1 functab2 functab3 fwtest fwtest2 fwtest3 fwtest4 \
 	genpot gensub gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind \
 	icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase \
 	incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \
@@ -2375,7 +2375,7 @@ arrdbg:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ "$(srcdir)"/$@.ok
 #	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ "$(srcdir)"/$@.ok || exit 0
 
-fwtest2b:
+fwtest3:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/fwtest2.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
diff --git a/test/Makefile.in b/test/Makefile.in
index fe449734..57f5bf61 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -643,11 +643,11 @@ EXTRA_DIST = \
 	fwtest2.awk \
 	fwtest2.in \
 	fwtest2.ok \
-	fwtest2b.awk \
-	fwtest2b.ok \
 	fwtest3.awk \
-	fwtest3.in \
 	fwtest3.ok \
+	fwtest4.awk \
+	fwtest4.in \
+	fwtest4.ok \
 	genpot.awk \
 	genpot.ok \
 	gensub.awk \
@@ -1480,7 +1480,7 @@ GAWK_EXT_TESTS = \
 	crlf dbugeval dbugeval2 dbugtypedre1 dbugtypedre2 delsub \
 	devfd devfd1 devfd2 dumpvars errno exit \
 	fieldwdth forcenum fpat1 fpat2 fpat3 fpat4 fpat5 fpatnull fsfwfs funlen \
-	functab1 functab2 functab3 fwtest fwtest2 fwtest2b fwtest3 \
+	functab1 functab2 functab3 fwtest fwtest2 fwtest3 fwtest4 \
 	genpot gensub gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind \
 	icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase \
 	incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \
@@ -2813,7 +2813,7 @@ arrdbg:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ "$(srcdir)"/$@.ok
 #	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ "$(srcdir)"/$@.ok || exit 0
 
-fwtest2b:
+fwtest3:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/fwtest2.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
@@ -3996,7 +3996,7 @@ fwtest2:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-fwtest3:
+fwtest4:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
diff --git a/test/Maketests b/test/Maketests
index d9183c0a..9ff8ef90 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -1177,7 +1177,7 @@ fwtest2:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-fwtest3:
+fwtest4:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
diff --git a/test/fwtest2b.awk b/test/fwtest2b.awk
deleted file mode 100644
index 5e96c1aa..00000000
--- a/test/fwtest2b.awk
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN {
-   FIELDWIDTHS = "2:13 2:13 2:13";
-}
-{
-   printf "%s|%s|%s\n", $1, $2, $3
-}
diff --git a/test/fwtest2b.ok b/test/fwtest2b.ok
deleted file mode 100644
index f4d28232..00000000
--- a/test/fwtest2b.ok
+++ /dev/null
@@ -1,12 +0,0 @@
- 0.4867373206| 1.3206333033|-0.2333178127
- 0.5668176165| 1.3711756314|-0.2193558040
- 0.4325251781| 1.3399488722|-0.1568307497
- 0.4900487563| 1.3295759570|-0.2217392402
--0.6790064191| 1.2536623801|-0.2955415433
--0.6311440220| 1.2966579993|-0.2246692210
--0.7209390351| 1.1783407099|-0.2539408209
--0.6782473356| 1.2495242556|-0.2811436366
--0.7062054082| 1.1223820964|-1.1619805834
--0.6491590119| 1.1248946162|-1.0851579675
--0.7948856821| 1.1208852325|-1.1259821556
--0.7102549262| 1.1225121126|-1.1475381286
diff --git a/test/fwtest3.awk b/test/fwtest3.awk
index d1384eaf..5e96c1aa 100644
--- a/test/fwtest3.awk
+++ b/test/fwtest3.awk
@@ -1 +1,6 @@
-BEGIN { FIELDWIDTHS="5" } { print $1 }
+BEGIN {
+   FIELDWIDTHS = "2:13 2:13 2:13";
+}
+{
+   printf "%s|%s|%s\n", $1, $2, $3
+}
diff --git a/test/fwtest3.ok b/test/fwtest3.ok
index e56e15bb..f4d28232 100644
--- a/test/fwtest3.ok
+++ b/test/fwtest3.ok
@@ -1 +1,12 @@
-12345
+ 0.4867373206| 1.3206333033|-0.2333178127
+ 0.5668176165| 1.3711756314|-0.2193558040
+ 0.4325251781| 1.3399488722|-0.1568307497
+ 0.4900487563| 1.3295759570|-0.2217392402
+-0.6790064191| 1.2536623801|-0.2955415433
+-0.6311440220| 1.2966579993|-0.2246692210
+-0.7209390351| 1.1783407099|-0.2539408209
+-0.6782473356| 1.2495242556|-0.2811436366
+-0.7062054082| 1.1223820964|-1.1619805834
+-0.6491590119| 1.1248946162|-1.0851579675
+-0.7948856821| 1.1208852325|-1.1259821556
+-0.7102549262| 1.1225121126|-1.1475381286
diff --git a/test/fwtest4.awk b/test/fwtest4.awk
new file mode 100644
index 00000000..d1384eaf
--- /dev/null
+++ b/test/fwtest4.awk
@@ -0,0 +1 @@
+BEGIN { FIELDWIDTHS="5" } { print $1 }
diff --git a/test/fwtest3.in b/test/fwtest4.in
index a32a4347..a32a4347 100644
--- a/test/fwtest3.in
+++ b/test/fwtest4.in
diff --git a/test/fwtest4.ok b/test/fwtest4.ok
new file mode 100644
index 00000000..e56e15bb
--- /dev/null
+++ b/test/fwtest4.ok
@@ -0,0 +1 @@
+12345