[make] Do not use the interactive tool 'c' from make

2 files changed, 82 insertions, 9 deletions

diff --git a/lib/tools/src/make.erl b/lib/tools/src/make.erl
index ce30156db6..6554d338af 100644
--- a/lib/tools/src/make.erl
+++ b/lib/tools/src/make.erl
@@ -267,15 +267,47 @@ include_opt([]) ->
 
 recompile(File, true, _Load, _Opts) ->
     io:format("Out of date: ~ts\n",[File]);
-recompile(File, false, noload, Opts) ->
+recompile(File, false, Load, Opts) ->
     io:format("Recompile: ~ts\n",[File]),
-    compile:file(File, [report_errors, report_warnings, error_summary |Opts]);
-recompile(File, false, load, Opts) ->
-    io:format("Recompile: ~ts\n",[File]),
-    c:c(File, Opts);
-recompile(File, false, netload, Opts) ->
-    io:format("Recompile: ~ts\n",[File]),
-    c:nc(File, Opts).
+    case compile:file(File, [report_errors, report_warnings |Opts]) of
+        Ok when is_tuple(Ok), element(1,Ok)==ok ->
+            maybe_load(element(2,Ok), Load, Opts);
+        _Error ->
+            error
+    end.
+
+maybe_load(_Mod, noload, _Opts) ->
+    ok;
+maybe_load(Mod, Load, Opts) ->
+    %% We have compiled File with options Opts. Find out where the
+    %% output file went to, and load it.
+    case compile:output_generated(Opts) of
+	true ->
+            Dir = proplists:get_value(outdir,Opts,"."),
+            do_load(Dir, Mod, Load);
+	false ->
+	    io:format("** Warning: No object file created - nothing loaded **~n"),
+	    ok
+    end.
+
+do_load(Dir, Mod, load) ->
+    code:purge(Mod),
+    case code:load_abs(filename:join(Dir, Mod),Mod) of
+        {module,Mod} ->
+            {ok,Mod};
+        Other ->
+            Other
+    end;
+do_load(Dir, Mod, netload) ->
+    Obj = atom_to_list(Mod) ++ code:objfile_extension(),
+    Fname = filename:join(Dir, Obj),
+    case file:read_file(Fname) of
+        {ok,Bin} ->
+            rpc:eval_everywhere(code,load_binary,[Mod,Fname,Bin]),
+            {ok,Mod};
+        Other ->
+            Other
+    end.
 
 exists(File) ->
     case file:read_file_info(File) of
diff --git a/lib/tools/test/make_SUITE.erl b/lib/tools/test/make_SUITE.erl
index 2f6fe1c732..02da4f4ace 100644
--- a/lib/tools/test/make_SUITE.erl
+++ b/lib/tools/test/make_SUITE.erl
@@ -36,7 +36,7 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [make_all, make_files, recompile_on_changed_include,
+    [make_all, make_files, load, netload, recompile_on_changed_include,
      emake_opts, {group, otp_6057}].
 
 groups() -> 
@@ -55,6 +55,21 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     otp_6057_end(Config).
 
+init_per_testcase(_,Config) ->
+    Config.
+
+end_per_testcase(netload,_Config) ->
+    %% Stop slave - in case of failure
+    Nodes = nodes(),
+    case [N || N <- Nodes,
+               "make_SUITE_netload" == hd(string:lexemes(atom_to_list(N),"@"))] of
+        [Node] ->
+            ct_slave:stop(Node);
+        _ ->
+            ok
+    end;
+end_per_testcase(_,_Config) ->
+    ok.
 
 test_files() -> ["test1", "test2", "test3", "test4"].
 
@@ -83,6 +98,32 @@ make_files(Config) when is_list(Config) ->
     ensure_no_messages(),
     ok.
 
+load(Config) ->
+    Current = prepare_data_dir(Config),
+    code:purge(test1),
+    code:delete(test1),
+    false = code:is_loaded(test1),
+    up_to_date = make:files([test1], [load]),
+    {file,_} = code:is_loaded(test1),
+    file:set_cwd(Current),
+    ensure_no_messages(),
+    ok.
+
+netload(Config) ->
+    Current = prepare_data_dir(Config),
+    code:purge(test1),
+    code:delete(test1),
+    false = code:is_loaded(test1),
+    {ok,Node} = ct_slave:start(make_SUITE_netload),
+    up_to_date = make:files([test1], [netload]),
+    timer:sleep(1000), % async, so give some time
+    {file,F} = code:is_loaded(test1),
+    {file,F} = rpc:call(Node,code,is_loaded,[test1]),
+    ct_slave:stop(Node),
+    file:set_cwd(Current),
+    ensure_no_messages(),
+    ok.
+
 recompile_on_changed_include(Config) ->
     Current = prepare_data_dir(Config),