[m-rev.] trivial diff: fix failure of debugger/declarative/condition_bug

[Julien Fischer]

Estimated hours taken: 0.1
Branches: main, release

Fix a failing test case.

tests/debugger/declarative/condition_bug.exp:
	Fix the expected output for this test case.  It has changed because
	the line numbers in the io module have changed (due to the removal of
	io.read_from_string_with_int_instead_of_char/6).

tests/debugger/declarative/Mmakefile:
	Avoid hard-coding dependencies on the line numbers in the standard
	library for this test case.

Julien.

Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/Mmakefile,v
retrieving revision 1.93
diff -u -r1.93 Mmakefile
--- Mmakefile	5 Jun 2006 07:03:00 -0000	1.93
+++ Mmakefile	27 Jun 2006 03:32:55 -0000
@@ -249,8 +249,12 @@
 	$(MDB) ./comp_gen < comp_gen.inp > comp_gen.out 2>&1 \
 	|| { grep . $@ /dev/null; exit 1; }

+# We need to pipe the output through sed to avoid hard-coding dependencies on
+# particular line numbers in the standard library source code.
 condition_bug.out: condition_bug condition_bug.inp
-	$(MDB_STD) ./condition_bug < condition_bug.inp \
+	$(MDB_STD) ./condition_bug < condition_bug.inp 2>&1 | \
+		sed -e 's/io.m:[0-9]*/io.m:NNNN/g' | \
+		sed -e 's/term_to_xml.m:[0-9]*/term_to_xml.m:NNNN/g' \
 		> condition_bug.out 2>&1 \
 	|| { grep . $@ /dev/null; exit 1; }

Index: condition_bug.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/condition_bug.exp,v
retrieving revision 1.3
diff -u -r1.3 condition_bug.exp
--- condition_bug.exp	30 Mar 2006 04:44:59 -0000	1.3
+++ condition_bug.exp	27 Jun 2006 04:04:05 -0000
@@ -13,9 +13,9 @@
 <?xml version="1.0"?>
 <translations>
 	<word>
-		<      E2:     C2 CALL pred io.write_string/3-0 (det) io.m:6327 (term_to_xml.m:1268)
+		<      E2:     C2 CALL pred io.write_string/3-0 (det) io.m:NNNN (term_to_xml.m:NNNN)
 mdb> finish
-english      E3:     C2 EXIT pred io.write_string/3-0 (det) io.m:6327 (term_to_xml.m:1268)
+english      E3:     C2 EXIT pred io.write_string/3-0 (det) io.m:NNNN (term_to_xml.m:NNNN)
 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:6327 (term_to_xml.m:1268)
+      E3:     C2 EXIT pred io.write_string/3-0 (det) io.m:NNNN (term_to_xml.m:NNNN)
 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
--------------------------------------------------------------------------