[m-rev.] diff: fix failures in valid tests

[Julien Fischer]

Branches: main, 10.04

Fix three failures in the valid tests.

tests/valid/Mercury.options:
	The tests liveness_ite, livevars_shallow, and livevars_shallow2
	all force the grade to be set to "none".
	Disable --intermodule-optimization for these tests, otherwise the
	compiler halts with an error when it cannot find the .opt files
	in grade none.

Julien.

Index: Mercury.options
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/valid/Mercury.options,v
retrieving revision 1.64
diff -u -r1.64 Mercury.options
--- Mercury.options	4 Mar 2010 01:13:39 -0000	1.64
+++ Mercury.options	11 Mar 2010 06:23:56 -0000
@@ -97,10 +97,10 @@
 MCFLAGS-intermod_user_sharing	= --intermodule-optimization
 MCFLAGS-intermod_user_sharing_2	= --intermodule-optimization
 MCFLAGS-lambda_inference	= --infer-all
-MCFLAGS-liveness_ite     	= --grade none --trace shallow
+MCFLAGS-liveness_ite     	= --no-intermodule-optimization --grade none --trace shallow
 MCFLAGS-livevals_seq		= -O5 --opt-space
-MCFLAGS-livevars_shallow	= --grade none --trace shallow
-MCFLAGS-livevars_shallow2	= --grade none --trace shallow
+MCFLAGS-livevars_shallow	= --no-intermodule-optimization --grade none --trace shallow
+MCFLAGS-livevars_shallow2	= --no-intermodule-optimization --grade none --trace shallow
 MCFLAGS-lco_term		= --optimize-constructor-last-call
 MCFLAGS-loop_inv_bug		= --common-struct --loop-invariants
 MCFLAGS-mc_bag			= --prop-mode-constraints

--------------------------------------------------------------------------
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
--------------------------------------------------------------------------