From f63d23c1c8d3d49c1c24ee53047b81d433b002a5 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Wed, 28 Jun 2017 17:41:36 +0200
Subject: Use current dir as default outdir for c:c/1,2

In OTP-20, c:c/1,2 started using the directory of the source file as
default output directory. For backwards compatibility reasons this is
now reversed so the current directory is used instead.
---
 lib/stdlib/src/c.erl        |  2 +-
 lib/stdlib/test/c_SUITE.erl | 53 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 52 insertions(+), 3 deletions(-)

(limited to 'lib/stdlib')

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),
-- 
cgit v1.2.3