[m-rev.] diff: fix failing test cases
Julien Fischer
juliensf at cs.mu.OZ.AU
Thu Mar 30 11:40:19 AEDT 2006
Estimated hours taken: 0.5
Branches: main
Fix a bunch of test cases that are failing in the debug or minimal model
grades either because of my recent change to the standard library or Zoltan's
recent change to the code generator.
tests/debugger/breakpoints.exp2:
tests/debugger/loopcheck2.exp2:
tests/debugger/queens.exp2:
Update the expected outputs for these test cases. (These are the
versions for the debug grades - the non-debug grade versions have
already been updated.)
tests/general/string_format/string_format_lib.m:
tests/hard_coded/one_member.m:
tests/tabling/consumer_in_solutions.m:
tests/tabling/rotate2.m:
tests/tabling/sg.m:
Conform to the recent break up of std_util.
Julien.
Index: debugger/breakpoints.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/breakpoints.exp2,v
retrieving revision 1.9
diff -u -r1.9 breakpoints.exp2
--- debugger/breakpoints.exp2 27 Jan 2005 06:17:37 -0000 1.9
+++ debugger/breakpoints.exp2 30 Mar 2006 00:32:37 -0000
@@ -1,4 +1,4 @@
- E1: C1 CALL pred breakpoints.main/2-0 (cc_multi) breakpoints.m:31
+ E1: C1 CALL pred breakpoints.main/2-0 (cc_multi) breakpoints.m:24
mdb> echo on
Command echo enabled.
mdb> register --quiet
Index: debugger/loopcheck.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/loopcheck.exp2,v
retrieving revision 1.11
diff -u -r1.11 loopcheck.exp2
--- debugger/loopcheck.exp2 31 May 2004 04:13:15 -0000 1.11
+++ debugger/loopcheck.exp2 30 Mar 2006 00:29:59 -0000
@@ -5,9 +5,9 @@
Contexts will be printed on the next line.
mdb> continue -a
2: 2 2 CALL pred loopcheck.loop/1-0 (det)
- loopcheck.m:21 (from loopcheck.m:14)
+ loopcheck.m:20 (from loopcheck.m:14)
3: 3 3 CALL pred loopcheck.loop/1-0 (det)
- loopcheck.m:21 (from loopcheck.m:21)
+ loopcheck.m:20 (from loopcheck.m:21)
4: 4 4 CALL pred require.error/1-0 (erroneous)
require.m:NNNN (from loopcheck.m:21)
5: 4 4 EXCP pred require.error/1-0 (erroneous)
Index: debugger/queens.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/queens.exp2,v
retrieving revision 1.12
diff -u -r1.12 queens.exp2
--- debugger/queens.exp2 11 Jul 2005 07:30:28 -0000 1.12
+++ debugger/queens.exp2 30 Mar 2006 00:28:57 -0000
@@ -1,4 +1,4 @@
- E1: C1 CALL pred queens.main/2-0 (cc_multi) queens.m:17
+ E1: C1 CALL pred queens.main/2-0 (cc_multi) queens.m:14
mdb> echo on
Command echo enabled.
mdb> register --quiet
@@ -364,12 +364,12 @@
0: + stop interface pred queens.main/2-0 (cc_multi)
mdb> continue -n
[1, 3, 5, 2, 4]
- E64: C1 EXIT queens.m:17
+ E64: C1 EXIT queens.m:14
pred queens.main/2-0 (cc_multi)
mdb> retry
Retry across I/O operations is not always safe.
Are you sure you want to do it? yes
- E1: C1 CALL queens.m:17
+ E1: C1 CALL queens.m:14
pred queens.main/2-0 (cc_multi)
mdb> continue -n -S
[1, 3, 5, 2, 4]
Index: general/string_format/string_format_lib.m
===================================================================
RCS file: /home/mercury1/repository/tests/general/string_format/string_format_lib.m,v
retrieving revision 1.2
diff -u -r1.2 string_format_lib.m
--- general/string_format/string_format_lib.m 29 Mar 2006 08:07:58 -0000 1.2
+++ general/string_format/string_format_lib.m 30 Mar 2006 00:21:38 -0000
@@ -28,7 +28,7 @@
:- implementation.
-:- import_module float, pair, maybe.
+:- import_module float, pair, maybe, solutions.
%-----------------------------------------------------------------------------%
Index: hard_coded/one_member.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/one_member.m,v
retrieving revision 1.1
diff -u -r1.1 one_member.m
--- hard_coded/one_member.m 21 Mar 2006 22:25:37 -0000 1.1
+++ hard_coded/one_member.m 30 Mar 2006 00:23:16 -0000
@@ -11,7 +11,7 @@
:- implementation.
:- import_module list.
-:- import_module std_util.
+:- import_module solutions.
:- type set_ctree234(T)
---> ct(int, set_tree234(T))
Index: tabling/consumer_in_solutions.m
===================================================================
RCS file: /home/mercury1/repository/tests/tabling/consumer_in_solutions.m,v
retrieving revision 1.2
diff -u -r1.2 consumer_in_solutions.m
--- tabling/consumer_in_solutions.m 31 May 2004 04:13:23 -0000 1.2
+++ tabling/consumer_in_solutions.m 30 Mar 2006 00:25:13 -0000
@@ -11,7 +11,7 @@
:- implementation.
:- import_module int, list.
-:- import_module std_util.
+:- import_module pair, solutions.
main(!IO) :-
solutions(q, Solns),
Index: tabling/rotate2.m
===================================================================
RCS file: /home/mercury1/repository/tests/tabling/rotate2.m,v
retrieving revision 1.1
diff -u -r1.1 rotate2.m
--- tabling/rotate2.m 21 Jun 2004 03:31:57 -0000 1.1
+++ tabling/rotate2.m 30 Mar 2006 00:25:59 -0000
@@ -11,7 +11,7 @@
:- implementation.
-:- import_module std_util, int, list, set.
+:- import_module maybe, int, list, set, solutions.
main(!IO) :-
testgroup(3, 2, !IO),
Index: tabling/sg.m
===================================================================
RCS file: /home/mercury1/repository/tests/tabling/sg.m,v
retrieving revision 1.4
diff -u -r1.4 sg.m
--- tabling/sg.m 31 May 2004 04:13:28 -0000 1.4
+++ tabling/sg.m 30 Mar 2006 00:26:41 -0000
@@ -10,7 +10,7 @@
:- implementation.
-:- import_module std_util, list.
+:- import_module pair, list, solutions.
main(!IO) :-
solutions(sg1, Solns1),
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------
More information about the reviews
mailing list