[m-rev.] trivial diff: fix failure of track_through_catch

[Julien Fischer]

Estimated hours taken: 0.5
Branches: main

Fix a failing test case.

tests/debugger/declarative/Mmakefile:
tests/debugger/declarative/track_through_catch.m:
 	This test case was failing because of recent changes to the
 	exception module.  Don't hardcode dependencies on line numbers
 	from the standard library for this test.

Julien.

Index: Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/debugger/declarative/Mmakefile,v
retrieving revision 1.97
diff -u -r1.97 Mmakefile
--- Mmakefile	6 Dec 2006 05:38:11 -0000	1.97
+++ Mmakefile	18 Jan 2007 07:41:37 -0000
@@ -454,9 +454,12 @@
  		priv_builtin_bug.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.
  track_through_catch.out: track_through_catch track_through_catch.inp
-	$(MDB_STD) ./track_through_catch < track_through_catch.inp > \
-		track_through_catch.out 2>&1 \
+	$(MDB_STD) ./track_through_catch < track_through_catch.inp 2>&1 | \
+		sed -e 's/exception.m:[0-9]*/exception.m:NNNN/g' \
+		> track_through_catch.out 2>&1 \
  	|| { grep . $@ /dev/null; exit 1; }

  typed_unify.out: typed_unify typed_unify.inp
Index: track_through_catch.exp
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/debugger/declarative/track_through_catch.exp,v
retrieving revision 1.7
diff -u -r1.7 track_through_catch.exp
--- track_through_catch.exp	16 Oct 2006 01:06:14 -0000	1.7
+++ track_through_catch.exp	18 Jan 2007 07:40:02 -0000
@@ -17,9 +17,9 @@
   2: + stop  interface pred exception.try/2-1 (cc_multi)
   3: + stop  interface pred exception.try/2-0 (cc_multi)
  mdb> c
-      E2:     C2 CALL pred exception.try/2-0 (cc_multi) exception.m:446 (track_through_catch.m:15)
+      E2:     C2 CALL pred exception.try/2-0 (cc_multi) exception.m:NNNN (track_through_catch.m:15)
  mdb> f
-      E3:     C2 EXIT pred exception.try/2-0 (cc_multi) exception.m:446 (track_through_catch.m:15)
+      E3:     C2 EXIT pred exception.try/2-0 (cc_multi) exception.m:NNNN (track_through_catch.m:15)
  mdb> dd
  try(q(2), succeeded(2))
  Valid? b 2
@@ -35,5 +35,5 @@
  (track_through_catch.m:21). The path to the subterm in the atom is 1.
  dd> quit
  Diagnosis aborted.
-      E3:     C2 EXIT pred exception.try/2-0 (cc_multi) exception.m:446 (track_through_catch.m:15)
+      E3:     C2 EXIT pred exception.try/2-0 (cc_multi) exception.m:NNNN (track_through_catch.m:15)
  mdb> quit -y

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------