[m-rev.] diff: fix test case failures in decldebug grade

Julien Fischer juliensf at cs.mu.OZ.AU
Thu Mar 30 14:23:28 AEDT 2006
Previous message: [m-rev.] for review: don't touch mercury_conf.h
Next message: [m-rev.] for review: fix mdb "save" command
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Estimated hours taken: 0.5
Branches: main

Fix test case failures in the decldebug grade caused by recent library
changes.

tests/debugger/declarative/condition_bug.m:
	Import the pair module.

tests/declarative/typed_unify.m:
	Import the univ module.

tests/debugger/shallow.exp2:
tests/debugger/declarative/backtrack.exp:
tests/debugger/declarative/condition_bug.exp:
tests/debugger/declarative/ite_2.exp:
tests/debugger/declarative/priv_builtin_bug.exp:
tests/debugger/declarative/track_through_catch.exp:
tests/debugger/declarative/typed_unify.exp:
	Update the expected outputs for these test cases.

Julien.

Index: shallow.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/shallow.exp2,v
retrieving revision 1.6
diff -u -r1.6 shallow.exp2
--- shallow.exp2	17 Jan 2003 05:56:56 -0000	1.6
+++ shallow.exp2	30 Mar 2006 03:09:37 -0000
@@ -1,4 +1,4 @@
-       1:      1  1 CALL pred shallow.main/2-0 (cc_multi) shallow.m:18
+       1:      1  1 CALL pred shallow.main/2-0 (cc_multi) shallow.m:15
 mdb> echo on
 Command echo enabled.
 mdb> context before
Index: declarative/backtrack.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/backtrack.exp,v
retrieving revision 1.10
diff -u -r1.10 backtrack.exp
--- declarative/backtrack.exp	29 Mar 2006 00:57:45 -0000	1.10
+++ declarative/backtrack.exp	30 Mar 2006 03:15:32 -0000
@@ -7,7 +7,7 @@
 mdb> continue
        2:      2  2 CALL pred backtrack.p/2-0 (det) backtrack.m:16 (backtrack.m:10)
 mdb> finish
-      23:      2  2 EXIT pred backtrack.p/2-0 (det) backtrack.m:16 (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
-      23:      2  2 EXIT pred backtrack.p/2-0 (det) backtrack.m:16 (backtrack.m:10)
+      29:      2  2 EXIT pred backtrack.p/2-0 (det) backtrack.m:16 (backtrack.m:10)
 mdb> continue
 no
Index: declarative/condition_bug.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/condition_bug.exp,v
retrieving revision 1.2
diff -u -r1.2 condition_bug.exp
--- declarative/condition_bug.exp	25 Mar 2006 06:37:26 -0000	1.2
+++ declarative/condition_bug.exp	30 Mar 2006 03:16:51 -0000
@@ -13,9 +13,9 @@
 <?xml version="1.0"?>
 <translations>
 	<word>
-		<      E2:     C2 CALL pred io.write_string/3-0 (det) io.m:6326 (term_to_xml.m:1266)
+		<      E2:     C2 CALL pred io.write_string/3-0 (det) io.m:6327 (term_to_xml.m:1268)
 mdb> finish
-english      E3:     C2 EXIT pred io.write_string/3-0 (det) io.m:6326 (term_to_xml.m:1266)
+english      E3:     C2 EXIT pred io.write_string/3-0 (det) io.m:6327 (term_to_xml.m:1268)
 mdb> dd
 write_string("english", _, _)
 1 tabled IO action:
@@ -41,5 +41,5 @@
 to the subterm in the atom is 2/1/3/1/1.
 dd> quit
 Diagnosis aborted.
-      E3:     C2 EXIT pred io.write_string/3-0 (det) io.m:6326 (term_to_xml.m:1266)
+      E3:     C2 EXIT pred io.write_string/3-0 (det) io.m:6327 (term_to_xml.m:1268)
 mdb> quit -y
Index: declarative/condition_bug.m
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/condition_bug.m,v
retrieving revision 1.1
diff -u -r1.1 condition_bug.m
--- declarative/condition_bug.m	8 Feb 2006 21:54:31 -0000	1.1
+++ declarative/condition_bug.m	30 Mar 2006 03:16:11 -0000
@@ -9,7 +9,7 @@
 :- implementation.

 :- import_module list, int, string, map, svmap, term_to_xml, assoc_list,
-	std_util.
+	pair.

 main(!IO) :-
 	some [!Map] (
Index: declarative/ite_2.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/ite_2.exp,v
retrieving revision 1.8
diff -u -r1.8 ite_2.exp
--- declarative/ite_2.exp	29 Mar 2006 00:57:46 -0000	1.8
+++ declarative/ite_2.exp	30 Mar 2006 03:06:32 -0000
@@ -13,7 +13,7 @@
 mdb> continue
        2:      2  2 CALL pred ite_2.ite/3-0 (det) ite_2.m:21 (ite_2.m:9)
 mdb> finish
-      11:      2  2 EXIT pred ite_2.ite/3-0 (det) ite_2.m:21 (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
-      11:      2  2 EXIT pred ite_2.ite/3-0 (det) ite_2.m:21 (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
-      12:      6  2 CALL pred ite_2.ite/3-1 (multi) ite_2.m:21 (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
-      29:      6  2 EXIT pred ite_2.ite/3-1 (multi) ite_2.m:21 (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
-      29:      6  2 EXIT pred ite_2.ite/3-1 (multi) ite_2.m:21 (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: declarative/priv_builtin_bug.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/priv_builtin_bug.exp,v
retrieving revision 1.1
diff -u -r1.1 priv_builtin_bug.exp
--- declarative/priv_builtin_bug.exp	14 Jun 2005 08:15:06 -0000	1.1
+++ declarative/priv_builtin_bug.exp	30 Mar 2006 03:02:07 -0000
@@ -19,5 +19,5 @@
 Parent q(1, _)
 Call p(2, _)
 Is this a bug? y
-      E4:     C3 EXIT pred priv_builtin_bug.q/2-0 (det) priv_builtin_bug.m:26 (priv_builtin_bug.m:14)
+      E4:     C3 EXIT pred priv_builtin_bug.q/2-0 (det) priv_builtin_bug.m:20 (priv_builtin_bug.m:14)
 mdb> quit -y
Index: declarative/track_through_catch.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/track_through_catch.exp,v
retrieving revision 1.3
diff -u -r1.3 track_through_catch.exp
--- declarative/track_through_catch.exp	21 Mar 2006 02:14:25 -0000	1.3
+++ declarative/track_through_catch.exp	30 Mar 2006 03:12:56 -0000
@@ -25,25 +25,24 @@
  6: + stop  interface pred exception.try/2-1 (cc_multi)
  7: + stop  interface pred exception.try/2-0 (cc_multi)
 mdb> c
-      E2:     C2 CALL pred exception.try/2-0 (cc_multi) exception.m:472 (track_through_catch.m:15)
+      E2:     C2 CALL pred exception.try/2-0 (cc_multi) exception.m:480 (track_through_catch.m:15)
 mdb> f
-      E3:     C3 CALL pred exception.try/3-0 (cc_multi) exception.m:476 (exception.m:474)
-      E4:     C3 EXIT pred exception.try/3-0 (cc_multi) exception.m:476 (exception.m:474)
-      E5:     C2 EXIT pred exception.try/2-0 (cc_multi) exception.m:472 (track_through_catch.m:15)
+      E3:     C3 CALL pred exception.try/3-0 (cc_multi) exception.m:484 (exception.m:482)
+      E4:     C3 EXIT pred exception.try/3-0 (cc_multi) exception.m:484 (exception.m:482)
+      E5:     C2 EXIT pred exception.try/2-0 (cc_multi) exception.m:480 (track_through_catch.m:15)
 mdb> dd
 try(q(2), succeeded(2))
 Valid? b 2
 browser> cd 1
 browser> track
-succeeded(2)
-p(2)
+cc_multi_equal(succeeded(2), succeeded(2))
 Valid? info
-Context of current question : track_through_catch.m:21 (track_through_catch.m:14)
-Search mode                 : top down
+Context of current question : builtin.m:1061 (exception.m:488)
+Search mode                 : top down
 The current question was chosen because the marked subterm was bound by
-the unification inside the predicate track_through_catch.p/1
-(track_through_catch.m:21). The path to the subterm in the atom is 1.
+the foreign procedure call inside the predicate builtin.cc_multi_equal/2
+(builtin.m:1055). The path to the subterm in the atom is 2/1.
 dd> quit
 Diagnosis aborted.
-      E5:     C2 EXIT pred exception.try/2-0 (cc_multi) exception.m:472 (track_through_catch.m:15)
+      E5:     C2 EXIT pred exception.try/2-0 (cc_multi) exception.m:480 (track_through_catch.m:15)
 mdb> quit -y
Index: declarative/typed_unify.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/typed_unify.exp,v
retrieving revision 1.2
diff -u -r1.2 typed_unify.exp
--- declarative/typed_unify.exp	25 Mar 2006 06:37:26 -0000	1.2
+++ declarative/typed_unify.exp	30 Mar 2006 02:58:29 -0000
@@ -4,15 +4,15 @@
 mdb> table_io start
 I/O tabling started.
 mdb> step
-      E2:     C2 CALL func std_util.univ/1-1 (det) std_util.m:488 (typed_unify.m:14)
+      E2:     C2 CALL func univ.univ/1-1 (det) univ.m:98 (typed_unify.m:14)
 mdb> finish
-      E3:     C2 EXIT func std_util.univ/1-1 (det) std_util.m:488 (typed_unify.m:14)
+      E3:     C2 EXIT func univ.univ/1-1 (det) univ.m:98 (typed_unify.m:14)
 mdb> step
       E4:     C1 COND pred typed_unify.main/2-0 (det) c4;?; typed_unify.m:15
 mdb> step
-      E5:     C3 CALL pred std_util.type_to_univ/2-2 (semidet) std_util.m:512 (typed_unify.m:15)
+      E5:     C3 CALL pred univ.type_to_univ/2-2 (semidet) univ.m:116 (typed_unify.m:15)
 mdb> finish
-      E6:     C3 EXIT pred std_util.type_to_univ/2-2 (semidet) std_util.m:512 (typed_unify.m:15)
+      E6:     C3 EXIT pred univ.type_to_univ/2-2 (semidet) univ.m:116 (typed_unify.m:15)
 mdb> untrust 0
 mdb> dd
 type_to_univ(1, univ_cons(1))
@@ -21,12 +21,12 @@
 1
 type_to_univ(_, univ_cons(1))
 Valid? info
-Context of current question : std_util.m:506 (std_util.m:488)
-Search mode                 : top down
+Context of current question : univ.m:116 (univ.m:98)
+Search mode                 : top down
 The current question was chosen because the marked subterm was bound by
-the untraced call inside the predicate std_util.type_to_univ/2
-(std_util.m:508). The path to the subterm in the atom is 2/2.
+the untraced call inside the predicate univ.type_to_univ/2 (univ.m:118).
+The path to the subterm in the atom is 2/2.
 dd> quit
 Diagnosis aborted.
-      E6:     C3 EXIT pred std_util.type_to_univ/2-2 (semidet) std_util.m:512 (typed_unify.m:15)
+      E6:     C3 EXIT pred univ.type_to_univ/2-2 (semidet) univ.m:116 (typed_unify.m:15)
 mdb> quit -y
Index: declarative/typed_unify.m
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/typed_unify.m,v
retrieving revision 1.1
diff -u -r1.1 typed_unify.m
--- declarative/typed_unify.m	7 Dec 2005 16:07:17 -0000	1.1
+++ declarative/typed_unify.m	30 Mar 2006 02:57:25 -0000
@@ -8,7 +8,7 @@

 :- implementation.

-:- import_module std_util.
+:- import_module univ.

 main(!IO) :-
 	U = univ(1),
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------
Previous message: [m-rev.] for review: don't touch mercury_conf.h
Next message: [m-rev.] for review: fix mdb "save" command
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the reviews mailing list