[m-rev.] diff: more work on test suite in non-C grades

[Julien Fischer]

Branches: 14.01, master


More work on running the test suite in non-C grades.

Mmake.workspace:
 	Do not set MLOBJS in the java and erlang grades.

tests/warnings/singleton_text.exp[234]:
tests/warnings/warn_succ_ind.exp[234]:
 	Update these expected outputs to conform to changes to both the file
 	generating the warning and also to the way the Mercury compiler prints
 	them.

Julien.

diff --git a/Mmake.workspace b/Mmake.workspace
index 0e557ed..1eae0fa 100644
--- a/Mmake.workspace
+++ b/Mmake.workspace
@@ -210,7 +210,7 @@ STATIC_TRACE_LIBS = $(TRACE_DIR)/lib$(TRACE_LIB_NAME).$A \
  endif
  endif
  endif
-ifeq ("$(filter csharp%,$(GRADE))","")
+ifeq ("$(filter csharp% erlang% java%,$(GRADE))","")
  MLOBJS += $(STATIC_TRACE_LIBS) $(STATIC_STD_LIBS) \
  		$(STATIC_RT_LIBS) $(STATIC_GC_LIBS)
  endif
diff --git a/tests/warnings/singleton_test.exp2 b/tests/warnings/singleton_test.exp2
index 7218b45..90a8553 100644
--- a/tests/warnings/singleton_test.exp2
+++ b/tests/warnings/singleton_test.exp2
@@ -12,13 +12,14 @@ singleton_test.m:030:   warning: variables `L1, L2' occur only once in this
  singleton_test.m:030:   scope.
  singleton_test.m:031: In clause for function `singleton_test.my_append_func'/2:
  singleton_test.m:031:   warning: variable `T' occurs only once in this scope.
-singleton_test.m:036: In the C# code for predicate `singleton_test.my_c_pred'/3:
-singleton_test.m:036:   warning: variable `Y' does not occur in the C# code.
-singleton_test.m:052: In the C# code for function `singleton_test.my_c_func'/2:
-singleton_test.m:052:   warning: variable `X' does not occur in the C# code.
-singleton_test.m:072: In the C# code for predicate
-singleton_test.m:072:   `singleton_test.c_hello_world/3':
-singleton_test.m:072:   warning: variable `Msg' does not occur in the C# code.
+singleton_test.m:037: In the C# code for predicate
+singleton_test.m:037:   `singleton_test.my_c_pred'/3:
+singleton_test.m:037:   warning: variable `Y' does not occur in the C# code.
+singleton_test.m:054: In the C# code for function `singleton_test.my_c_func'/2:
+singleton_test.m:054:   warning: variable `X' does not occur in the C# code.
+singleton_test.m:074: In the C# code for predicate
+singleton_test.m:074:   `singleton_test.c_hello_world'/3:
+singleton_test.m:074:   warning: variable `Msg' does not occur in the C# code.
  singleton_test.m:090: In clause for predicate `singleton_test.test_head'/6:
  singleton_test.m:090:   warning: variable `_D' occurs more than once in this
  singleton_test.m:090:   scope.
diff --git a/tests/warnings/singleton_test.exp3 b/tests/warnings/singleton_test.exp3
index bb51451..97bb11f 100644
--- a/tests/warnings/singleton_test.exp3
+++ b/tests/warnings/singleton_test.exp3
@@ -1,4 +1,4 @@
-singleton_test.m:008: In function `singleton_test.my_append_func'/2:
+singleton_test.m:008: In function `my_append_func'/2:
  singleton_test.m:008:   warning: unresolved polymorphism.
  singleton_test.m:008:   The variables with unbound types were:
  singleton_test.m:008:     L2: V_1
@@ -12,12 +12,16 @@ singleton_test.m:030:   warning: variables `L1, L2' occur only once in this
  singleton_test.m:030:   scope.
  singleton_test.m:031: In clause for function `singleton_test.my_append_func'/2:
  singleton_test.m:031:   warning: variable `T' occurs only once in this scope.
-singleton_test.m:040: In the Java code for predicate `singleton_test.my_c_pred'/3:
-singleton_test.m:040:   warning: variable `Y' does not occur in the Java code.
-singleton_test.m:056: In the Java code for function `singleton_test.my_c_func'/2:
-singleton_test.m:056:   warning: variable `X' does not occur in the Java code.
-singleton_test.m:077: In the Java code for predicate `singleton_test.c_hello_world'/3:
-singleton_test.m:077:   warning: variable `Msg' does not occur in the Java code.
+singleton_test.m:041: In the Java code for predicate
+singleton_test.m:041:   `singleton_test.my_c_pred'/3:
+singleton_test.m:041:   warning: variable `Y' does not occur in the Java code.
+singleton_test.m:058: In the Java code for function
+singleton_test.m:058:   `singleton_test.my_c_func'/2:
+singleton_test.m:058:   warning: variable `X' does not occur in the Java code.
+singleton_test.m:079: In the Java code for predicate
+singleton_test.m:079:   `singleton_test.c_hello_world'/3:
+singleton_test.m:079:   warning: variable `Msg' does not occur in the Java
+singleton_test.m:079:   code.
  singleton_test.m:090: In clause for predicate `singleton_test.test_head'/6:
  singleton_test.m:090:   warning: variable `_D' occurs more than once in this
  singleton_test.m:090:   scope.
diff --git a/tests/warnings/singleton_test.exp4 b/tests/warnings/singleton_test.exp4
index cea1f43..e0a556c 100644
--- a/tests/warnings/singleton_test.exp4
+++ b/tests/warnings/singleton_test.exp4
@@ -12,18 +12,18 @@ singleton_test.m:030:   warning: variables `L1, L2' occur only once in this
  singleton_test.m:030:   scope.
  singleton_test.m:031: In clause for function `singleton_test.my_append_func'/2:
  singleton_test.m:031:   warning: variable `T' occurs only once in this scope.
-singleton_test.m:044: In the Erlang code for predicate
-singleton_test.m:044:   `singleton_test.my_c_pred'/3:
-singleton_test.m:044:   warning: variable `Y' does not occur in the Erlang
-singleton_test.m:044:   code.
-singleton_test.m:060: In the Erlang code for function
-singleton_test.m:060:   `singleton_test.my_c_func'/2:
-singleton_test.m:060:   warning: variable `X' does not occur in the Erlang
-singleton_test.m:060:   code.
-singleton_test.m:082: In the Erlang code for predicate
-singleton_test.m:082:   `singleton_test.c_hello_world'/3:
-singleton_test.m:082:   warning: variable `Msg' does not occur in the Erlang
-singleton_test.m:082:   code.
+singleton_test.m:045: In the Erlang code for predicate
+singleton_test.m:045:   `singleton_test.my_c_pred'/3:
+singleton_test.m:045:   warning: variable `Y' does not occur in the Erlang
+singleton_test.m:045:   code.
+singleton_test.m:062: In the Erlang code for function
+singleton_test.m:062:   `singleton_test.my_c_func'/2:
+singleton_test.m:062:   warning: variable `X' does not occur in the Erlang
+singleton_test.m:062:   code.
+singleton_test.m:084: In the Erlang code for predicate
+singleton_test.m:084:   `singleton_test.c_hello_world'/3:
+singleton_test.m:084:   warning: variable `Msg' does not occur in the Erlang
+singleton_test.m:084:   code.
  singleton_test.m:090: In clause for predicate `singleton_test.test_head'/6:
  singleton_test.m:090:   warning: variable `_D' occurs more than once in this
  singleton_test.m:090:   scope.
diff --git a/tests/warnings/warn_succ_ind.exp2 b/tests/warnings/warn_succ_ind.exp2
index 30d234a..ec1fdbe 100644
--- a/tests/warnings/warn_succ_ind.exp2
+++ b/tests/warnings/warn_succ_ind.exp2
@@ -1,10 +1,10 @@
  warn_succ_ind.m:024: warning: the C# code for predicate `warn_succ_ind.foo'/2
-warn_succ_ind.m:024:   may set `SUCCESS_INDICATOR' , but it cannot fail.
+warn_succ_ind.m:024:   may set `SUCCESS_INDICATOR', but it cannot fail.
  warn_succ_ind.m:056: warning: the C# code for predicate `warn_succ_ind.foo2'/2
-warn_succ_ind.m:056:   may set `SUCCESS_INDICATOR' , but it cannot fail.
+warn_succ_ind.m:056:   may set `SUCCESS_INDICATOR', but it cannot fail.
  warn_succ_ind.m:087: warning: the C# code for predicate `warn_succ_ind.bar'/2
-warn_succ_ind.m:087:   does not appear to set `SUCCESS_INDICATOR' , but it can
+warn_succ_ind.m:087:   does not appear to set `SUCCESS_INDICATOR', but it can
  warn_succ_ind.m:087:   fail.
  warn_succ_ind.m:115: warning: the C# code for predicate `warn_succ_ind.bar2'/2
-warn_succ_ind.m:115:   does not appear to set `SUCCESS_INDICATOR' , but it can
+warn_succ_ind.m:115:   does not appear to set `SUCCESS_INDICATOR', but it can
  warn_succ_ind.m:115:   fail.
diff --git a/tests/warnings/warn_succ_ind.exp3 b/tests/warnings/warn_succ_ind.exp3
index e726cd4..597fee3 100644
--- a/tests/warnings/warn_succ_ind.exp3
+++ b/tests/warnings/warn_succ_ind.exp3
@@ -1,11 +1,11 @@
  warn_succ_ind.m:032: warning: the Java code for predicate `warn_succ_ind.foo'/2
-warn_succ_ind.m:032:   may set `SUCCESS_INDICATOR' , but it cannot fail.
+warn_succ_ind.m:032:   may set `SUCCESS_INDICATOR', but it cannot fail.
  warn_succ_ind.m:064: warning: the Java code for predicate
-warn_succ_ind.m:064:   `warn_succ_ind.foo2'/2 may set `SUCCESS_INDICATOR' , but
+warn_succ_ind.m:064:   `warn_succ_ind.foo2'/2 may set `SUCCESS_INDICATOR', but
  warn_succ_ind.m:064:   it cannot fail.
  warn_succ_ind.m:094: warning: the Java code for predicate `warn_succ_ind.bar'/2
-warn_succ_ind.m:094:   does not appear to set `SUCCESS_INDICATOR' , but it can
+warn_succ_ind.m:094:   does not appear to set `SUCCESS_INDICATOR', but it can
  warn_succ_ind.m:094:   fail.
  warn_succ_ind.m:122: warning: the Java code for predicate
  warn_succ_ind.m:122:   `warn_succ_ind.bar2'/2 does not appear to set
-warn_succ_ind.m:122:   `SUCCESS_INDICATOR' , but it can fail.
+warn_succ_ind.m:122:   `SUCCESS_INDICATOR', but it can fail.
diff --git a/tests/warnings/warn_succ_ind.exp4 b/tests/warnings/warn_succ_ind.exp4
index 9960b48..28b351f 100644
--- a/tests/warnings/warn_succ_ind.exp4
+++ b/tests/warnings/warn_succ_ind.exp4
@@ -1,12 +1,12 @@
  warn_succ_ind.m:040: warning: the Erlang code for predicate
-warn_succ_ind.m:040:   `warn_succ_ind.foo'/2 may set `SUCCESS_INDICATOR' , but
+warn_succ_ind.m:040:   `warn_succ_ind.foo'/2 may set `SUCCESS_INDICATOR', but
  warn_succ_ind.m:040:   it cannot fail.
  warn_succ_ind.m:072: warning: the Erlang code for predicate
-warn_succ_ind.m:072:   `warn_succ_ind.foo2'/2 may set `SUCCESS_INDICATOR' , but
+warn_succ_ind.m:072:   `warn_succ_ind.foo2'/2 may set `SUCCESS_INDICATOR', but
  warn_succ_ind.m:072:   it cannot fail.
  warn_succ_ind.m:101: warning: the Erlang code for predicate
  warn_succ_ind.m:101:   `warn_succ_ind.bar'/2 does not appear to set
-warn_succ_ind.m:101:   `SUCCESS_INDICATOR' , but it can fail.
+warn_succ_ind.m:101:   `SUCCESS_INDICATOR', but it can fail.
  warn_succ_ind.m:129: warning: the Erlang code for predicate
  warn_succ_ind.m:129:   `warn_succ_ind.bar2'/2 does not appear to set
-warn_succ_ind.m:129:   `SUCCESS_INDICATOR' , but it can fail.
+warn_succ_ind.m:129:   `SUCCESS_INDICATOR', but it can fail.