[m-rev.] diff: fix tests/debugger/declarative/catch.exp2

[Fergus Henderson]

Estimated hours taken: 0.25
Branches: main
 
Fix a spurious test case failure which was triggered by Simon's recent
change to exception.m.

tests/debugger/declarative/Mmakefile:
tests/debugger/declarative/catch.exp2:
	Pipe the output for the `catch' test case through sed, to avoid
	hard-coding dependencies on line numbers for exception.m.

Workspace: /home/ceres/fjh/mercury
Index: tests/debugger/declarative/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/Mmakefile,v
retrieving revision 1.58
diff -u -d -u -r1.58 Mmakefile
--- tests/debugger/declarative/Mmakefile	30 May 2003 07:41:27 -0000	1.58
+++ tests/debugger/declarative/Mmakefile	24 Jul 2003 08:05:05 -0000
@@ -140,8 +140,12 @@
 browse_arg.out: browse_arg browse_arg.inp
 	$(MDB) ./browse_arg < browse_arg.inp > browse_arg.out 2>&1
 
+# We need to pipe the output through sed to avoid hard-coding dependencies on
+# particular line numbers in the standard library source code.
 catch.out: catch catch.$(INP)
-	$(MDB) ./catch < catch.$(INP) > catch.out 2>&1
+	$(MDB) ./catch < catch.$(INP) 2>&1 | \
+		sed -e 's/exception.m:[0-9]*/exception.m:NNNN/g' \
+		> catch.out 2>&1
 
 comp_gen.out: comp_gen comp_gen.inp
 	$(MDB) ./comp_gen < comp_gen.inp > comp_gen.out 2>&1
Index: tests/debugger/declarative/catch.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/catch.exp2,v
retrieving revision 1.4
diff -u -d -r1.4 catch.exp2
--- tests/debugger/declarative/catch.exp2	10 Feb 2003 11:59:23 -0000	1.4
+++ tests/debugger/declarative/catch.exp2	24 Jul 2003 08:05:32 -0000
@@ -33,7 +33,7 @@
 Found incorrect contour:
 try(q(2), succeeded(2))
 Is this a bug? yes
-      26:     10  3 EXIT pred exception.try/2-0 (cc_multi) exception.m:321 (catch.m:19)
+      26:     10  3 EXIT pred exception.try/2-0 (cc_multi) exception.m:NNNN (catch.m:19)
 mdb> continue
       27:      9  2 EXIT pred catch.p/2-0 (cc_multi) catch.m:18 (catch.m:12)
 mdb> continue

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------