diff options
author | Micael Karlberg <bmk@erlang.org> | 2011-04-12 18:09:11 +0200 |
---|---|---|
committer | Micael Karlberg <bmk@erlang.org> | 2011-04-12 18:09:11 +0200 |
commit | a0c01db642374fb9fbbbb47263929f1e442e20d7 (patch) | |
tree | 4a080c6a416eeaddbfdfca343d3f3d898639b289 /lib/tools | |
parent | 4346b5dae76052e8c06b1cda70d561b10c1c486d (diff) | |
parent | 47fc3df88eada4b07d8805dbc7fd418f6fac1c11 (diff) | |
download | otp-a0c01db642374fb9fbbbb47263929f1e442e20d7.tar.gz otp-a0c01db642374fb9fbbbb47263929f1e442e20d7.tar.bz2 otp-a0c01db642374fb9fbbbb47263929f1e442e20d7.zip |
Merge branch 'dev' into bmk/inets/inet56_integration
Diffstat (limited to 'lib/tools')
-rw-r--r-- | lib/tools/src/cover.erl | 9 |
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} -> |