1 files changed, 33 insertions, 11 deletions
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index 0dfa18490a..2cd75944f4 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -76,6 +76,9 @@ app_test(Config) when is_list(Config) ->
 
 file_1(Config) when is_list(Config) ->
     ?line Dog = test_server:timetrap(test_server:minutes(5)),
+
+    process_flag(trap_exit, true),
+
     ?line {Simple, Target} = files(Config, "file_1"),
     ?line {ok, Cwd} = file:get_cwd(),
     ?line ok = file:set_cwd(filename:dirname(Target)),
@@ -102,23 +105,36 @@ file_1(Config) when is_list(Config) ->
     %% Cleanup.
     ?line ok = file:delete(Target),
     ?line ok = file:del_dir(filename:dirname(Target)),
+
+    %% There should not be any messages in the messages.
+    receive
+	Any ->
+	    ?t:fail({unexpected,Any})
+    after 10 ->
+	    ok
+    end,
+
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
 forms_2(Config) when is_list(Config) ->
-  {ok, simple, Binary} = compile:forms([{attribute,1,module,simple}], [binary, {source,"/foo/bar"}]),
-  code:load_binary(simple, "/foo/bar", Binary),
-  Info = simple:module_info(compile),
+    Src = "/foo/bar",
+    AbsSrc = filename:absname(Src),
+    {ok,simple,Binary} = compile:forms([{attribute,1,module,simple}],
+				       [binary,{source,Src}]),
+    code:load_binary(simple, Src, Binary),
+    Info = simple:module_info(compile),
+
+    %% Test that the proper source is returned.
+    AbsSrc = proplists:get_value(source, Info),
 
-  %% Test proper source is returned.
-  "/foo/bar" = proplists:get_value(source, Info),
-  %% Ensure options is not polluted with the source.
-  [] = proplists:get_value(options, Info),
+    %% Ensure that the options are not polluted with 'source'.
+    [] = proplists:get_value(options, Info),
 
-  %% Cleanup.
-  true = code:delete(simple),
-  false = code:purge(simple),
-  ok.
+    %% Cleanup.
+    true = code:delete(simple),
+    false = code:purge(simple),
+    ok.
 
 module_mismatch(Config) when is_list(Config) ->
     ?line DataDir = ?config(data_dir, Config),
@@ -226,6 +242,12 @@ makedep(Config) when is_list(Config) ->
       [makedep,{makedep_output,Target}|IncludeOptions]),
     ?line {ok,Mf6} = file:read_file(Target),
     ?line BasicMf2 = makedep_canonicalize_result(Mf6, DataDir),
+    %% Rule with creating phony target.
+    ?line PhonyMfName = SimpleRootname ++ "-phony.mk",
+    ?line {ok,PhonyMf} = file:read_file(PhonyMfName),
+    ?line {ok,_,Mf7} = compile:file(Simple,
+      [binary,makedep,makedep_phony|IncludeOptions]),
+    ?line PhonyMf = makedep_canonicalize_result(Mf7, DataDir),
 
     ?line ok = file:delete(Target),
     ?line ok = file:del_dir(filename:dirname(Target)),