[m-rev.] diff: more valid test case fixes

[Julien Fischer]

Branches: main, 10.04

More test case fixes in the valid tests.

tests/valid/Mercury.options:
	Compile a bunch of tests that force either the grade (or a component
	thereof) with --no-intermodule-optimization, since the necessary .opt
	files may not exist if the grade is not installed.  (None of the tests
	is checking for something that will be masked by
	--no-intermodule-optimization.)

Julien.

Index: Mercury.options
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/valid/Mercury.options,v
retrieving revision 1.65
diff -u -r1.65 Mercury.options
--- Mercury.options	11 Mar 2010 06:29:56 -0000	1.65
+++ Mercury.options	11 Mar 2010 07:02:10 -0000
@@ -43,6 +43,7 @@
 MCFLAGS-bug134                  = --no-static-ground-terms --no-optimize-dead-procs
 MCFLAGS-compl_unify_bug		= -O3
 MCFLAGS-constraint_prop_bug	= -O0 --common-struct --local-constraint-propagation
+MCFLAGS-csharp_hello		= --no-intermodule-optimization
 MCFLAGS-deforest_bug		= -O3
 MCFLAGS-deforest_loop		= -O3 --intermodule-optimization
 MCFLAGS-deforest_rerun_det	= -O3 --check-termination
@@ -52,12 +53,14 @@
 MCFLAGS-explicit_quant		= --halt-at-warn
 MCFLAGS-func_class		= --no-warn-nothing-exported
 MCFLAGS-foreign_underscore_var	= --halt-at-warn
+MCFLAGS-foreign_type_spec       = --no-intermodule-optimization
+MCFLAGS-foreign_type_spec.foreign_type = --no-intermodule-optimization
 MCFLAGS-fzn_debug_abort		= --trace rep
 MCFLAGS-higher_order4		= -O3
 MCFLAGS-higher_order_implied_mode = -O-1
 MCFLAGS-ho_and_type_spec_bug = -O4
 MCFLAGS-ho_and_type_spec_bug2 = -O3 --no-inlining
-MCFLAGS-impure_detism           = -O5 --deep-profiling
+MCFLAGS-impure_detism           = -O5 --deep-profiling --no-intermodule-optimization
 MCFLAGS-inhibit_warn_test       = --inhibit-warnings --halt-at-warn
 MCFLAGS-instmap_generic_failure	= --local-constraint-propagation
 MCFLAGS-intermod_bug_nested	= --intermodule-optimization
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------