diff options
author | Siri Hansen <[email protected]> | 2017-07-03 17:51:54 +0200 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2017-07-03 17:51:54 +0200 |
commit | ea5fbd3f832e4cc7342d33e5d205a8f3fe15af7c (patch) | |
tree | 1d5882fb8e23b9286bafb3ee4d1b9b80fb50f356 /lib/common_test/src/ct_make.erl | |
parent | f3c1cdd43c4f45bd0333b2ddcc9d78cbcf4c6cf0 (diff) | |
parent | c5a6e3d99144c94ef557da5787c76f12737044d9 (diff) | |
download | otp-ea5fbd3f832e4cc7342d33e5d205a8f3fe15af7c.tar.gz otp-ea5fbd3f832e4cc7342d33e5d205a8f3fe15af7c.tar.bz2 otp-ea5fbd3f832e4cc7342d33e5d205a8f3fe15af7c.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src/ct_make.erl')
-rw-r--r-- | lib/common_test/src/ct_make.erl | 48 |
1 files changed, 40 insertions, 8 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 |