[m-rev.] For review: Fixed tests for asm_fast.gc.tr.debug
Ian MacLarty
maclarty at cs.mu.OZ.AU
Fri Jul 30 14:27:45 AEST 2004
For review by anyone.
Estimated hours taken: 1
Branches: main
Fixed tests failing in grade asm_fast.gc.tr.debug.
tests/debugger/print_table.exp2
Expected output when libraries compiled in debug grade. Since
solutions/2 generates events in this grade, the depth of events inside
a call to solutions/2 increases.
tests/debugger/retry.exp2
Amended with additional tests. These changes were previously applied
to retry.exp, but not retry.exp2.
Index: tests/debugger/print_table.exp2
===================================================================
RCS file: print_table.exp2
diff -N print_table.exp2
--- /dev/null Mon Dec 17 21:20:53 2001
+++ print_table.exp2 Wed Jul 28 19:25:49 2004
@@ -0,0 +1,398 @@
+ E1: C1 1 CALL pred print_table.main/2-0 (det) print_table.m:13
+mdb> echo on
+Command echo enabled.
+mdb> context none
+Contexts will not be printed.
+mdb> goal_paths off
+Goal path printing is now off.
+mdb> register --quiet
+mdb> b p
+ 0: + stop interface pred print_table.p/3-0 (det)
+mdb> c
+ E2: C2 2 CALL pred print_table.p/3-0 (det)
+mdb> f -n
+ E3: C2 2 EXIT pred print_table.p/3-0 (det)
+mdb> table p
+memo table for pred print_table.p/3-0 (det):
+<5, 0>: succeeded <0>
+<5, 1>: succeeded <5>
+<5, 2>: succeeded <15>
+<5, 3>: succeeded <30>
+<5, 4>: succeeded <50>
+<5, 5>: succeeded <75>
+end of table (6 entries)
+mdb> table p 5
+memo table for pred print_table.p/3-0 (det):
+<5, 0>: succeeded <0>
+<5, 1>: succeeded <5>
+<5, 2>: succeeded <15>
+<5, 3>: succeeded <30>
+<5, 4>: succeeded <50>
+<5, 5>: succeeded <75>
+end of table (6 entries)
+mdb> table p 5 2
+<5, 2>: succeeded <15>
+mdb> c
+ E4: C3 2 CALL pred print_table.p/3-0 (det)
+mdb> f -n
+ E5: C3 2 EXIT pred print_table.p/3-0 (det)
+mdb> table p
+memo table for pred print_table.p/3-0 (det):
+<4, 0>: succeeded <0>
+<4, 1>: succeeded <4>
+<4, 2>: succeeded <12>
+<4, 3>: succeeded <24>
+<5, 0>: succeeded <0>
+<5, 1>: succeeded <5>
+<5, 2>: succeeded <15>
+<5, 3>: succeeded <30>
+<5, 4>: succeeded <50>
+<5, 5>: succeeded <75>
+end of table (10 entries)
+mdb> table p 5
+memo table for pred print_table.p/3-0 (det):
+<5, 0>: succeeded <0>
+<5, 1>: succeeded <5>
+<5, 2>: succeeded <15>
+<5, 3>: succeeded <30>
+<5, 4>: succeeded <50>
+<5, 5>: succeeded <75>
+end of table (6 entries)
+mdb> table p 5 2
+<5, 2>: succeeded <15>
+mdb> table p 4
+memo table for pred print_table.p/3-0 (det):
+<4, 0>: succeeded <0>
+<4, 1>: succeeded <4>
+<4, 2>: succeeded <12>
+<4, 3>: succeeded <24>
+end of table (4 entries)
+mdb> table p 4 2
+<4, 2>: succeeded <12>
+mdb> c
+ E6: C4 2 CALL pred print_table.p/3-0 (det)
+mdb> f -n
+ E7: C4 2 EXIT pred print_table.p/3-0 (det)
+mdb> table p
+memo table for pred print_table.p/3-0 (det):
+<2, 0>: succeeded <0>
+<2, 1>: succeeded <2>
+<2, 2>: succeeded <6>
+<4, 0>: succeeded <0>
+<4, 1>: succeeded <4>
+<4, 2>: succeeded <12>
+<4, 3>: succeeded <24>
+<5, 0>: succeeded <0>
+<5, 1>: succeeded <5>
+<5, 2>: succeeded <15>
+<5, 3>: succeeded <30>
+<5, 4>: succeeded <50>
+<5, 5>: succeeded <75>
+end of table (13 entries)
+mdb> table p 5
+memo table for pred print_table.p/3-0 (det):
+<5, 0>: succeeded <0>
+<5, 1>: succeeded <5>
+<5, 2>: succeeded <15>
+<5, 3>: succeeded <30>
+<5, 4>: succeeded <50>
+<5, 5>: succeeded <75>
+end of table (6 entries)
+mdb> table p 5 2
+<5, 2>: succeeded <15>
+mdb> table p 4
+memo table for pred print_table.p/3-0 (det):
+<4, 0>: succeeded <0>
+<4, 1>: succeeded <4>
+<4, 2>: succeeded <12>
+<4, 3>: succeeded <24>
+end of table (4 entries)
+mdb> table p 2 1
+<2, 1>: succeeded <2>
+mdb> c
+ E8: C5 2 CALL pred print_table.p/3-0 (det)
+mdb> f -n
+ E9: C5 2 EXIT pred print_table.p/3-0 (det)
+mdb> table p
+memo table for pred print_table.p/3-0 (det):
+<1, 0>: succeeded <0>
+<2, 0>: succeeded <0>
+<2, 1>: succeeded <2>
+<2, 2>: succeeded <6>
+<4, 0>: succeeded <0>
+<4, 1>: succeeded <4>
+<4, 2>: succeeded <12>
+<4, 3>: succeeded <24>
+<5, 0>: succeeded <0>
+<5, 1>: succeeded <5>
+<5, 2>: succeeded <15>
+<5, 3>: succeeded <30>
+<5, 4>: succeeded <50>
+<5, 5>: succeeded <75>
+end of table (14 entries)
+mdb> table p 5
+memo table for pred print_table.p/3-0 (det):
+<5, 0>: succeeded <0>
+<5, 1>: succeeded <5>
+<5, 2>: succeeded <15>
+<5, 3>: succeeded <30>
+<5, 4>: succeeded <50>
+<5, 5>: succeeded <75>
+end of table (6 entries)
+mdb> table p 5 2
+<5, 2>: succeeded <15>
+mdb> table p 4
+memo table for pred print_table.p/3-0 (det):
+<4, 0>: succeeded <0>
+<4, 1>: succeeded <4>
+<4, 2>: succeeded <12>
+<4, 3>: succeeded <24>
+end of table (4 entries)
+mdb> table p 2 1
+<2, 1>: succeeded <2>
+mdb> table p 1 0
+<1, 0>: succeeded <0>
+mdb> delete 1
+mdb: break point #1 does not exist.
+mdb> b q
+ 1: + stop interface pred print_table.q/3-0 (semidet)
+mdb> c
+ E10: C6 2 CALL pred print_table.q/3-0 (semidet)
+mdb> f -n
+ E11: C6 2 EXIT pred print_table.q/3-0 (semidet)
+mdb> table q
+memo table for pred print_table.q/3-0 (semidet):
+<3, 0>: succeeded <0>
+<3, 1>: succeeded <3>
+<3, 2>: succeeded <9>
+end of table (3 entries)
+mdb> table q 3
+memo table for pred print_table.q/3-0 (semidet):
+<3, 0>: succeeded <0>
+<3, 1>: succeeded <3>
+<3, 2>: succeeded <9>
+end of table (3 entries)
+mdb> table q 3 2
+<3, 2>: succeeded <9>
+mdb> table q 4
+call table does not contain 4 in argument position 1.
+mdb> c
+ E12: C7 2 CALL pred print_table.q/3-0 (semidet)
+mdb> f -n
+ E13: C7 2 FAIL pred print_table.q/3-0 (semidet)
+mdb> table q
+memo table for pred print_table.q/3-0 (semidet):
+<3, 0>: succeeded <0>
+<3, 1>: succeeded <3>
+<3, 2>: succeeded <9>
+<4, 1>: failed
+<4, 2>: failed
+end of table (5 entries)
+mdb> table q 3
+memo table for pred print_table.q/3-0 (semidet):
+<3, 0>: succeeded <0>
+<3, 1>: succeeded <3>
+<3, 2>: succeeded <9>
+end of table (3 entries)
+mdb> table q 3 2
+<3, 2>: succeeded <9>
+mdb> table q 3 0
+<3, 0>: succeeded <0>
+mdb> table q 4 2
+<4, 2>: failed
+mdb> table q 4 1
+<4, 1>: failed
+mdb> table q 4 0
+call table does not contain 0 in argument position 2.
+mdb> delete 1
+ 1: E stop interface pred print_table.q/3-0 (semidet)
+mdb> b r
+ 1: + stop interface pred print_table.r/2-0 (det)
+mdb> c
+ E14: C8 2 CALL pred print_table.r/2-0 (det)
+mdb> table r
+memo table for pred print_table.r/2-0 (det):
+end of table (0 entries)
+mdb> s
+ E15: C8 2 COND pred print_table.r/2-0 (det)
+mdb> table r
+memo table for pred print_table.r/2-0 (det):
+<3>: working
+end of table (1 entry)
+mdb> table r 3
+<3>: working
+mdb> c
+ E16: C9 3 CALL pred print_table.r/2-0 (det)
+mdb> table r
+memo table for pred print_table.r/2-0 (det):
+<3>: working
+end of table (1 entry)
+mdb> f -n
+ E17: C9 3 EXIT pred print_table.r/2-0 (det)
+mdb> table r
+memo table for pred print_table.r/2-0 (det):
+<0>: succeeded <0>
+<1>: succeeded <1>
+<2>: succeeded <3>
+<3>: working
+end of table (4 entries)
+mdb> f -n 1
+ E18: C8 2 EXIT pred print_table.r/2-0 (det)
+mdb> table r
+memo table for pred print_table.r/2-0 (det):
+<0>: succeeded <0>
+<1>: succeeded <1>
+<2>: succeeded <3>
+<3>: succeeded <6>
+end of table (4 entries)
+mdb> delete 1
+ 1: E stop interface pred print_table.r/2-0 (det)
+mdb> b s
+ 1: + stop interface pred print_table.s/6-0 (det)
+mdb> c
+ E19: C10 2 CALL pred print_table.s/6-0 (det)
+mdb> table s
+memo table for pred print_table.s/6-0 (det):
+end of table (0 entries)
+mdb> f -n
+ E20: C10 2 EXIT pred print_table.s/6-0 (det)
+mdb> table s
+memo table for pred print_table.s/6-0 (det):
+<3.500000, 1, "abc", 1>: succeeded <"[3.5abc1]", 4.500000>
+end of table (1 entry)
+mdb> c
+ E21: C11 2 CALL pred print_table.s/6-0 (det)
+mdb> f -n
+ E22: C11 2 EXIT pred print_table.s/6-0 (det)
+mdb> table s
+memo table for pred print_table.s/6-0 (det):
+<3.500000, 1, "abc", 1>: succeeded <"[3.5abc1]", 4.500000>
+<3.500000, 2, "abc", 2>: succeeded <"[3.5abc2][3.5abc2]", 5.500000>
+end of table (2 entries)
+mdb> table s 3.5
+memo table for pred print_table.s/6-0 (det):
+<3.500000, 1, "abc", 1>: succeeded <"[3.5abc1]", 4.500000>
+<3.500000, 2, "abc", 2>: succeeded <"[3.5abc2][3.5abc2]", 5.500000>
+end of table (2 entries)
+mdb> table s 3.51
+call table does not contain 3.510000 in argument position 1.
+mdb> table s 3.5 1
+memo table for pred print_table.s/6-0 (det):
+<3.500000, 1, "abc", 1>: succeeded <"[3.5abc1]", 4.500000>
+end of table (1 entry)
+mdb> table s 3.5 1 abc
+memo table for pred print_table.s/6-0 (det):
+<3.500000, 1, "abc", 1>: succeeded <"[3.5abc1]", 4.500000>
+end of table (1 entry)
+mdb> c
+ E23: C12 2 CALL pred print_table.s/6-0 (det)
+mdb> f -n
+ E24: C12 2 EXIT pred print_table.s/6-0 (det)
+mdb> c
+ E25: C13 2 CALL pred print_table.s/6-0 (det)
+mdb> f -n
+ E26: C13 2 EXIT pred print_table.s/6-0 (det)
+mdb> c
+ E27: C14 2 CALL pred print_table.s/6-0 (det)
+mdb> f -n
+ E28: C14 2 EXIT pred print_table.s/6-0 (det)
+mdb> table s
+memo table for pred print_table.s/6-0 (det):
+<3.500000, 1, "abc", 1>: succeeded <"[3.5abc1]", 4.500000>
+<3.500000, 2, "abc", 2>: succeeded <"[3.5abc2][3.5abc2]", 5.500000>
+<3.500000, 2, "xyz", 3>: succeeded <"[3.5xyz2][3.5xyz2][3.5xyz2]", 6.500000>
+<3.500000, 2, "xyz", 4>: succeeded <"[3.5xyz2][3.5xyz2][3.5xyz2][3.5xyz2]", 7.500000>
+<9.200000, 2, "def", 5>: succeeded <"[9.2def2][9.2def2][9.2def2][9.2def2][9.2def2]", 14.200000>
+end of table (5 entries)
+mdb> table s 3.5
+memo table for pred print_table.s/6-0 (det):
+<3.500000, 1, "abc", 1>: succeeded <"[3.5abc1]", 4.500000>
+<3.500000, 2, "abc", 2>: succeeded <"[3.5abc2][3.5abc2]", 5.500000>
+<3.500000, 2, "xyz", 3>: succeeded <"[3.5xyz2][3.5xyz2][3.5xyz2]", 6.500000>
+<3.500000, 2, "xyz", 4>: succeeded <"[3.5xyz2][3.5xyz2][3.5xyz2][3.5xyz2]", 7.500000>
+end of table (4 entries)
+mdb> table s 3.51
+call table does not contain 3.510000 in argument position 1.
+mdb> table s 3.5 1
+memo table for pred print_table.s/6-0 (det):
+<3.500000, 1, "abc", 1>: succeeded <"[3.5abc1]", 4.500000>
+end of table (1 entry)
+mdb> table s 3.5 1 abc
+memo table for pred print_table.s/6-0 (det):
+<3.500000, 1, "abc", 1>: succeeded <"[3.5abc1]", 4.500000>
+end of table (1 entry)
+mdb> table s 3.5 2
+memo table for pred print_table.s/6-0 (det):
+<3.500000, 2, "abc", 2>: succeeded <"[3.5abc2][3.5abc2]", 5.500000>
+<3.500000, 2, "xyz", 3>: succeeded <"[3.5xyz2][3.5xyz2][3.5xyz2]", 6.500000>
+<3.500000, 2, "xyz", 4>: succeeded <"[3.5xyz2][3.5xyz2][3.5xyz2][3.5xyz2]", 7.500000>
+end of table (3 entries)
+mdb> table s 3.5 2 abc
+memo table for pred print_table.s/6-0 (det):
+<3.500000, 2, "abc", 2>: succeeded <"[3.5abc2][3.5abc2]", 5.500000>
+end of table (1 entry)
+mdb> table s 3.5 2 xyz
+memo table for pred print_table.s/6-0 (det):
+<3.500000, 2, "xyz", 3>: succeeded <"[3.5xyz2][3.5xyz2][3.5xyz2]", 6.500000>
+<3.500000, 2, "xyz", 4>: succeeded <"[3.5xyz2][3.5xyz2][3.5xyz2][3.5xyz2]", 7.500000>
+end of table (2 entries)
+mdb> table s 9.1 2 abc
+call table does not contain 9.100000 in argument position 1.
+mdb> table s 9.2 2 abc
+call table does not contain abc in argument position 3.
+mdb> table s 9.2 2 def
+memo table for pred print_table.s/6-0 (det):
+<9.200000, 2, "def", 5>: succeeded <"[9.2def2][9.2def2][9.2def2][9.2def2][9.2def2]", 14.200000>
+end of table (1 entry)
+mdb> table s 9.2 2 xyz
+call table does not contain xyz in argument position 3.
+mdb> delete 1
+ 1: E stop interface pred print_table.s/6-0 (det)
+mdb> b t
+ 1: + stop interface pred print_table.t/3-0 (nondet)
+mdb> c
+ E29: C15 3 CALL pred print_table.t/3-0 (nondet)
+mdb> table t
+memo table for pred print_table.t/3-0 (nondet):
+end of table (0 entries)
+mdb> s
+ E30: C15 3 DISJ pred print_table.t/3-0 (nondet)
+mdb> table t
+memo table for pred print_table.t/3-0 (nondet):
+<1, 2>: active
+end of table (1 entry)
+mdb> finish
+ E31: C15 3 EXIT pred print_table.t/3-0 (nondet)
+mdb> table t
+memo table for pred print_table.t/3-0 (nondet):
+<1, 2>: incomplete
+answer #1: <120>
+end of table (1 entry)
+mdb> delete 1
+ 1: E stop interface pred print_table.t/3-0 (nondet)
+mdb> b tdone
+ 1: + stop interface pred print_table.tdone/0-0 (det)
+mdb> c
+ E32: C16 2 CALL pred print_table.tdone/0-0 (det)
+mdb> table t
+memo table for pred print_table.t/3-0 (nondet):
+<1, 2>: complete
+answer #1: <120>
+answer #2: <210>
+<2, 2>: complete
+end of table (2 entries)
+mdb> c -S -n
+75
+24
+6
+0
+yes(9)
+no
+6
+[3.5abc1] 4.50000000000000
+[3.5abc2][3.5abc2] 5.50000000000000
+[3.5xyz2][3.5xyz2][3.5xyz2] 6.50000000000000
+[3.5xyz2][3.5xyz2][3.5xyz2][3.5xyz2] 7.50000000000000
+[9.2def2][9.2def2][9.2def2][9.2def2][9.2def2] 14.2000000000000
+[120, 210]
+[]
Index: tests/debugger/retry.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/retry.exp2,v
retrieving revision 1.9
diff -u -u -r1.9 retry.exp2
--- tests/debugger/retry.exp2 2004/06/07 09:07:22 1.9
+++ tests/debugger/retry.exp2 2004/07/28 09:25:49
@@ -134,5 +134,32 @@
E21: C12 2 CALL pred retry.fib/2-0 (det)
mdb> finish -n
E27: C12 2 EXIT pred retry.fib/2-0 (det)
-mdb> continue -n -S
+mdb> delete *
+ 0: E stop interface pred retry.fib/2-0 (det)
+mdb> break t
+ 0: + stop interface pred retry.t/3-0 (nondet)
+mdb> continue
987
+ E28: C16 3 CALL pred retry.t/3-0 (nondet)
+mdb> table t 1 2
+call table does not contain 1 in argument position 1.
+mdb> finish
+marker executed: t 1 2
+ E29: C16 3 EXIT pred retry.t/3-0 (nondet)
+mdb> table t 1 2
+<1, 2>: incomplete
+answer #1: <120>
+mdb> retry
+ E28: C16 3 CALL pred retry.t/3-0 (nondet)
+mdb> table t 1 2
+<1, 2>: inactive
+mdb> finish
+marker executed: t 1 2
+ E29: C16 3 EXIT pred retry.t/3-0 (nondet)
+mdb> table t 1 2
+<1, 2>: incomplete
+answer #1: <120>
+mdb> delete *
+ 0: E stop interface pred retry.t/3-0 (nondet)
+mdb> continue -n -S
+120 210
--------------------------------------------------------------------------
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