[m-rev.] trivial diff: fix debugger test failures

[Simon Taylor]

Estimated hours taken: 0.1
Branches: main

tests/declarative/catch.exp2:
tests/declarative/ho5.exp2:
tests/declarative/solutions.exp2:
tests/declarative/solutions.inp2:
tests/declarative/throw.exp2:
	Fix test case failures in debugging grades (the differences
	were caused by `MCFLAGS-int = --trace deep' in the Mmake.params
	file in my workspace).

Index: declarative/catch.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/catch.exp2,v
retrieving revision 1.3
diff -u -u -r1.3 catch.exp2
--- declarative/catch.exp2	30 Jan 2003 05:59:27 -0000	1.3
+++ declarative/catch.exp2	4 Feb 2003 13:23:58 -0000
@@ -20,9 +20,9 @@
       13:      2  2 EXIT pred catch.p/2-0 (cc_multi) catch.m:18 (catch.m:9)
 mdb> continue
 exception(univ_cons("q: bad input"))
-     400:    174  2 CALL pred catch.p/2-0 (cc_multi) catch.m:18 (catch.m:12)
+      18:      9  2 CALL pred catch.p/2-0 (cc_multi) catch.m:18 (catch.m:12)
 mdb> finish
-     409:    174  2 EXIT pred catch.p/2-0 (cc_multi) catch.m:18 (catch.m:12)
+      27:      9  2 EXIT pred catch.p/2-0 (cc_multi) catch.m:18 (catch.m:12)
 mdb> dd
 p(2, succeeded(2))
 Valid? no
@@ -33,8 +33,8 @@
 Found incorrect contour:
 try(q(2), succeeded(2))
 Is this a bug? yes
-     408:    175  3 EXIT pred exception.try/2-0 (cc_multi) exception.m:321 (catch.m:19)
+      26:     10  3 EXIT pred exception.try/2-0 (cc_multi) exception.m:321 (catch.m:19)
 mdb> continue
-     409:    174  2 EXIT pred catch.p/2-0 (cc_multi) catch.m:18 (catch.m:12)
+      27:      9  2 EXIT pred catch.p/2-0 (cc_multi) catch.m:18 (catch.m:12)
 mdb> continue
 succeeded(2)
Index: declarative/ho5.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/ho5.exp2,v
retrieving revision 1.3
diff -u -u -r1.3 ho5.exp2
--- declarative/ho5.exp2	30 Jan 2003 05:59:28 -0000	1.3
+++ declarative/ho5.exp2	4 Feb 2003 13:25:01 -0000
@@ -24,9 +24,9 @@
       12:      3  3 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18 (exception.m:NNNN)
 mdb> continue
 exception(univ_cons('<<function>>'))
-     401:    175  3 CALL pred ho5.p/2-0 (det) ho5.m:18 (exception.m:NNNN)
+      19:     10  3 CALL pred ho5.p/2-0 (det) ho5.m:18 (exception.m:NNNN)
 mdb> finish
-     410:    175  3 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18 (exception.m:NNNN)
+      28:     10  3 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18 (exception.m:NNNN)
 mdb> dd
 Call p(2, _)
 Throws zero
@@ -37,6 +37,6 @@
 p(2, _)
 zero
 Is this a bug? yes
-     410:    175  3 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18 (exception.m:NNNN)
+      28:     10  3 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18 (exception.m:NNNN)
 mdb> continue
 exception(univ_cons('<<function>>'))
Index: declarative/solutions.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/solutions.exp2,v
retrieving revision 1.4
diff -u -u -r1.4 solutions.exp2
--- declarative/solutions.exp2	30 Jan 2003 05:59:28 -0000	1.4
+++ declarative/solutions.exp2	5 Feb 2003 02:57:00 -0000
@@ -7,7 +7,7 @@
 mdb> continue
        2:      2  2 CALL pred solutions.p/2-0 (det) solutions.m:15 (solutions.m:9)
 mdb> finish
-      61:      2  2 EXIT pred solutions.p/2-0 (det) solutions.m:15 (solutions.m:9)
+      17:      2  2 EXIT pred solutions.p/2-0 (det) solutions.m:15 (solutions.m:9)
 mdb> dd
 p(1, [1, 2, 3])
 Valid? no
@@ -25,33 +25,8 @@
 	q(1, 2)
 	q(1, 3)
 Complete? yes
-+(0, 1) = 1
-Valid? yes
-+(1, 1) = 2
-Valid? yes
-+(2, 1) = 3
-Valid? yes
->(3, 1)
-Valid? yes
-//(3, 2) = 1
-Valid? yes
->(1, 0)
-Valid? yes
--(1, 1) = 0
-Valid? yes
-Call >(1, 1)
-No solutions.
-Complete? yes
--(3, 1) = 2
-Valid? yes
->(2, 1)
-Valid? yes
-//(2, 2) = 1
-Valid? yes
--(2, 1) = 1
-Valid? yes
 Found incorrect contour:
 solutions(q(1), [1, 2, 3])
 Is this a bug? yes
-      60:      3  3 EXIT pred std_util.solutions/2-1 (det) std_util.m:NNNN (solutions.m:16)
+      16:      3  3 EXIT pred std_util.solutions/2-1 (det) std_util.m:NNNN (solutions.m:16)
 mdb> quit -y
Index: declarative/solutions.inp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/solutions.inp2,v
retrieving revision 1.2
diff -u -u -r1.2 solutions.inp2
--- declarative/solutions.inp2	30 Jan 2003 05:59:28 -0000	1.2
+++ declarative/solutions.inp2	5 Feb 2003 02:55:48 -0000
@@ -11,16 +11,4 @@
 yes
 yes
 yes
-yes
-yes
-yes
-yes
-yes
-yes
-yes
-yes
-yes
-yes
-yes
-yes
 quit -y
Index: declarative/throw.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/throw.exp2,v
retrieving revision 1.8
diff -u -u -r1.8 throw.exp2
--- declarative/throw.exp2	30 Jan 2003 05:59:28 -0000	1.8
+++ declarative/throw.exp2	4 Feb 2003 13:26:27 -0000
@@ -26,9 +26,9 @@
       56:      3  3 EXCP pred throw.p/1-0 (cc_nondet)
 mdb> continue
 exception(univ_cons("Too big"))
-     325:    137  3 CALL pred throw.q/1-0 (semidet) throw.m:48 (exception.m:NNNN)
+      63:     22  3 CALL pred throw.q/1-0 (semidet) throw.m:48 (exception.m:NNNN)
 mdb> finish
-     378:    137  3 EXCP pred throw.q/1-0 (semidet)
+     116:     22  3 EXCP pred throw.q/1-0 (semidet)
 mdb> dd
 Call q(_)
 Throws "Too big"
@@ -42,6 +42,6 @@
 q(_)
 "Too big"
 Is this a bug? yes
-     378:    137  3 EXCP pred throw.q/1-0 (semidet)
+     116:     22  3 EXCP pred throw.q/1-0 (semidet)
 mdb> continue
 exception(univ_cons("Too big"))
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------