[m-rev.] trivial diff: fix failing .decldebug testcases on swordfish

[Julien Fischer]

Estimated hours taken: 0.5
Branches: main

Fix some tests cases that were failing in the .decldebug grades.

tests/debugger/all_solutions.exp4:
tests/debugger/declarative/lpe_example.exp3:
tests/debugger/declarative/solns.exp3:
 	Conform to the recent change in library/mutvar.m (which is used
 	to implement builtin_aggregate/4.)

Julien.

Index: all_solutions.exp4
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/debugger/all_solutions.exp4,v
retrieving revision 1.2
diff -u -r1.2 all_solutions.exp4
--- all_solutions.exp4	24 Mar 2006 04:40:54 -0000	1.2
+++ all_solutions.exp4	5 Feb 2007 08:27:38 -0000
@@ -7,7 +7,7 @@
  mdb> break hello
   0: + stop  interface pred all_solutions.hello/1-0 (multi)
  mdb> continue
-      12:      8  5 CALL pred all_solutions.hello/1-0 (multi)
+      16:     10  5 CALL pred all_solutions.hello/1-0 (multi)
  mdb> stack
     0       pred all_solutions.hello/1-0 (multi)
     1       pred solutions.builtin_aggregate/4-0 (det)
Index: declarative/lpe_example.exp3
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/debugger/declarative/lpe_example.exp3,v
retrieving revision 1.3
diff -u -r1.3 lpe_example.exp3
--- declarative/lpe_example.exp3	20 May 2005 05:40:27 -0000	1.3
+++ declarative/lpe_example.exp3	5 Feb 2007 08:21:45 -0000
@@ -7,9 +7,9 @@
  mdb> break p
   0: + stop  interface pred lpe_example.p/2-0 (nondet)
  mdb> continue
-      12:      8  5 CALL pred lpe_example.p/2-0 (nondet)
+      16:     10  5 CALL pred lpe_example.p/2-0 (nondet)
  mdb> finish
-      22:      8  5 EXIT pred lpe_example.p/2-0 (nondet)
+      26:     10  5 EXIT pred lpe_example.p/2-0 (nondet)
  mdb> dd -d 3 -n 7
  p(1, 13)
  Valid? no
@@ -22,11 +22,11 @@
  r(3, 13)
  p(1, 13)
  Is this a bug? yes
-      22:      8  5 EXIT pred lpe_example.p/2-0 (nondet)
+      26:     10  5 EXIT pred lpe_example.p/2-0 (nondet)
  mdb> continue
-      39:      8  5 REDO pred lpe_example.p/2-0 (nondet)
+      43:     10  5 REDO pred lpe_example.p/2-0 (nondet)
  mdb> finish
-      45:      8  5 EXIT pred lpe_example.p/2-0 (nondet)
+      49:     10  5 EXIT pred lpe_example.p/2-0 (nondet)
  mdb> dd -d 3 -n 7
  p(1, 23)
  Valid? no
@@ -37,11 +37,11 @@
  r(3, 23)
  p(1, 23)
  Is this a bug? yes
-      45:      8  5 EXIT pred lpe_example.p/2-0 (nondet)
+      49:     10  5 EXIT pred lpe_example.p/2-0 (nondet)
  mdb> continue
-      62:      8  5 REDO pred lpe_example.p/2-0 (nondet)
+      66:     10  5 REDO pred lpe_example.p/2-0 (nondet)
  mdb> finish
-      66:      8  5 EXIT pred lpe_example.p/2-0 (nondet)
+      70:     10  5 EXIT pred lpe_example.p/2-0 (nondet)
  mdb> dd -d 3 -n 7
  p(1, 3)
  Valid? no
@@ -49,11 +49,11 @@
  q(3)
  p(1, 3)
  Is this a bug? yes
-      66:      8  5 EXIT pred lpe_example.p/2-0 (nondet)
+      70:     10  5 EXIT pred lpe_example.p/2-0 (nondet)
  mdb> continue
-      83:      8  5 REDO pred lpe_example.p/2-0 (nondet)
+      87:     10  5 REDO pred lpe_example.p/2-0 (nondet)
  mdb> finish
-      84:      8  5 FAIL pred lpe_example.p/2-0 (nondet)
+      88:     10  5 FAIL pred lpe_example.p/2-0 (nondet)
  mdb> dd -d 3 -n 7
  Call p(1, _)
  Solutions:
@@ -69,6 +69,6 @@
  Found partially uncovered atom:
  p(1, _)
  Is this a bug? yes
-      84:      8  5 FAIL pred lpe_example.p/2-0 (nondet)
+      88:     10  5 FAIL pred lpe_example.p/2-0 (nondet)
  mdb> continue
  [3, 13, 23]
Index: declarative/solns.exp3
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/debugger/declarative/solns.exp3,v
retrieving revision 1.1
diff -u -r1.1 solns.exp3
--- declarative/solns.exp3	24 Mar 2006 04:40:55 -0000	1.1
+++ declarative/solns.exp3	5 Feb 2007 08:23:41 -0000
@@ -13,7 +13,7 @@
  mdb> continue
         2:      2  2 CALL pred solns.p/2-0 (det)
  mdb> finish
-     233:      2  2 EXIT pred solns.p/2-0 (det)
+     237:      2  2 EXIT pred solns.p/2-0 (det)
  mdb> dd -d 3 -n 7
  p(1, [1, 2, 3])
  Valid? no
@@ -35,5 +35,5 @@
  solutions(q(1), [1, 2, 3])
  p(1, [1, 2, 3])
  Is this a bug? yes
-     233:      2  2 EXIT pred solns.p/2-0 (det)
+     237:      2  2 EXIT pred solns.p/2-0 (det)
  mdb> quit -y


--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------