aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/ChangeLog5
-rw-r--r--test/dbugtypedre1.ok6
-rw-r--r--test/typedregex1.awk2
-rw-r--r--test/typeof1.ok6
-rw-r--r--test/typeof3.ok6
5 files changed, 15 insertions, 10 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index 6b88e287..b121fbec 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -14,6 +14,11 @@
* Makefile.am (getfile, dbugtypedre1, dbugtypedre2): Fixed to
work if building out of the source tree.
+ Unrelated:
+
+ * dbugtypedre1.ok, typedregex1.awk, typeof1.ok, typeof3.ok:
+ Update after code changes.
+
2015-06-25 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.am (negtime): Fix out-of-tree test run.
diff --git a/test/dbugtypedre1.ok b/test/dbugtypedre1.ok
index de3c8bcd..dffee0e8 100644
--- a/test/dbugtypedre1.ok
+++ b/test/dbugtypedre1.ok
@@ -1,10 +1,10 @@
Watchpoint 1: e
Starting program:
-scalar_n
+number
untyped
regexp
-scalar_s
-array scalar_n
+string
+array number
Stopping in BEGIN ...
Watchpoint 1: e
Old value: untyped variable
diff --git a/test/typedregex1.awk b/test/typedregex1.awk
index fc8ba805..f308a335 100644
--- a/test/typedregex1.awk
+++ b/test/typedregex1.awk
@@ -69,7 +69,7 @@ function simple_tests( fbre, numresult, strresult)
else
print "conversion to number: fail"
- if (typeof(fbre) == "scalar_n")
+ if (typeof(fbre) == "number")
print "typeof variable after conversion: ok"
else
print "typeof variable after conversion: fail"
diff --git a/test/typeof1.ok b/test/typeof1.ok
index 3a2f6a92..132cc24e 100644
--- a/test/typeof1.ok
+++ b/test/typeof1.ok
@@ -1,7 +1,7 @@
-scalar_n
+number
untyped
regexp
-scalar_s
-array scalar_n
+string
+array number
regexp
regexp
diff --git a/test/typeof3.ok b/test/typeof3.ok
index 8186ad9e..a6cd6c4a 100644
--- a/test/typeof3.ok
+++ b/test/typeof3.ok
@@ -1,9 +1,9 @@
regexp
xx
regexp
-scalar_n
+number
4
-scalar_n
-untyped
+number
+unassigned
gawk: typeof3.awk:18: fatal: attempt to use scalar `a["1"]' as an array
EXIT CODE: 2