aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-04-07 15:47:47 +0200
committerHenrik Nord <[email protected]>2011-04-07 15:48:00 +0200
commit4144043663ffe31742c1a7c3fe50135c8382db7c (patch)
treefe7ab39489bcdc9dffffbb49f1b720f924a1453d
parent67bea716bb708e9fe49d9934e656928f68b8f49f (diff)
parenteb02beb1c33fafb32e0596d947310d8c17e8bbf2 (diff)
downloadotp-4144043663ffe31742c1a7c3fe50135c8382db7c.tar.gz
otp-4144043663ffe31742c1a7c3fe50135c8382db7c.tar.bz2
otp-4144043663ffe31742c1a7c3fe50135c8382db7c.zip
Merge branch 'ts/cover-with-export_all' into dev
* ts/cover-with-export_all: add user specified compiler options on form reloading OTP-9204
-rw-r--r--lib/tools/src/cover.erl9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index 230f0e9428..73a736f0e8 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -253,6 +253,7 @@ compile_modules(Files,Options) ->
{i, Dir} when is_list(Dir) -> true;
{d, _Macro} -> true;
{d, _Macro, _Value} -> true;
+ export_all -> true;
_ -> false
end
end,
@@ -625,7 +626,7 @@ main_process_loop(State) ->
case get_beam_file(Module,BeamFile0,Compiled0) of
{ok,BeamFile} ->
{Reply,Compiled} =
- case do_compile_beam(Module,BeamFile) of
+ case do_compile_beam(Module,BeamFile,[]) of
{ok, Module} ->
remote_load_compiled(State#main_state.nodes,
[{Module,BeamFile}]),
@@ -1258,13 +1259,13 @@ do_compile(File, UserOptions) ->
Options = [debug_info,binary,report_errors,report_warnings] ++ UserOptions,
case compile:file(File, Options) of
{ok, Module, Binary} ->
- do_compile_beam(Module,Binary);
+ do_compile_beam(Module,Binary,UserOptions);
error ->
error
end.
%% Beam is a binary or a .beam file name
-do_compile_beam(Module,Beam) ->
+do_compile_beam(Module,Beam,UserOptions) ->
%% Clear database
do_clear(Module),
@@ -1284,7 +1285,7 @@ do_compile_beam(Module,Beam) ->
%% Compile and load the result
%% It's necessary to check the result of loading since it may
%% fail, for example if Module resides in a sticky directory
- {ok, Module, Binary} = compile:forms(Forms, []),
+ {ok, Module, Binary} = compile:forms(Forms, UserOptions),
case code:load_binary(Module, ?TAG, Binary) of
{module, Module} ->