Merge branch 'bjorn/compiler/coverage'

* bjorn/compiler/coverage:
  map_SUITE: Ensure recompilation when running cover
  Add beam_utils_SUITE to cover more lines in beam_utils
  beam_utils: Remove unreachable clauses in live_opt/4
  receive_SUITE: Cover handling of recv_mark & recv_set in beam_utils
  beam_validator_SUITE: Mend the compiler_bug/1 test case
  beam_clean: Remove handling of forgotten instructions
  compile_SUITE: Test the 'dialyzer' option

1 files changed, 10 insertions, 3 deletions

diff --git a/lib/compiler/test/beam_validator_SUITE.erl b/lib/compiler/test/beam_validator_SUITE.erl
index 626f89ba7a..27979647c6 100644
--- a/lib/compiler/test/beam_validator_SUITE.erl
+++ b/lib/compiler/test/beam_validator_SUITE.erl
@@ -96,9 +96,16 @@ do_beam_file(F) ->
 compiler_bug(Config) when is_list(Config) ->
     %% Check that the compiler returns an error if we try to
     %% assemble one of the bad '.S' files.
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, "stack"),
-    ?line error = compile:file(File, [asm,report_errors,binary,time]),
+    Data = ?config(data_dir, Config),
+    File = filename:join(Data, "compiler_bug"),
+    error = compile:file(File, [from_asm,report_errors,time]),
+
+    %% Make sure that the error was reported by
+    %% the beam_validator module.
+    {error,
+     [{"compiler_bug",
+       [{beam_validator,_}]}],
+     []} = compile:file(File, [from_asm,return_errors,time]),
     ok.
 
 %% The following code is stupid but it should compile.