Merge branch 'siri/make/default-outdir/ERL-438/OTP-14489' into maint-20

* siri/make/default-outdir/ERL-438/OTP-14489:
  [ct_make] Do not use the interactive tool 'c' from ct_make
  Use current dir as default outdir for c:c/1,2
  [make] Do not use the interactive tool 'c' from make

5 files changed, 174 insertions, 20 deletions

diff --git a/lib/common_test/src/ct_make.erl b/lib/common_test/src/ct_make.erl
index 4d66796b83..220cb0473d 100644
--- a/lib/common_test/src/ct_make.erl
+++ b/lib/common_test/src/ct_make.erl
@@ -280,15 +280,47 @@ recompile(File, NoExec, Load, Opts) ->
 
 do_recompile(_File, true, _Load, _Opts) ->
     out_of_date;
-do_recompile(File, false, noload, Opts) ->
+do_recompile(File, false, Load, Opts) ->
     io:format("Recompile: ~ts\n",[File]),
-    compile:file(File, [report_errors, report_warnings, error_summary |Opts]);
-do_recompile(File, false, load, Opts) ->
-    io:format("Recompile: ~ts\n",[File]),
-    c:c(File, Opts);
-do_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/stdlib/src/c.erl b/lib/stdlib/src/c.erl
index 4ab9234b81..c04a201ce1 100644
--- a/lib/stdlib/src/c.erl
+++ b/lib/stdlib/src/c.erl
@@ -255,7 +255,7 @@ safe_recompile(File, Options, BeamFile) ->
 compile_and_load(File, Opts0) when is_list(Opts0) ->
     Opts = [report_errors, report_warnings
             | ensure_from(filename:extension(File),
-                          ensure_outdir(filename:dirname(File), Opts0))],
+                          ensure_outdir(".", Opts0))],
     case compile:file(File, Opts) of
 	{ok,Mod} ->				%Listing file.
 	    purge_and_load(Mod, File, Opts);
diff --git a/lib/stdlib/test/c_SUITE.erl b/lib/stdlib/test/c_SUITE.erl
index 4bd32a30f8..f01988478c 100644
--- a/lib/stdlib/test/c_SUITE.erl
+++ b/lib/stdlib/test/c_SUITE.erl
@@ -21,7 +21,9 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2]).
 -export([c_1/1, c_2/1, c_3/1, c_4/1, nc_1/1, nc_2/1, nc_3/1, nc_4/1,
-	 ls/1, memory/1]).
+	 c_default_outdir_1/1, c_default_outdir_2/1,
+         nc_default_outdir_1/1, nc_default_outdir_2/1,
+         ls/1, memory/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
@@ -30,7 +32,10 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [c_1, c_2, c_3, c_4, nc_1, nc_2, nc_3, nc_4, ls, memory].
+    [c_1, c_2, c_3, c_4, nc_1, nc_2, nc_3, nc_4,
+     c_default_outdir_1, c_default_outdir_2,
+     nc_default_outdir_1, nc_default_outdir_2,
+     ls, memory].
 
 groups() -> 
     [].
@@ -124,6 +129,50 @@ nc_4(Config) when is_list(Config) ->
     Result = nc(R,[{outdir,W}]),
     {ok, m} = Result.
 
+c_default_outdir_1(Config) ->
+    R = filename:join(proplists:get_value(data_dir, Config), "m.erl"),
+    W = proplists:get_value(priv_dir, Config),
+    file:set_cwd(W),
+    Obj = "m" ++ code:objfile_extension(),
+    _ = file:delete(Obj),
+    false = filelib:is_file(Obj),
+    Result = c:c(R),
+    {ok, m} = Result,
+    true = filelib:is_file(Obj).
+
+c_default_outdir_2(Config) ->
+    R = filename:join(proplists:get_value(data_dir, Config), "m"),
+    W = proplists:get_value(priv_dir, Config),
+    file:set_cwd(W),
+    Obj = "m" ++ code:objfile_extension(),
+    _ = file:delete(Obj),
+    false = filelib:is_file(Obj),
+    Result = c:c(R),
+    {ok, m} = Result,
+    true = filelib:is_file(Obj).
+
+nc_default_outdir_1(Config) ->
+    R = filename:join(proplists:get_value(data_dir, Config), "m.erl"),
+    W = proplists:get_value(priv_dir, Config),
+    file:set_cwd(W),
+    Obj = "m" ++ code:objfile_extension(),
+    _ = file:delete(Obj),
+    false = filelib:is_file(Obj),
+    Result = c:nc(R),
+    {ok, m} = Result,
+    true = filelib:is_file(Obj).
+
+nc_default_outdir_2(Config) ->
+    R = filename:join(proplists:get_value(data_dir, Config), "m"),
+    W = proplists:get_value(priv_dir, Config),
+    file:set_cwd(W),
+    Obj = "m" ++ code:objfile_extension(),
+    _ = file:delete(Obj),
+    false = filelib:is_file(Obj),
+    Result = c:nc(R),
+    {ok, m} = Result,
+    true = filelib:is_file(Obj).
+
 ls(Config) when is_list(Config) ->
     Directory = proplists:get_value(data_dir, Config),
     ok = c:ls(Directory),
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),