[m-rev.] for review: fix two failing decldebug tests

[Ian MacLarty]

For review by anyone.

Estimated hours taken: 0.5
Branches: main

Fix two failing test cases in the debug grades.  New expected output files
are needed because there are extra atoms in the contours in the decldebug grade
and the contours are now printed.  I created these earlier, but must have 
not cvs added them.

tests/debugger/declarative/inadmissible.exp2
	Extra atom in buggy contour.

tests/debugger/declarative/find_origin.exp3
	This is the same as the old exp2 file before the contours were
	printed.  The old exp2 file was replaced with a slightly different
	version of the exp file which had different atoms in the contour in
	the debug grade.  This expected output is for the decldebug grade,
	where sub-term dependency tracking produces different (better) results.
	
Index: tests/debugger/declarative/find_origin.exp3
===================================================================
RCS file: tests/debugger/declarative/find_origin.exp3
diff -N tests/debugger/declarative/find_origin.exp3
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/debugger/declarative/find_origin.exp3	11 Jan 2005 02:09:06 -0000
@@ -0,0 +1,55 @@
+      E1:     C1 CALL pred find_origin.main/2-0 (det) find_origin.m:26
+mdb> mdb> Contexts will not be printed.
+mdb> echo on
+Command echo enabled.
+mdb> step
+      E2:     C2 CALL pred find_origin.monotest/2-0 (det)
+mdb> finish
+      E3:     C2 EXIT pred find_origin.monotest/2-0 (det)
+mdb> dd
+monotest(t(101), 1)
+Valid? b 1
+browser> mark
+monotest1(t(101))
+Valid? n
+Found incorrect contour:
+monotest1(t(101))
+Is this a bug? y
+      E4:     C3 EXIT pred find_origin.monotest1/1-0 (det)
+mdb> break polytest
+ 0: + stop  interface pred find_origin.polytest/3-0 (det)
+mdb> c
+      E5:     C4 CALL pred find_origin.polytest/3-0 (det)
+mdb> f
+      E6:     C4 EXIT pred find_origin.polytest/3-0 (det)
+mdb> dd
+polytest("hello", u("hello"), 5)
+Valid? b 2
+browser> mark
+polytest1("hello", u("hello"))
+Valid? n
+Found incorrect contour:
+polytest1("hello", u("hello"))
+Is this a bug? y
+      E7:     C5 EXIT pred find_origin.polytest1/2-0 (det)
+mdb> c
+      E6:     C4 EXIT pred find_origin.polytest/3-0 (det)
+mdb> delete 0
+ 0: E stop  interface pred find_origin.polytest/3-0 (det)
+mdb> break tracetest
+ 0: + stop  interface pred find_origin.tracetest/2-0 (det)
+mdb> c
+      E8:     C6 CALL pred find_origin.tracetest/2-0 (det)
+mdb> f
+      E9:     C6 EXIT pred find_origin.tracetest/2-0 (det)
+mdb> dd
+tracetest(t(101), -2)
+Valid? b 1
+browser> mark
+tracetest1(t(101))
+Valid? n
+Found incorrect contour:
+tracetest1(t(101))
+Is this a bug? y
+     E10:     C7 EXIT pred find_origin.tracetest1/1-0 (det)
+mdb> quit -y
Index: tests/debugger/declarative/inadmissible.exp2
===================================================================
RCS file: tests/debugger/declarative/inadmissible.exp2
diff -N tests/debugger/declarative/inadmissible.exp2
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/debugger/declarative/inadmissible.exp2	11 Jan 2005 02:06:49 -0000
@@ -0,0 +1,43 @@
+      E1:     C1 CALL pred inadmissible.main/2-0 (det) inadmissible.m:13
+mdb> mdb> Contexts will not be printed.
+mdb> echo on
+Command echo enabled.
+mdb> break gtmax
+ 0: + stop  interface pred inadmissible.gtmax/2-0 (semidet)
+mdb> continue
+      E2:     C2 CALL pred inadmissible.gtmax/2-0 (semidet)
+mdb> finish
+      E3:     C2 EXIT pred inadmissible.gtmax/2-0 (semidet)
+mdb> dd
+gtmax(2, [2, 3, 1])
+Valid? no
+list_to_set([2, 3, 1], [2, 3, 1])
+Valid? yes
+oset_max([2, 3, 1], 1)
+Valid? inadmissible
+Found inadmissible call:
+Parent gtmax(2, [2, 3, 1])
+Call oset_max([2, 3, 1], _)
+Is this a bug? yes
+      E3:     C2 EXIT pred inadmissible.gtmax/2-0 (semidet)
+mdb> dd
+gtmax(2, [2, 3, 1])
+Valid? [no] 
+Found inadmissible call:
+Parent gtmax(2, [2, 3, 1])
+Call oset_max([2, 3, 1], _)
+Is this a bug? no
+gtmax(2, [2, 3, 1])
+Valid? [no] no
+list_to_set([2, 3, 1], [2, 3, 1])
+Valid? [yes] 
+oset_max([2, 3, 1], 1)
+Valid? [inadmissible] yes
+Found incorrect contour:
+list_to_set([2, 3, 1], [2, 3, 1])
+oset_max([2, 3, 1], 1)
+>(2, 1)
+gtmax(2, [2, 3, 1])
+Is this a bug? yes
+      E3:     C2 EXIT pred inadmissible.gtmax/2-0 (semidet)
+mdb> quit -y
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------