[m-rev.] diff: avoid running some tests in decldebug grades

[Julien Fischer]

Avoid running some tests in decldebug grades.

Fix an error message.

tests/valid/Mmake.valid.common:
tests/valid/Mmakefile:
tests/valid_seq/Mmakefile:
      Don't run valid/bug50 and valid/bug50_full in decldebug grades,
      since they force the use of --trace deep.

compiler/handle_options.m:
    Quote the trace level when referring to it in an error message.

    Fix an incorrect option name in an error message.

Julien.

diff --git a/compiler/handle_options.m b/compiler/handle_options.m
index eed4d5e..3793e98 100644
--- a/compiler/handle_options.m
+++ b/compiler/handle_options.m
@@ -334,9 +334,9 @@ check_option_values(!OptionTable, Target, GC_Method, TagsMethod,
                  MaybeTraceLevel = no,
                  TraceLevel = trace_level_none,  % dummy
                  InconsistentTraceLevelSpec =
-                    [words("The specified trace level"), words(Trace),
+                    [words("The specified trace level"), quote(Trace),
                      words("is not compatible with the value of the"),
-                    quote("--decl_debug"), words("option."), nl],
+                    quote("--decl-debug"), words("option."), nl],
                  add_error(phase_options, InconsistentTraceLevelSpec, !Specs)
              )
          else
diff --git a/tests/valid/Mmake.valid.common b/tests/valid/Mmake.valid.common
index 96b9a49..62fdce6 100644
--- a/tests/valid/Mmake.valid.common
+++ b/tests/valid/Mmake.valid.common
@@ -46,6 +46,8 @@
  # CONSTRAINT_TYPECHECK_PROGS::
  #   Tests that use constraint based type checking.
  #   XXX These are never enabled.
+# NON_DECLDEBUG_PROGS::
+#   Test that do not work in .decldebug grades
  # OTHER_PROGS:
  #   All the other test cases.

@@ -111,10 +113,16 @@ else
  	PROGS6 = $(PROGS5)
  endif

-ifeq "$(filter java% csharp% il% erlang%,$(GRADE))" ""
-	OBJ_PROGS = $(PROGS6) $(RESERVE_TAG_PROGS)
+ifeq "$(findstring decldebug,$(GRADE))" ""
+	PROGS7 = $(PROGS6) $(NON_DECLDEBUG_PROGS)
  else
-	OBJ_PROGS = $(PROGS6)
+	PROGS7 = $(PROGS6)
+endif
+
+ifeq "$(filter java% csharp% erlang%,$(GRADE))" ""
+	OBJ_PROGS = $(PROGS7) $(RESERVE_TAG_PROGS)
+else
+	OBJ_PROGS = $(PROGS7)
  endif

  ifneq "$(findstring tsw,$(GRADE))$(findstring tsc,$(GRADE))" ""
diff --git a/tests/valid/Mmakefile b/tests/valid/Mmakefile
index 87f33e2..a18663f 100644
--- a/tests/valid/Mmakefile
+++ b/tests/valid/Mmakefile
@@ -257,8 +257,6 @@ DEEP_PROF_CAPABLE_PROGS = \
  	impure_detism

  LLDS_PROGS = \
-	bug50 \
-	bug50_full \
  	exists_cast_bug \
  	fzn_debug_abort \
  	liveness_disagree \
@@ -292,6 +290,13 @@ CONSTRAINT_TYPECHECK_PROGS = \
  	ambig_functor \
  	ambiguity_stress_test

+# bug50 and bug50_full are compiled with --trace deep and that
+# is not compatible with --decl-debug.
+#
+NON_DECLDEBUG_PROGS = \
+	bug50 \
+	bug50_full
+
  # XXX The mode system can't handle the following test cases yet:
  #	assoc_list_bug
  #	determinism
diff --git a/tests/valid_seq/Mmakefile b/tests/valid_seq/Mmakefile
index 29b7a87..4c5ee17 100644
--- a/tests/valid_seq/Mmakefile
+++ b/tests/valid_seq/Mmakefile
@@ -46,6 +46,8 @@ CONSTRAINT_TYPECHECK_PROGS = \
  	ambig_high_level \
  	ambig_pred

+NON_DECLDEBUG_PROGS =
+
  OTHER_PROGS = \
  	bug100 \
  	exported_foreign_type \