From e81708082f8b3526fb10f9599d1368dfab6d25e7 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Fri, 26 Jun 2015 11:29:56 +0300 Subject: Add new debugger test. --- test/ChangeLog | 7 +++++++ test/Makefile.am | 19 ++++++++++++++----- test/Makefile.in | 19 ++++++++++++++----- test/dbugtypedre.awk | 1 - test/dbugtypedre.in | 4 ---- test/dbugtypedre.ok | 17 ----------------- test/dbugtypedre1.awk | 1 + test/dbugtypedre1.in | 4 ++++ test/dbugtypedre1.ok | 17 +++++++++++++++++ test/dbugtypedre2.awk | 1 + test/dbugtypedre2.in | 4 ++++ test/dbugtypedre2.ok | 15 +++++++++++++++ 12 files changed, 77 insertions(+), 32 deletions(-) delete mode 100644 test/dbugtypedre.awk delete mode 100644 test/dbugtypedre.in delete mode 100644 test/dbugtypedre.ok create mode 100644 test/dbugtypedre1.awk create mode 100644 test/dbugtypedre1.in create mode 100644 test/dbugtypedre1.ok create mode 100644 test/dbugtypedre2.awk create mode 100644 test/dbugtypedre2.in create mode 100644 test/dbugtypedre2.ok (limited to 'test') diff --git a/test/ChangeLog b/test/ChangeLog index b92d8ae7..82f52b83 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,10 @@ +2015-06-26 Arnold D. Robbins + + * Makefile.am (dbugtypedre1): Renamed from dbugtypedre. + (dbugtypedre2): New test. + * dbugtypedre1.awk, dbugtypedre1.in, dbugtypedre1.ok: Renamed files. + * dbugtypedre2.awk, dbugtypedre2.in, dbugtypedre2.ok: New files. + 2015-06-25 Arnold D. Robbins * Makefile.am (negtime): Fix out-of-tree test run. diff --git a/test/Makefile.am b/test/Makefile.am index 03d28f21..b309d0b4 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -177,9 +177,12 @@ EXTRA_DIST = \ datanonl.ok \ dbugeval.in \ dbugeval.ok \ - dbugtypedre.awk \ - dbugtypedre.in \ - dbugtypedre.ok \ + dbugtypedre1.awk \ + dbugtypedre1.in \ + dbugtypedre1.ok \ + dbugtypedre2.awk \ + dbugtypedre2.in \ + dbugtypedre2.ok \ defref.awk \ defref.ok \ delargv.awk \ @@ -1088,7 +1091,8 @@ UNIX_TESTS = \ GAWK_EXT_TESTS = \ aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \ backw badargs beginfile1 beginfile2 binmode1 charasbytes \ - colonwarn clos1way crlf dbugeval dbugtypedre delsub devfd devfd1 devfd2 dumpvars errno exit \ + colonwarn clos1way crlf dbugeval dbugtypedre1 dbugtypedre2 delsub \ + devfd devfd1 devfd2 dumpvars errno exit \ fieldwdth fpat1 fpat2 fpat3 fpat4 fpatnull fsfwfs funlen \ functab1 functab2 functab3 fwtest fwtest2 fwtest3 \ genpot gensub gensub2 getlndir gnuops2 gnuops3 gnureops gsubind \ @@ -2135,7 +2139,12 @@ negtime:: @TZ=GMT AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @AWKPATH="$(srcdir)" $(AWK) -f checknegtime.awk "$(srcdir)"/$@.ok _$@ && rm -f _$@ -dbugtypedre: +dbugtypedre1: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk < $@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + +dbugtypedre2: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk < $@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ diff --git a/test/Makefile.in b/test/Makefile.in index 294c60c0..a30d6b2a 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -434,9 +434,12 @@ EXTRA_DIST = \ datanonl.ok \ dbugeval.in \ dbugeval.ok \ - dbugtypedre.awk \ - dbugtypedre.in \ - dbugtypedre.ok \ + dbugtypedre1.awk \ + dbugtypedre1.in \ + dbugtypedre1.ok \ + dbugtypedre2.awk \ + dbugtypedre2.in \ + dbugtypedre2.ok \ defref.awk \ defref.ok \ delargv.awk \ @@ -1344,7 +1347,8 @@ UNIX_TESTS = \ GAWK_EXT_TESTS = \ aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \ backw badargs beginfile1 beginfile2 binmode1 charasbytes \ - colonwarn clos1way crlf dbugeval dbugtypedre delsub devfd devfd1 devfd2 dumpvars errno exit \ + colonwarn clos1way crlf dbugeval dbugtypedre1 dbugtypedre2 delsub \ + devfd devfd1 devfd2 dumpvars errno exit \ fieldwdth fpat1 fpat2 fpat3 fpat4 fpatnull fsfwfs funlen \ functab1 functab2 functab3 fwtest fwtest2 fwtest3 \ genpot gensub gensub2 getlndir gnuops2 gnuops3 gnureops gsubind \ @@ -2571,7 +2575,12 @@ negtime:: @TZ=GMT AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @AWKPATH="$(srcdir)" $(AWK) -f checknegtime.awk "$(srcdir)"/$@.ok _$@ && rm -f _$@ -dbugtypedre: +dbugtypedre1: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk < $@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + +dbugtypedre2: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk < $@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ diff --git a/test/dbugtypedre.awk b/test/dbugtypedre.awk deleted file mode 100644 index b8c0b6d7..00000000 --- a/test/dbugtypedre.awk +++ /dev/null @@ -1 +0,0 @@ -@include "typeof1.awk" diff --git a/test/dbugtypedre.in b/test/dbugtypedre.in deleted file mode 100644 index 00158c65..00000000 --- a/test/dbugtypedre.in +++ /dev/null @@ -1,4 +0,0 @@ -watch e -run -next -p e diff --git a/test/dbugtypedre.ok b/test/dbugtypedre.ok deleted file mode 100644 index de3c8bcd..00000000 --- a/test/dbugtypedre.ok +++ /dev/null @@ -1,17 +0,0 @@ -Watchpoint 1: e -Starting program: -scalar_n -untyped -regexp -scalar_s -array scalar_n -Stopping in BEGIN ... -Watchpoint 1: e - Old value: untyped variable - New value: @/foo/ -main() at `typeof1.awk':7 -7 e = @/foo/ ; print typeof(e) -regexp -8 print typeof(@/bar/) -e = @/foo/ -EXIT CODE: 2 diff --git a/test/dbugtypedre1.awk b/test/dbugtypedre1.awk new file mode 100644 index 00000000..b8c0b6d7 --- /dev/null +++ b/test/dbugtypedre1.awk @@ -0,0 +1 @@ +@include "typeof1.awk" diff --git a/test/dbugtypedre1.in b/test/dbugtypedre1.in new file mode 100644 index 00000000..00158c65 --- /dev/null +++ b/test/dbugtypedre1.in @@ -0,0 +1,4 @@ +watch e +run +next +p e diff --git a/test/dbugtypedre1.ok b/test/dbugtypedre1.ok new file mode 100644 index 00000000..de3c8bcd --- /dev/null +++ b/test/dbugtypedre1.ok @@ -0,0 +1,17 @@ +Watchpoint 1: e +Starting program: +scalar_n +untyped +regexp +scalar_s +array scalar_n +Stopping in BEGIN ... +Watchpoint 1: e + Old value: untyped variable + New value: @/foo/ +main() at `typeof1.awk':7 +7 e = @/foo/ ; print typeof(e) +regexp +8 print typeof(@/bar/) +e = @/foo/ +EXIT CODE: 2 diff --git a/test/dbugtypedre2.awk b/test/dbugtypedre2.awk new file mode 100644 index 00000000..a78de32b --- /dev/null +++ b/test/dbugtypedre2.awk @@ -0,0 +1 @@ +BEGIN { x = 0; x = @/[a-z]/; x = "" } diff --git a/test/dbugtypedre2.in b/test/dbugtypedre2.in new file mode 100644 index 00000000..d01ce5a5 --- /dev/null +++ b/test/dbugtypedre2.in @@ -0,0 +1,4 @@ +w x + r + n + n diff --git a/test/dbugtypedre2.ok b/test/dbugtypedre2.ok new file mode 100644 index 00000000..9c04e1e7 --- /dev/null +++ b/test/dbugtypedre2.ok @@ -0,0 +1,15 @@ +Watchpoint 1: x +Starting program: +Stopping in BEGIN ... +Watchpoint 1: x + Old value: untyped variable + New value: 0 +main() at `dbugtypedre2.awk':1 +1 BEGIN { x = 0; x = @/[a-z]/; x = "" } +Watchpoint 1: x + Old value: 0 + New value: @/[a-z]/ +main() at `dbugtypedre2.awk':1 +1 BEGIN { x = 0; x = @/[a-z]/; x = "" } +Program exited normally with exit value: 0 +EXIT CODE: 2 -- cgit v1.2.3