[m-rev.] diff: cleanups for tests/hard_coded

Julien Fischer jfischer at opturion.com
Mon Jul 7 10:03:42 AEST 2014


Branches: 14.01, master


Cleanups for tests/hard_coded.

tests/hard_coded/Mmakefile:
 	Only run the target_mlobjs test case in C grades; directly linking
 	against an object file isn't possible in the non-C grades.

tests/hard_coded/Mercury.options:
 	Suppress irrelevant warnings generated by some tests.

tests/hard_coded/hash_init_bug.m:
 	Replace a call to an obsolete function.

Julien.

diff --git a/tests/hard_coded/Mercury.options b/tests/hard_coded/Mercury.options
index 962957b..4ef75e1 100644
--- a/tests/hard_coded/Mercury.options
+++ b/tests/hard_coded/Mercury.options
@@ -66,6 +66,10 @@ MCFLAGS-lco_no_inline	    =	--optimize-constructor-last-call --no-inline-builtin
  MCFLAGS-lco_pack_args	    =	--optimize-constructor-last-call
  MCFLAGS-lco_reorder	    =	--optimize-constructor-last-call
  MCFLAGS-lookup_switch_simple_non = --no-warn-det-decls-too-lax
+MCFLAGS-mode_check_clauses  =	--no-warn-det-decls-too-lax
+MCFLAGS-mode_choice	    =	--no-warn-det-decls-too-lax
+MCFLAGS-no_fully_strict	    =	--no-warn-det-decls-too-lax
+MCFLAGS-nullary_ho_func     =	--no-warn-unresolved-polymorphism
  MCFLAGS-opt_format          =	--optimize-format-calls
  MCFLAGS-pack_args_reuse     =	--structure-reuse
  MCFLAGS-reuse_double        =	--ctgc
@@ -73,6 +77,8 @@ MCFLAGS-reuse_ho            =	--ctgc --no-optimise-higher-order
  MCFLAGS-sharing_comb	    =	--ctgc --structure-sharing-widening 2
  MCFLAGS-simplify_multi_arm_switch = -O3
  MCFLAGS-string_substring    =	--no-warn-obsolete
+MCFLAGS-term_io_test        =	--no-warn-unresolved-polymorphism
+MCFLAGS-test_imported_no_tag = --no-warn-interface-imports
  MCFLAGS-type_info_const_inst	= --const-struct --optimise-constant-propagation
  MCFLAGS-uncond_reuse	    =	--ctgc
  MCFLAGS-uncond_reuse_bad    =	--ctgc
diff --git a/tests/hard_coded/Mmakefile b/tests/hard_coded/Mmakefile
index f04ac81..12ff867 100644
--- a/tests/hard_coded/Mmakefile
+++ b/tests/hard_coded/Mmakefile
@@ -301,7 +301,6 @@ ORDINARY_PROGS=	\
  	switch_detect \
  	system_sort \
  	tag_switch_dup_label \
-	target_mlobjs \
  	term_io_test \
  	term_to_univ_test \
  	test234_sorted_insert \
@@ -513,7 +512,8 @@ ifeq "$(filter il% csharp% java% erlang%,$(GRADE))" ""
  		factt_sort_test \
  		foreign_type_assertion \
  		pragma_export \
-		runtime_opt
+		runtime_opt \
+		target_mlobjs
  else
  	C_ONLY_PROGS =
  endif
diff --git a/tests/hard_coded/hash_init_bug.m b/tests/hard_coded/hash_init_bug.m
index 1fd452c..71c7a29 100644
--- a/tests/hard_coded/hash_init_bug.m
+++ b/tests/hard_coded/hash_init_bug.m
@@ -16,7 +16,7 @@ main(!IO) :-
  		sym_name_to_string(Name, ".", Str),
  		Hash = hash(Str)
  	),
-	HT0 = new(HashPred, 10, 0.8),
+	HT0 = init(HashPred, 10, 0.8),
  	build_table(entries, HT0, HT),
  	(
  		hash_table__search(HT,



More information about the reviews mailing list