[m-rev.] diff: fix failing debugger test cases

[Julien Fischer]

Estimated hours taken: 1
Branches: main, release

Fix some failing debugger test cases.  These were failing because the
expected outputs did not conform to the changes in r1.155 of
compiler/code_gen.m (which shifted the context of interface events from
the context of the body goal to the context of the first clause).

debugger/interactive.exp:
debugger/declarative/backtrack.exp2:
debugger/declarative/ite_2.exp2:
debugger/declarative/neg_conj.exp2:
debugger/declarative/negation.exp2:
	Update expected outputs for these test cases.

Julien.

(The following diff is against the 0.13 branch.)

Index: debugger/interactive.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/interactive.exp,v
retrieving revision 1.13
diff -u -r1.13 interactive.exp
--- debugger/interactive.exp	15 Sep 2005 05:36:27 -0000	1.13
+++ debugger/interactive.exp	7 May 2006 23:44:11 -0000
@@ -1,4 +1,4 @@
-       1:      1  1 CALL pred interactive.main/2-0 (cc_multi) interactive.m:21
+       1:      1  1 CALL pred interactive.main/2-0 (cc_multi) interactive.m:18
 mdb> echo on
 Command echo enabled.
 mdb> query interactive list
Index: debugger/declarative/backtrack.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/backtrack.exp2,v
retrieving revision 1.3
diff -u -r1.3 backtrack.exp2
--- debugger/declarative/backtrack.exp2	20 May 2005 05:40:20 -0000	1.3
+++ debugger/declarative/backtrack.exp2	8 May 2006 01:25:37 -0000
@@ -5,9 +5,9 @@
 mdb> break p
  0: + stop  interface pred backtrack.p/2-0 (det)
 mdb> continue
-       2:      2  2 CALL pred backtrack.p/2-0 (det) backtrack.m:24 (backtrack.m:10)
+       2:      2  2 CALL pred backtrack.p/2-0 (det) backtrack.m:16 (backtrack.m:10)
 mdb> finish
-      29:      2  2 EXIT pred backtrack.p/2-0 (det) backtrack.m:24 (backtrack.m:10)
+      29:      2  2 EXIT pred backtrack.p/2-0 (det) backtrack.m:16 (backtrack.m:10)
 mdb> dd -d 3 -n 7
 p(1, no)
 Valid? no
@@ -32,6 +32,6 @@
 Found incorrect contour:
 p(1, no)
 Is this a bug? yes
-      29:      2  2 EXIT pred backtrack.p/2-0 (det) backtrack.m:24 (backtrack.m:10)
+      29:      2  2 EXIT pred backtrack.p/2-0 (det) backtrack.m:16 (backtrack.m:10)
 mdb> continue
 no
Index: debugger/declarative/ite_2.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/ite_2.exp2,v
retrieving revision 1.5
diff -u -r1.5 ite_2.exp2
--- debugger/declarative/ite_2.exp2	20 May 2005 05:40:27 -0000	1.5
+++ debugger/declarative/ite_2.exp2	8 May 2006 01:28:23 -0000
@@ -11,9 +11,9 @@
  0: + stop  interface pred ite_2.ite/3-1 (multi)
  1: + stop  interface pred ite_2.ite/3-0 (det)
 mdb> continue
-       2:      2  2 CALL pred ite_2.ite/3-0 (det) ite_2.m:27 (ite_2.m:9)
+       2:      2  2 CALL pred ite_2.ite/3-0 (det) ite_2.m:21 (ite_2.m:9)
 mdb> finish
-      13:      2  2 EXIT pred ite_2.ite/3-0 (det) ite_2.m:27 (ite_2.m:9)
+      13:      2  2 EXIT pred ite_2.ite/3-0 (det) ite_2.m:21 (ite_2.m:9)
 mdb> dd -d 3 -n 7
 ite(a, 1, 1)
 Valid? no
@@ -27,11 +27,11 @@
 c(1, 1)
 ite(a, 1, 1)
 Is this a bug? yes
-      13:      2  2 EXIT pred ite_2.ite/3-0 (det) ite_2.m:27 (ite_2.m:9)
+      13:      2  2 EXIT pred ite_2.ite/3-0 (det) ite_2.m:21 (ite_2.m:9)
 mdb> continue
-      14:      7  2 CALL pred ite_2.ite/3-1 (multi) ite_2.m:27 (ite_2.m:10)
+      14:      7  2 CALL pred ite_2.ite/3-1 (multi) ite_2.m:21 (ite_2.m:10)
 mdb> finish
-      35:      7  2 EXIT pred ite_2.ite/3-1 (multi) ite_2.m:27 (ite_2.m:10)
+      35:      7  2 EXIT pred ite_2.ite/3-1 (multi) ite_2.m:21 (ite_2.m:10)
 mdb> dd -d 3 -n 7
 ite(b, 1, 1)
 Valid? no
@@ -50,7 +50,7 @@
 c(1, 1)
 ite(b, 1, 1)
 Is this a bug? yes
-      35:      7  2 EXIT pred ite_2.ite/3-1 (multi) ite_2.m:27 (ite_2.m:10)
+      35:      7  2 EXIT pred ite_2.ite/3-1 (multi) ite_2.m:21 (ite_2.m:10)
 mdb> continue
 ite(a, 1, 1).
 ite(b, 1, 1).
Index: debugger/declarative/neg_conj.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/neg_conj.exp2,v
retrieving revision 1.5
diff -u -r1.5 neg_conj.exp2
--- debugger/declarative/neg_conj.exp2	20 May 2005 05:40:27 -0000	1.5
+++ debugger/declarative/neg_conj.exp2	8 May 2006 01:29:57 -0000
@@ -1,13 +1,13 @@
-       1:      1  1 CALL pred neg_conj.main/2-0 (det) neg_conj.m:11
+       1:      1  1 CALL pred neg_conj.main/2-0 (det) neg_conj.m:8
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
 mdb> break p
  0: + stop  interface pred neg_conj.p/1-0 (semidet)
 mdb> continue
-       3:      2  2 CALL pred neg_conj.p/1-0 (semidet) neg_conj.m:19 (neg_conj.m:9)
+       3:      2  2 CALL pred neg_conj.p/1-0 (semidet) neg_conj.m:18 (neg_conj.m:9)
 mdb> finish
-      22:      2  2 EXIT pred neg_conj.p/1-0 (semidet) neg_conj.m:19 (neg_conj.m:9)
+      22:      2  2 EXIT pred neg_conj.p/1-0 (semidet) neg_conj.m:18 (neg_conj.m:9)
 mdb> dd -d 3 -n 7
 p(0)
 Valid? no
@@ -27,6 +27,6 @@
 Found incorrect contour:
 p(0)
 Is this a bug? yes
-      22:      2  2 EXIT pred neg_conj.p/1-0 (semidet) neg_conj.m:19 (neg_conj.m:9)
+      22:      2  2 EXIT pred neg_conj.p/1-0 (semidet) neg_conj.m:18 (neg_conj.m:9)
 mdb> continue
 yes.
Index: debugger/declarative/negation.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/negation.exp2,v
retrieving revision 1.4
diff -u -r1.4 negation.exp2
--- debugger/declarative/negation.exp2	20 May 2005 05:40:28 -0000	1.4
+++ debugger/declarative/negation.exp2	7 May 2006 23:48:50 -0000
@@ -5,9 +5,9 @@
 mdb> break p
  0: + stop  interface pred negation.p/2-0 (det)
 mdb> continue
-       2:      2  2 CALL pred negation.p/2-0 (det) negation.m:29 (negation.m:14)
+       2:      2  2 CALL pred negation.p/2-0 (det) negation.m:21 (negation.m:14)
 mdb> finish
-      39:      2  2 EXIT pred negation.p/2-0 (det) negation.m:29 (negation.m:14)
+      39:      2  2 EXIT pred negation.p/2-0 (det) negation.m:21 (negation.m:14)
 mdb> dd -d 3 -n 7
 p(1, 42)
 Valid? no
@@ -27,6 +27,6 @@
 Found incorrect contour:
 p(1, 42)
 Is this a bug? yes
-      39:      2  2 EXIT pred negation.p/2-0 (det) negation.m:29 (negation.m:14)
+      39:      2  2 EXIT pred negation.p/2-0 (det) negation.m:21 (negation.m:14)
 mdb> continue
 42
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------