[m-dev.] trivial diff: fix tests/debugger/*.exp*
Fergus Henderson
fjh at cs.mu.OZ.AU
Sat Nov 20 12:03:12 AEDT 1999
Estimated hours taken: 0.25
tests/debugger/*.exp:
tests/debugger/*.exp2:
Update to reflect the results of my recent bug fixes.
Workspace: /home/hydra/public/test_mercury/test_dirs/hydra
Index: tests/debugger/breakpoints.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/debugger/breakpoints.exp,v
retrieving revision 1.2
diff -u -d -r1.2 breakpoints.exp
--- breakpoints.exp 1999/11/15 00:43:43 1.2
+++ breakpoints.exp 1999/11/19 22:31:51
@@ -38,7 +38,7 @@
mdb> continue
5: 4 3 CALL pred breakpoints:qperm/2-0 (nondet) breakpoints.m:45 (breakpoints.m:42)
mdb> continue
- 6: 4 3 SWTC pred breakpoints:qperm/2-0 (nondet) s1; breakpoints.m:47
+ 6: 4 3 SWTC pred breakpoints:qperm/2-0 (nondet) s1; breakpoints.m:46
mdb> finish -N
10: 6 4 CALL pred breakpoints:qperm/2-0 (nondet) breakpoints.m:45 (breakpoints.m:49)
mdb> finish -n
@@ -49,7 +49,8 @@
38: 15 3 CALL pred breakpoints:safe/1-0 (semidet) breakpoints.m:55 (breakpoints.m:43)
mdb> finish
40: 16 4 CALL pred breakpoints:nodiag/3-0 (semidet) breakpoints.m:60 (breakpoints.m:57)
- 44: 15 3 FAIL pred breakpoints:safe/1-0 (semidet) breakpoints.m:55
+ 43: 16 4 FAIL pred breakpoints:nodiag/3-0 (semidet) breakpoints.m:60 (breakpoints.m:57)
+ 44: 15 3 FAIL pred breakpoints:safe/1-0 (semidet) breakpoints.m:55 (breakpoints.m:43)
mdb> delete *
0: E stop interface pred breakpoints:nodiag/3-0 (semidet)
1: E stop interface pred breakpoints:qperm/2-0 (nondet)
Index: tests/debugger/debugger_regs.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/debugger/debugger_regs.exp,v
retrieving revision 1.10
diff -u -d -r1.10 debugger_regs.exp
--- debugger_regs.exp 1999/11/15 00:43:44 1.10
+++ debugger_regs.exp 1999/11/19 22:31:53
@@ -1,4 +1,4 @@
- 1: 1 1 CALL pred debugger_regs:main/2-0 (det) debugger_regs.m:32
+ 1: 1 1 CALL pred debugger_regs:main/2-0 (det) debugger_regs.m:19
mdb> echo on
Command echo enabled.
mdb>
Index: tests/debugger/implied_instance.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/debugger/implied_instance.exp,v
retrieving revision 1.6
diff -u -d -r1.6 implied_instance.exp
--- implied_instance.exp 1999/11/15 00:43:45 1.6
+++ implied_instance.exp 1999/11/19 22:31:54
@@ -1,4 +1,4 @@
- 1: 1 1 CALL pred implied_instance:main/2-0 (det) implied_instance.m:26
+ 1: 1 1 CALL pred implied_instance:main/2-0 (det) implied_instance.m:25
mdb> echo on
Command echo enabled.
mdb> register --quiet
Index: tests/debugger/queens.exp
===================================================================
RCS file: /home/staff/zs/imp/tests/debugger/queens.exp,v
retrieving revision 1.16
diff -u -d -r1.16 queens.exp
--- queens.exp 1999/11/15 00:43:48 1.16
+++ queens.exp 1999/11/19 22:31:57
@@ -12,7 +12,7 @@
mdb> print *
HeadVar__1 [1, 2, 3, 4, 5]
mdb>
- 4: 3 2 CALL pred queens:queen/2-0 (nondet) queens.m:42 (queens.m:15)
+ 4: 3 2 CALL pred queens:queen/2-0 (nondet) queens.m:41 (queens.m:15)
mdb> print *
HeadVar__1 [1, 2, 3, 4, 5]
mdb>
@@ -20,7 +20,7 @@
mdb> print *
HeadVar__1 [1, 2, 3, 4, 5]
mdb>
- 6: 4 3 SWTC pred queens:qperm/2-0 (nondet) s1; queens.m:47
+ 6: 4 3 SWTC pred queens:qperm/2-0 (nondet) s1; queens.m:46
mdb> print *
HeadVar__1 [1, 2, 3, 4, 5]
mdb>
@@ -82,7 +82,7 @@
mdb> print *
HeadVar__1 [2, 3, 4, 5]
mdb>
- 11: 6 4 SWTC queens.m:47
+ 11: 6 4 SWTC queens.m:46
pred queens:qperm/2-0 (nondet) s1;
mdb> print *
HeadVar__1 [2, 3, 4, 5]
@@ -107,7 +107,7 @@
15: 8 5 CALL queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
mdb> goto -a 20
- 16: 8 5 SWTC queens.m:47
+ 16: 8 5 SWTC queens.m:46
pred queens:qperm/2-0 (nondet) s1;
17: 9 6 CALL queens.m:51 (from queens.m:47)
pred queens:qdelete/3-0 (nondet)
@@ -131,7 +131,7 @@
mdb> print *
HeadVar__1 [4, 5]
mdb>
- 21: 10 6 SWTC queens.m:47
+ 21: 10 6 SWTC queens.m:46
pred queens:qperm/2-0 (nondet) s1;
mdb> retry
34: 10 6 EXIT queens.m:45 (from queens.m:49)
@@ -141,7 +141,7 @@
mdb> print *
HeadVar__1 [4, 5]
mdb> finish -a
- 21: 10 6 SWTC queens.m:47
+ 21: 10 6 SWTC queens.m:46
pred queens:qperm/2-0 (nondet) s1;
22: 11 7 CALL queens.m:51 (from queens.m:47)
pred queens:qdelete/3-0 (nondet)
@@ -151,7 +151,7 @@
pred queens:qdelete/3-0 (nondet)
25: 12 7 CALL queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
- 26: 12 7 SWTC queens.m:47
+ 26: 12 7 SWTC queens.m:46
pred queens:qperm/2-0 (nondet) s1;
27: 13 8 CALL queens.m:51 (from queens.m:47)
pred queens:qdelete/3-0 (nondet)
@@ -183,17 +183,17 @@
pred queens:qperm/2-0 (nondet)
38: 15 3 CALL queens.m:55 (from queens.m:43)
pred queens:safe/1-0 (semidet)
- 39: 15 3 SWTC queens.m:57
+ 39: 15 3 SWTC queens.m:56
pred queens:safe/1-0 (semidet) s1;
40: 16 4 CALL queens.m:60 (from queens.m:57)
pred queens:nodiag/3-0 (semidet)
- 41: 16 4 SWTC queens.m:62
+ 41: 16 4 SWTC queens.m:61
pred queens:nodiag/3-0 (semidet) s1;
42: 16 4 THEN queens.m:65
pred queens:nodiag/3-0 (semidet) s1;c4;t;
- 43: 16 4 FAIL queens.m:60
+ 43: 16 4 FAIL queens.m:60 (from queens.m:57)
pred queens:nodiag/3-0 (semidet)
- 44: 15 3 FAIL queens.m:55
+ 44: 15 3 FAIL queens.m:55 (from queens.m:43)
pred queens:safe/1-0 (semidet)
45: 4 3 REDO queens.m:45 (from queens.m:42)
pred queens:qperm/2-0 (nondet)
@@ -207,7 +207,7 @@
pred queens:qperm/2-0 (nondet)
50: 14 8 REDO queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
- 51: 14 8 FAIL queens.m:45
+ 51: 14 8 FAIL queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
52: 13 8 REDO queens.m:51 (from queens.m:47)
pred queens:qdelete/3-0 (nondet)
@@ -218,15 +218,15 @@
0: + stop interface pred queens:print_list/3-0 (det)
1: + stop interface pred queens:qdelete/3-0 (nondet)
mdb> step -aS 5
- 53: 13 8 DISJ queens.m:53
+ 53: 13 8 DISJ queens.m:52
pred queens:qdelete/3-0 (nondet) c2;d2;
54: 17 9 CALL queens.m:51 (from queens.m:53)
pred queens:qdelete/3-0 (nondet)
- 55: 17 9 FAIL queens.m:51
+ 55: 17 9 FAIL queens.m:51 (from queens.m:53)
pred queens:qdelete/3-0 (nondet)
- 56: 13 8 FAIL queens.m:51
+ 56: 13 8 FAIL queens.m:51 (from queens.m:47)
pred queens:qdelete/3-0 (nondet)
- 57: 12 7 FAIL queens.m:45
+ 57: 12 7 FAIL queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
mdb> disable 1
1: - stop interface pred queens:qdelete/3-0 (nondet)
@@ -279,13 +279,15 @@
pred queens:qperm/2-0 (nondet)
50: 14 8 REDO queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
- 53: 13 8 DISJ queens.m:53
+ 51: 14 8 FAIL queens.m:45 (from queens.m:49)
+ pred queens:qperm/2-0 (nondet)
+ 53: 13 8 DISJ queens.m:52
pred queens:qdelete/3-0 (nondet) c2;d2;
mdb> continue -n
- 64: 19 7 CALL queens.m:45 (from queens.m:49)
+ 57: 12 7 FAIL queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
mdb> continue -n
- 69: 21 8 CALL queens.m:45 (from queens.m:49)
+ 64: 19 7 CALL queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
mdb> continue -n -S
[1, 3, 5, 2, 4]
Index: tests/debugger/browser_test.exp2
===================================================================
RCS file: /home/staff/zs/imp/tests/debugger/browser_test.exp2,v
retrieving revision 1.2
diff -u -d -r1.2 browser_test.exp2
--- browser_test.exp2 1999/11/15 08:14:14 1.2
+++ browser_test.exp2 1999/11/19 22:31:51
@@ -1,8 +1,8 @@
- 1: 1 1 CALL pred browser_test:main/2-0 (det) browser_test.m:12
+ 1: 1 1 CALL pred browser_test:main/2-0 (det) browser_test.m:11
mdb> echo on
Command echo enabled.
mdb> goto 3
- 3: 2 2 EXIT pred browser_test:big_data/1-0 (det) browser_test.m:19 (browser_test.m:12)
+ 3: 2 2 EXIT pred browser_test:big_data/1-0 (det) browser_test.m:18 (browser_test.m:12)
mdb> print *
HeadVar__1 big(big(big(small, 1, small), 2, small), 3, big(big(small, 4, big/3), 6, small))
mdb> browse 1
@@ -80,9 +80,9 @@
browser> quit
mdb> retry
- 2: 2 2 CALL pred browser_test:big_data/1-0 (det) browser_test.m:19 (browser_test.m:12)
+ 2: 2 2 CALL pred browser_test:big_data/1-0 (det) browser_test.m:18 (browser_test.m:12)
mdb> continue -a
- 3: 2 2 EXIT pred browser_test:big_data/1-0 (det) browser_test.m:19 (browser_test.m:12)
+ 3: 2 2 EXIT pred browser_test:big_data/1-0 (det) browser_test.m:18 (browser_test.m:12)
4: 3 2 CALL pred io:print/3-0 (det) io.m:1785 (browser_test.m:13)
big(big(big(small, 1, small), 2, small), 3, big(big(small, 4, big(small, 5, small)), 6, small)) 5: 3 2 EXIT pred io:print/3-0 (det) io.m:1793 (browser_test.m:13)
6: 4 2 CALL pred io:write_string/3-0 (det) io.m:2837 (browser_test.m:14)
Index: tests/debugger/existential_type_classes.exp2
===================================================================
RCS file: /home/staff/zs/imp/tests/debugger/existential_type_classes.exp2,v
retrieving revision 1.7
diff -u -d -r1.7 existential_type_classes.exp2
--- existential_type_classes.exp2 1999/11/15 08:14:14 1.7
+++ existential_type_classes.exp2 1999/11/19 22:31:53
@@ -1,4 +1,4 @@
- 1: 1 1 CALL pred existential_type_classes:main/2-0 (det) existential_type_classes.m:57
+ 1: 1 1 CALL pred existential_type_classes:main/2-0 (det) existential_type_classes.m:49
mdb> echo on
Command echo enabled.
mdb> alias P print *
Index: tests/debugger/interpreter.exp2
===================================================================
RCS file: /home/staff/zs/imp/tests/debugger/interpreter.exp2,v
retrieving revision 1.9
diff -u -d -r1.9 interpreter.exp2
--- interpreter.exp2 1999/11/15 08:14:15 1.9
+++ interpreter.exp2 1999/11/19 22:31:55
@@ -1,4 +1,4 @@
- 1: 1 1 CALL pred interpreter:main/2-0 (det) interpreter.m:35
+ 1: 1 1 CALL pred interpreter:main/2-0 (det) interpreter.m:34
mdb> echo on
Command echo enabled.
mdb> context none
Index: tests/debugger/multi_parameter.exp2
===================================================================
RCS file: /home/staff/zs/imp/tests/debugger/multi_parameter.exp2,v
retrieving revision 1.7
diff -u -d -r1.7 multi_parameter.exp2
--- multi_parameter.exp2 1999/11/15 08:14:15 1.7
+++ multi_parameter.exp2 1999/11/19 22:31:56
@@ -1,4 +1,4 @@
- 1: 1 1 CALL pred multi_parameter:main/2-0 (det) multi_parameter.m:24
+ 1: 1 1 CALL pred multi_parameter:main/2-0 (det) multi_parameter.m:23
mdb> echo on
Command echo enabled.
mdb> context nextline
--
Fergus Henderson <fjh at cs.mu.oz.au> | "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh> | of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3 | -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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