[m-rev.] trivial diff: fix failure of valid/csharp_hello

[Julien Fischer]

Estimated hours taken: 0.1
Branches: main

Fix the failure of valid/csharp_hello.m in some grades.

tests/valid/Mercury.options:
 	For the tests that build .il files make sure that we reset all of
 	the grade components rather than target.

 	Delete some residual aditi stuff.

Julien.

Index: Mercury.options
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/valid/Mercury.options,v
retrieving revision 1.32
diff -u -r1.32 Mercury.options
--- Mercury.options	4 May 2006 08:34:56 -0000	1.32
+++ Mercury.options	20 Dec 2006 04:29:29 -0000
@@ -18,23 +18,13 @@
  GRADEFLAGS-agc_unbound_typevars	= --gc accurate
  GRADEFLAGS-agc_unbound_typevars2 = --gc accurate
  GRADEFLAGS-agc_unused_in	= --gc accurate
-GRADEFLAGS-csharp_hello		= --il
-GRADEFLAGS-foreign_type_spec	=  --il
-GRADEFLAGS-foreign_type_spec.foreign = --il
+GRADEFLAGS-csharp_hello		=  --grade il
+GRADEFLAGS-foreign_type_spec	=  --grade il
+GRADEFLAGS-foreign_type_spec.foreign = --grade il

-MCFLAGS-aditi_calls_mercury	= --aditi --aditi-calls-mercury
-MCFLAGS-aditi_error_bug		= --aditi
-MCFLAGS-aditi_error_bug2	= --aditi
-MCFLAGS-aditi_error_bug3	= --aditi
-MCFLAGS-aditi_private_builtin	= --allow-stubs
-MCFLAGS-aditi_query		= --aditi-only
-MCFLAGS-aditi_update		= --aditi
-MCFLAGS-base_relation2		= --aditi
-MCFLAGS-base_relation		= --aditi
  MCFLAGS-builtin_false		= --intermodule-optimization
  MCFLAGS-compl_unify_bug		= -O3
  MCFLAGS-constraint_prop_bug	= -O0 --common-struct --local-constraint-propagation
-MCFLAGS-context_anc		= --aditi
  MCFLAGS-deforest_bug		= -O3
  MCFLAGS-deforest_loop		= -O3 --intermodule-optimization
  MCFLAGS-deforest_rerun_det	= -O3 --check-termination
@@ -80,7 +70,6 @@
  MCFLAGS-intermod_user_equality	= --intermodule-optimization
  MCFLAGS-intermod_user_equality_nested2	= --intermodule-optimization
  MCFLAGS-intermod_user_equality_nested	= --intermodule-optimization
-MCFLAGS-ite_to_disj		= --aditi
  MCFLAGS-lambda_inference	= --infer-all
  MCFLAGS-livevals_seq		= -O5 --opt-space
  MCFLAGS-loop_inv_bug		= --common-struct --loop-invariants

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