[m-rev.] trivial diff: fix test cases after my last change

[Mark Brown]

Estimated hours taken: 0.5
Branches: main

Fix up a couple of test cases after my last change.

tests/debugger/declarative/dependency2.exp:
	The expected output for this test was built incorrectly.

tests/debugger/declarative/output_term_dep.exp:
tests/debugger/declarative/output_term_dep.exp2:
tests/debugger/declarative/output_term_dep.inp:
	In several places the declarative debugger finds a different bug
	to that expected, hence the finding of the expected bug is not
	tested.  We therefore modify the input slightly to ensure that
	the expected bug is tested, and modify the output accordingly.

Index: tests/debugger/declarative/dependency2.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/dependency2.exp,v
retrieving revision 1.1
diff -u -r1.1 dependency2.exp
--- tests/debugger/declarative/dependency2.exp	30 Apr 2002 07:08:02 -0000	1.1
+++ tests/debugger/declarative/dependency2.exp	30 Apr 2002 09:58:11 -0000
@@ -1,13 +1,13 @@
-       1:      1  1 CALL pred dependency:main/2-0 (cc_multi) dependency.m:11
+       1:      1  1 CALL pred dependency2:main/2-0 (cc_multi) dependency2.m:11
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
 mdb> break test
- 0: + stop  interface pred dependency:test/1-0 (cc_multi)
+ 0: + stop  interface pred dependency2:test/1-0 (cc_multi)
 mdb> continue
-       4:      3  2 CALL pred dependency:test/1-0 (cc_multi) dependency.m:19 (dependency.m:13)
+       4:      3  2 CALL pred dependency2:test/1-0 (cc_multi) dependency2.m:19 (dependency2.m:13)
 mdb> finish
-      18:      3  2 EXIT pred dependency:test/1-0 (cc_multi) dependency.m:19 (dependency.m:13)
+      18:      3  2 EXIT pred dependency2:test/1-0 (cc_multi) dependency2.m:19 (dependency2.m:13)
 mdb> dd
 test([1, 3, 6, 1, 3])
 Valid? browse 1
@@ -19,15 +19,15 @@
 browser> print
 [3, 4]
 browser> mark
-Origin: primitive_op("dependency.m", 29)
+Origin: primitive_op("dependency2.m", 29)
 p(1)
 Valid? yes
-Origin: primitive_op("dependency.m", 29)
+Origin: primitive_op("dependency2.m", 29)
 q(no)
 Valid? yes
 Found incorrect contour:
 test([1, 3, 6, 1, 3])
 Is this a bug? yes
-      18:      3  2 EXIT pred dependency:test/1-0 (cc_multi) dependency.m:19 (dependency.m:13)
+      18:      3  2 EXIT pred dependency2:test/1-0 (cc_multi) dependency2.m:19 (dependency2.m:13)
 mdb> continue
 [1, 3, 6, 1, 3].
Index: tests/debugger/declarative/output_term_dep.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/output_term_dep.exp,v
retrieving revision 1.2
diff -u -r1.2 output_term_dep.exp
--- tests/debugger/declarative/output_term_dep.exp	3 May 2001 07:26:04 -0000	1.2
+++ tests/debugger/declarative/output_term_dep.exp	30 Apr 2002 09:58:11 -0000
@@ -131,12 +131,8 @@
 Valid? browse 2
 browser> mark
 sa(7)
-Valid? no
-Found incorrect contour:
-sa(7)
-Is this a bug? yes
-      72:     26  4 EXIT pred output_term_dep:sa/1-0 (det)
-mdb> continue
+Valid? abort
+Diagnosis aborted.
       76:     25  3 EXIT pred output_term_dep:s/3-0 (nondet)
 mdb> continue
       79:     25  3 REDO pred output_term_dep:s/3-0 (nondet)
@@ -147,12 +143,8 @@
 Valid? browse 3
 browser> mark
 sc(155)
-Valid? no
-Found incorrect contour:
-sc(155)
-Is this a bug? yes
-      82:     29  4 EXIT pred output_term_dep:sc/1-0 (det)
-mdb> continue
+Valid? abort
+Diagnosis aborted.
       83:     25  3 EXIT pred output_term_dep:s/3-0 (nondet)
 mdb> continue
       86:     25  3 REDO pred output_term_dep:s/3-0 (nondet)
@@ -162,11 +154,9 @@
 s(1, 38, 7)
 Valid? browse 3
 browser> mark
-Found incorrect contour:
 sa(7)
-Is this a bug? yes
-      92:     32  4 EXIT pred output_term_dep:sa/1-0 (det)
-mdb> continue
+Valid? abort
+Diagnosis aborted.
       93:     25  3 EXIT pred output_term_dep:s/3-0 (nondet)
 mdb> continue
       96:     25  3 REDO pred output_term_dep:s/3-0 (nondet)
@@ -176,11 +166,9 @@
 s(1, 38, 155)
 Valid? browse 3
 browser> mark
-Found incorrect contour:
 sc(155)
-Is this a bug? yes
-      99:     34  4 EXIT pred output_term_dep:sc/1-0 (det)
-mdb> continue
+Valid? abort
+Diagnosis aborted.
      100:     25  3 EXIT pred output_term_dep:s/3-0 (nondet)
 mdb> continue
      103:     25  3 REDO pred output_term_dep:s/3-0 (nondet)
Index: tests/debugger/declarative/output_term_dep.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/output_term_dep.exp2,v
retrieving revision 1.2
diff -u -r1.2 output_term_dep.exp2
--- tests/debugger/declarative/output_term_dep.exp2	3 May 2001 07:26:05 -0000	1.2
+++ tests/debugger/declarative/output_term_dep.exp2	30 Apr 2002 09:58:12 -0000
@@ -131,12 +131,8 @@
 Valid? browse 2
 browser> mark
 sa(7)
-Valid? no
-Found incorrect contour:
-sa(7)
-Is this a bug? yes
-     104:     42  4 EXIT pred output_term_dep:sa/1-0 (det)
-mdb> continue
+Valid? abort
+Diagnosis aborted.
      108:     41  3 EXIT pred output_term_dep:s/3-0 (nondet)
 mdb> continue
      111:     41  3 REDO pred output_term_dep:s/3-0 (nondet)
@@ -147,12 +143,8 @@
 Valid? browse 3
 browser> mark
 sc(155)
-Valid? no
-Found incorrect contour:
-sc(155)
-Is this a bug? yes
-     114:     45  4 EXIT pred output_term_dep:sc/1-0 (det)
-mdb> continue
+Valid? abort
+Diagnosis aborted.
      115:     41  3 EXIT pred output_term_dep:s/3-0 (nondet)
 mdb> continue
      118:     41  3 REDO pred output_term_dep:s/3-0 (nondet)
@@ -162,11 +154,9 @@
 s(1, 38, 7)
 Valid? browse 3
 browser> mark
-Found incorrect contour:
 sa(7)
-Is this a bug? yes
-     124:     48  4 EXIT pred output_term_dep:sa/1-0 (det)
-mdb> continue
+Valid? abort
+Diagnosis aborted.
      125:     41  3 EXIT pred output_term_dep:s/3-0 (nondet)
 mdb> continue
      128:     41  3 REDO pred output_term_dep:s/3-0 (nondet)
@@ -176,11 +166,9 @@
 s(1, 38, 155)
 Valid? browse 3
 browser> mark
-Found incorrect contour:
 sc(155)
-Is this a bug? yes
-     131:     50  4 EXIT pred output_term_dep:sc/1-0 (det)
-mdb> continue
+Valid? abort
+Diagnosis aborted.
      132:     41  3 EXIT pred output_term_dep:s/3-0 (nondet)
 mdb> continue
      135:     41  3 REDO pred output_term_dep:s/3-0 (nondet)
Index: tests/debugger/declarative/output_term_dep.inp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/output_term_dep.inp,v
retrieving revision 1.2
diff -u -r1.2 output_term_dep.inp
--- tests/debugger/declarative/output_term_dep.inp	3 May 2001 07:26:05 -0000	1.2
+++ tests/debugger/declarative/output_term_dep.inp	30 Apr 2002 09:58:12 -0000
@@ -60,31 +60,25 @@
 dd
 browse 2
 mark
-no
-yes
-continue
+abort
 continue
 finish
 dd
 browse 3
 mark
-no
-yes
-continue
+abort
 continue
 finish
 dd
 browse 3
 mark
-yes
-continue
+abort
 continue
 finish
 dd
 browse 3
 mark
-yes
-continue
+abort
 continue
 finish
 continue
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------