aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2016-06-14 06:03:49 +0300
committerArnold D. Robbins <arnold@skeeve.com>2016-06-14 06:03:49 +0300
commite30696930a6335cee3cae0edad156bb4016ff993 (patch)
treedc09acade8ced4af601e26044360feba30551d91
parentd58de166cf120948edc030f5a748cc4d8a2ef635 (diff)
downloadegawk-e30696930a6335cee3cae0edad156bb4016ff993.tar.gz
egawk-e30696930a6335cee3cae0edad156bb4016ff993.tar.bz2
egawk-e30696930a6335cee3cae0edad156bb4016ff993.zip
Restore mixed1 test.
-rw-r--r--test/ChangeLog7
-rw-r--r--test/Makefile.am2
-rw-r--r--test/Makefile.in2
-rw-r--r--test/mixed1.ok4
4 files changed, 11 insertions, 4 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index 83b45460..f0e901e4 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,10 @@
+2016-06-14 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (GAWK_EXT_TESTS): Add mixed1. Who knows
+ how long that's been broken...
+ * mixed1.ok: Adjust to match what the code produces.
+ Thanks to John E. Malmberg <wb8tyw@qsl.net> for the report.
+
2016-06-08 Arnold D. Robbins <arnold@skeeve.com>
* symtab10.awk, symtab10.in, symtab10.ok: New files.
diff --git a/test/Makefile.am b/test/Makefile.am
index 1f1646e9..d3842fb5 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1110,7 +1110,7 @@ GAWK_EXT_TESTS = \
incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \
include include2 indirectbuiltin indirectcall indirectcall2 \
lint lintold lintwarn \
- manyfiles match1 match2 match3 mbstr1 mbstr2 \
+ mixed1 manyfiles match1 match2 match3 mbstr1 mbstr2 \
muldimposix \
nastyparm negtime next nondec nondec2 \
patsplit posix printfbad1 printfbad2 printfbad3 printfbad4 printhuge procinfs \
diff --git a/test/Makefile.in b/test/Makefile.in
index df874d1b..31f018a4 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1366,7 +1366,7 @@ GAWK_EXT_TESTS = \
incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \
include include2 indirectbuiltin indirectcall indirectcall2 \
lint lintold lintwarn \
- manyfiles match1 match2 match3 mbstr1 mbstr2 \
+ mixed1 manyfiles match1 match2 match3 mbstr1 mbstr2 \
muldimposix \
nastyparm negtime next nondec nondec2 \
patsplit posix printfbad1 printfbad2 printfbad3 printfbad4 printhuge procinfs \
diff --git a/test/mixed1.ok b/test/mixed1.ok
index 91608fa3..bd6f447d 100644
--- a/test/mixed1.ok
+++ b/test/mixed1.ok
@@ -1,3 +1,3 @@
-gawk: BEGIN {return junk}
-gawk: ^ `return' used outside function context
+gawk: cmd. line:1: BEGIN {return junk}
+gawk: cmd. line:1: ^ `return' used outside function context
EXIT CODE: 1