[m-dev.] trivial diff: update test cases in debug grade
Mark Anthony BROWN
dougl at cs.mu.OZ.AU
Thu Oct 19 01:40:21 AEDT 2000
Estimated hours taken: 0.2
tests/debugger/*.exp2:
tests/debugger/declarative/*.exp2:
Update the expected output for these test cases in debug grades,
after Zoltan's recent change to `retry'.
? tests/debugger/retry.exp2
Index: tests/debugger/exception_cmd.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/exception_cmd.exp2,v
retrieving revision 1.1
diff -u -r1.1 exception_cmd.exp2
--- tests/debugger/exception_cmd.exp2 2000/07/22 08:20:08 1.1
+++ tests/debugger/exception_cmd.exp2 2000/10/18 14:28:53
@@ -2,7 +2,7 @@
mdb> echo on
Command echo enabled.
mdb> exception
- 5: 3 3 EXCP pred require:error/1-0 (erroneous) require.m:90 (exception_cmd.m:18)
+ 5: 3 3 EXCP pred require:error/1-0 (erroneous) c3; require.m:90 (exception_cmd.m:18)
mdb> print *
HeadVar__1 "oops"
mdb> continue
Index: tests/debugger/exception_value.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/exception_value.exp2,v
retrieving revision 1.1
diff -u -r1.1 exception_value.exp2
--- tests/debugger/exception_value.exp2 2000/06/19 07:59:20 1.1
+++ tests/debugger/exception_value.exp2 2000/10/18 14:28:53
@@ -9,14 +9,14 @@
mdb> continue
4: 4 4 CALL pred exception_value:p/1-0 (det) exception_value.m:30 (exception.m:NNNN)
mdb> finish
- 7: 4 4 EXCP pred exception_value:p/1-0 (det) exception_value.m:31 (exception.m:NNNN)
+ 7: 4 4 EXCP pred exception_value:p/1-0 (det) c3; exception_value.m:31 (exception.m:NNNN)
mdb> print exception
"p exception"
mdb> continue
exception(univ("p exception" : string))
18: 11 4 CALL pred exception_value:q/1-0 (det) exception_value.m:35 (exception.m:NNNN)
mdb> finish
- 21: 11 4 EXCP pred exception_value:q/1-0 (det) exception_value.m:36 (exception.m:NNNN)
+ 21: 11 4 EXCP pred exception_value:q/1-0 (det) c16; exception_value.m:36 (exception.m:NNNN)
mdb> browse exception
browser> set depth 9
browser> set size 99
Index: tests/debugger/exception_vars.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/exception_vars.exp2,v
retrieving revision 1.5
diff -u -r1.5 exception_vars.exp2
--- tests/debugger/exception_vars.exp2 2000/07/22 08:20:08 1.5
+++ tests/debugger/exception_vars.exp2 2000/10/18 14:28:54
@@ -4,7 +4,7 @@
mdb> goto 2
2: 2 2 CALL pred exception_vars:test/2-0 (det) exception_vars.m:19 (exception_vars.m:12)
mdb> finish
- 6: 2 2 EXCP pred exception_vars:test/2-0 (det) exception_vars.m:18 (exception_vars.m:12)
+ 6: 2 2 EXCP pred exception_vars:test/2-0 (det) t;c2; exception_vars.m:18 (exception_vars.m:12)
mdb> print *
HeadVar__1 42
mdb> continue
Index: tests/debugger/loopcheck.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/loopcheck.exp2,v
retrieving revision 1.3
diff -u -r1.3 loopcheck.exp2
--- tests/debugger/loopcheck.exp2 2000/03/27 11:50:26 1.3
+++ tests/debugger/loopcheck.exp2 2000/10/18 14:28:55
@@ -18,13 +18,13 @@
loopcheck.m:21
8: 4 4 CALL pred require:error/1-0 (erroneous)
require.m:89 (from loopcheck.m:21)
- 9: 4 4 EXCP pred require:error/1-0 (erroneous)
+ 9: 4 4 EXCP pred require:error/1-0 (erroneous) c3;
require.m:90 (from loopcheck.m:21)
- 10: 3 3 EXCP pred loopcheck:loop/1-0 (erroneous)
+ 10: 3 3 EXCP pred loopcheck:loop/1-0 (erroneous) c3;e;t;c2;
loopcheck.m:21 (from loopcheck.m:21)
- 11: 2 2 EXCP pred loopcheck:loop/1-0 (erroneous)
+ 11: 2 2 EXCP pred loopcheck:loop/1-0 (erroneous) c3;e;e;c2;
loopcheck.m:21 (from loopcheck.m:14)
- 12: 1 1 EXCP pred loopcheck:main/2-0 (det)
+ 12: 1 1 EXCP pred loopcheck:main/2-0 (det) c2;
loopcheck.m:14
Uncaught exception:
Software Error: detected infinite recursion in pred loopcheck:loop/1
Index: tests/debugger/polymorphic_output.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/polymorphic_output.exp2,v
retrieving revision 1.3
diff -u -r1.3 polymorphic_output.exp2
--- tests/debugger/polymorphic_output.exp2 2000/04/19 03:42:51 1.3
+++ tests/debugger/polymorphic_output.exp2 2000/10/18 14:28:59
@@ -12,7 +12,7 @@
HeadVar__1 two("three", 3, three("four", 4, "one", 1, empty, empty, empty), two/4)
HeadVar__2 3
mdb> f
- 10: 6 4 EXCP func std_util:det_arg/3-0 (det)
+ 10: 6 4 EXCP func std_util:det_arg/3-0 (det) e;t;c2;
mdb> P
HeadVar__1 two("three", 3, three("four", 4, "one", 1, empty, empty, empty), two/4)
HeadVar__2 3
Index: tests/debugger/declarative/throw.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/throw.exp2,v
retrieving revision 1.2
diff -u -r1.2 throw.exp2
--- tests/debugger/declarative/throw.exp2 2000/08/18 10:59:40 1.2
+++ tests/debugger/declarative/throw.exp2 2000/10/18 14:29:01
@@ -9,7 +9,7 @@
mdb> continue
3: 3 3 CALL pred throw:p/1-0 (cc_nondet) throw.m:20 (exception.m:320)
mdb> finish
- 34: 3 3 EXCP pred throw:p/1-0 (cc_nondet) throw.m:22 (exception.m:320)
+ 34: 3 3 EXCP pred throw:p/1-0 (cc_nondet) q!;c2; throw.m:22 (exception.m:320)
mdb> dd
Call p(_)
Throws "Too big"
@@ -23,12 +23,12 @@
p(_)
"Too big"
Is this a bug? yes
- 34: 3 3 EXCP pred throw:p/1-0 (cc_nondet) throw.m:22 (exception.m:320)
+ 34: 3 3 EXCP pred throw:p/1-0 (cc_nondet) q!;c2; throw.m:22 (exception.m:320)
mdb> continue
exception(univ("Too big" : string))
41: 11 3 CALL pred throw:q/1-0 (semidet) throw.m:48 (exception.m:320)
mdb> finish
- 76: 11 3 EXCP pred throw:q/1-0 (semidet) throw.m:52 (exception.m:320)
+ 76: 11 3 EXCP pred throw:q/1-0 (semidet) c2;~;q!;c2;~;c2;q!;c1; throw.m:52 (exception.m:320)
mdb> dd
Call q(_)
Throws "Too big"
@@ -42,6 +42,6 @@
q(_)
"Too big"
Is this a bug? yes
- 76: 11 3 EXCP pred throw:q/1-0 (semidet) throw.m:52 (exception.m:320)
+ 76: 11 3 EXCP pred throw:q/1-0 (semidet) c2;~;q!;c2;~;c2;q!;c1; throw.m:52 (exception.m:320)
mdb> continue
exception(univ("Too big" : string))
New file: tests/debugger/retry.exp2:
1: 1 1 CALL pred retry:main/2-0 (det) retry.m:25
mdb> echo on
Command echo enabled.
mdb> register --quiet
mdb> scroll off
Scroll control disabled.
mdb> context none
Contexts will not be printed.
mdb> break det_without_cut_1
0: + stop interface pred retry:det_without_cut_1/2-0 (det)
mdb> continue -a
2: 2 2 CALL pred retry:det_without_cut/2-0 (det)
3: 3 3 CALL pred retry:det_without_cut_1/2-0 (det)
mdb> disable 0
0: - stop interface pred retry:det_without_cut_1/2-0 (det)
mdb> retry
This command is a no-op from this port.
mdb> stack
0 pred retry:det_without_cut_1/2-0 (det)
1 pred retry:det_without_cut/2-0 (det)
2 pred retry:main/2-0 (det)
mdb> finish
6: 3 3 EXIT pred retry:det_without_cut_1/2-0 (det)
mdb> retry 1
2: 2 2 CALL pred retry:det_without_cut/2-0 (det)
mdb> stack
0 pred retry:det_without_cut/2-0 (det)
1 pred retry:main/2-0 (det)
mdb> break det_without_cut_2
1: + stop interface pred retry:det_without_cut_2/2-0 (det)
mdb> continue -a
3: 3 3 CALL pred retry:det_without_cut_1/2-0 (det)
4: 4 4 CALL pred retry:det_without_cut_2/2-0 (det)
mdb> delete *
0: D stop interface pred retry:det_without_cut_1/2-0 (det)
1: E stop interface pred retry:det_without_cut_2/2-0 (det)
mdb> retry 2
2: 2 2 CALL pred retry:det_without_cut/2-0 (det)
mdb> finish
7: 2 2 EXIT pred retry:det_without_cut/2-0 (det)
mdb> stack
0 pred retry:det_without_cut/2-0 (det)
1 pred retry:main/2-0 (det)
mdb> break det_with_cut_1
0: + stop interface pred retry:det_with_cut_1/2-0 (nondet)
mdb> continue -a
8: 5 2 CALL pred retry:det_with_cut/2-0 (det)
9: 6 3 CALL pred retry:det_with_cut_1/2-0 (nondet)
mdb> delete *
0: E stop interface pred retry:det_with_cut_1/2-0 (nondet)
mdb> finish
13: 6 3 EXIT pred retry:det_with_cut_1/2-0 (nondet)
mdb> retry 1
8: 5 2 CALL pred retry:det_with_cut/2-0 (det)
mdb> finish
15: 5 2 EXIT pred retry:det_with_cut/2-0 (det)
mdb> stack
0 pred retry:det_with_cut/2-0 (det)
1 pred retry:main/2-0 (det)
mdb> retry 1
1: 1 1 CALL pred retry:main/2-0 (det)
mdb> break det_with_cut_2
0: + stop interface pred retry:det_with_cut_2/2-0 (det)
mdb> continue -a
2: 2 2 CALL pred retry:det_without_cut/2-0 (det)
3: 3 3 CALL pred retry:det_without_cut_1/2-0 (det)
4: 4 4 CALL pred retry:det_without_cut_2/2-0 (det)
5: 4 4 EXIT pred retry:det_without_cut_2/2-0 (det)
6: 3 3 EXIT pred retry:det_without_cut_1/2-0 (det)
7: 2 2 EXIT pred retry:det_without_cut/2-0 (det)
8: 5 2 CALL pred retry:det_with_cut/2-0 (det)
9: 6 3 CALL pred retry:det_with_cut_1/2-0 (nondet)
10: 6 3 DISJ pred retry:det_with_cut_1/2-0 (nondet) c2;d1;
11: 7 4 CALL pred retry:det_with_cut_2/2-0 (det)
mdb> delete *
0: E stop interface pred retry:det_with_cut_2/2-0 (det)
mdb> break nondet
0: + stop interface pred retry:nondet/2-0 (multi)
mdb> continue
22: 11 3 CALL pred retry:nondet/2-0 (multi)
mdb> print *
HeadVar__1 4
mdb> break nondet_2
1: + stop interface pred retry:nondet_2/2-0 (det)
mdb> continue
26: 13 4 CALL pred retry:nondet_2/2-0 (det)
mdb> retry 1
22: 11 3 CALL pred retry:nondet/2-0 (multi)
mdb> print *
HeadVar__1 4
mdb> delete *
0: E stop interface pred retry:nondet/2-0 (multi)
1: E stop interface pred retry:nondet_2/2-0 (det)
mdb> break fib
0: + stop interface pred retry:fib/2-0 (det)
mdb> continue
6
4
9
40 41
50 51
125: 47 2 CALL pred retry:fib/2-0 (det)
mdb> print *
HeadVar__1 15
mdb> continue
129: 48 3 CALL pred retry:fib/2-0 (det)
mdb> print *
HeadVar__1 14
mdb> continue
133: 49 4 CALL pred retry:fib/2-0 (det)
mdb> continue
137: 50 5 CALL pred retry:fib/2-0 (det)
mdb> step
138: 50 5 ELSE pred retry:fib/2-0 (det) c3;e;
mdb> retry 2
129: 48 3 CALL pred retry:fib/2-0 (det)
mdb> print *
HeadVar__1 14
mdb> next
130: 48 3 ELSE pred retry:fib/2-0 (det) c3;e;
mdb> retry 1
125: 47 2 CALL pred retry:fib/2-0 (det)
mdb> finish
129: 48 3 CALL pred retry:fib/2-0 (det)
133: 49 4 CALL pred retry:fib/2-0 (det)
137: 50 5 CALL pred retry:fib/2-0 (det)
141: 51 6 CALL pred retry:fib/2-0 (det)
145: 52 7 CALL pred retry:fib/2-0 (det)
149: 53 8 CALL pred retry:fib/2-0 (det)
153: 54 9 CALL pred retry:fib/2-0 (det)
157: 55 10 CALL pred retry:fib/2-0 (det)
161: 56 11 CALL pred retry:fib/2-0 (det)
165: 57 12 CALL pred retry:fib/2-0 (det)
169: 58 13 CALL pred retry:fib/2-0 (det)
173: 59 14 CALL pred retry:fib/2-0 (det)
177: 60 15 CALL pred retry:fib/2-0 (det)
181: 61 16 CALL pred retry:fib/2-0 (det)
185: 61 16 EXIT pred retry:fib/2-0 (det)
186: 62 16 CALL pred retry:fib/2-0 (det)
190: 62 16 EXIT pred retry:fib/2-0 (det)
191: 60 15 EXIT pred retry:fib/2-0 (det)
192: 63 15 CALL pred retry:fib/2-0 (det)
194: 63 15 EXIT pred retry:fib/2-0 (det)
195: 59 14 EXIT pred retry:fib/2-0 (det)
196: 64 14 CALL pred retry:fib/2-0 (det)
198: 64 14 EXIT pred retry:fib/2-0 (det)
199: 58 13 EXIT pred retry:fib/2-0 (det)
200: 65 13 CALL pred retry:fib/2-0 (det)
202: 65 13 EXIT pred retry:fib/2-0 (det)
203: 57 12 EXIT pred retry:fib/2-0 (det)
204: 66 12 CALL pred retry:fib/2-0 (det)
206: 66 12 EXIT pred retry:fib/2-0 (det)
207: 56 11 EXIT pred retry:fib/2-0 (det)
208: 67 11 CALL pred retry:fib/2-0 (det)
210: 67 11 EXIT pred retry:fib/2-0 (det)
211: 55 10 EXIT pred retry:fib/2-0 (det)
212: 68 10 CALL pred retry:fib/2-0 (det)
214: 68 10 EXIT pred retry:fib/2-0 (det)
215: 54 9 EXIT pred retry:fib/2-0 (det)
216: 69 9 CALL pred retry:fib/2-0 (det)
218: 69 9 EXIT pred retry:fib/2-0 (det)
219: 53 8 EXIT pred retry:fib/2-0 (det)
220: 70 8 CALL pred retry:fib/2-0 (det)
222: 70 8 EXIT pred retry:fib/2-0 (det)
223: 52 7 EXIT pred retry:fib/2-0 (det)
224: 71 7 CALL pred retry:fib/2-0 (det)
226: 71 7 EXIT pred retry:fib/2-0 (det)
227: 51 6 EXIT pred retry:fib/2-0 (det)
228: 72 6 CALL pred retry:fib/2-0 (det)
230: 72 6 EXIT pred retry:fib/2-0 (det)
231: 50 5 EXIT pred retry:fib/2-0 (det)
232: 73 5 CALL pred retry:fib/2-0 (det)
234: 73 5 EXIT pred retry:fib/2-0 (det)
235: 49 4 EXIT pred retry:fib/2-0 (det)
236: 74 4 CALL pred retry:fib/2-0 (det)
238: 74 4 EXIT pred retry:fib/2-0 (det)
239: 48 3 EXIT pred retry:fib/2-0 (det)
240: 75 3 CALL pred retry:fib/2-0 (det)
242: 75 3 EXIT pred retry:fib/2-0 (det)
243: 47 2 EXIT pred retry:fib/2-0 (det)
mdb> continue -S
987
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to: mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions: mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------
More information about the developers
mailing list