diff options
| author | Peter Andersson <[email protected]> | 2018-06-15 11:06:44 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2018-06-15 11:06:44 +0200 |
| commit | 3c2ab242ecf10cc49e81e053514634a5fa10af1a (patch) | |
| tree | 6a0b78d3a6a98ee2db09967d181c2f1bc0c64c95 | |
| parent | 4a25e214ae24292246155cb26d27831550a02922 (diff) | |
| parent | 50392653fe33b0e1aa4fe63465f2f12f9a0f8bb6 (diff) | |
| download | otp-3c2ab242ecf10cc49e81e053514634a5fa10af1a.tar.gz otp-3c2ab242ecf10cc49e81e053514634a5fa10af1a.tar.bz2 otp-3c2ab242ecf10cc49e81e053514634a5fa10af1a.zip | |
Merge branch 'peppe/common_test/no_export_all_warning/OTP-14810'
* peppe/common_test/no_export_all_warning/OTP-14810:
No export_all warning when compiling test suites
OTP-14810
| -rw-r--r-- | lib/common_test/src/ct_run.erl | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl index 223aa06e64..c9d406f1fd 100644 --- a/lib/common_test/src/ct_run.erl +++ b/lib/common_test/src/ct_run.erl @@ -1909,7 +1909,8 @@ auto_compile(TestSuites) -> SuiteMakeErrors = lists:flatmap(fun({TestDir,Suite} = TS) -> case run_make(suites, TestDir, - Suite, UserInclude) of + Suite, UserInclude, + [nowarn_export_all]) of {error,{make_failed,Bad}} -> [{TS,Bad}]; {error,_} -> @@ -1927,7 +1928,7 @@ auto_compile(TestSuites) -> case lists:member(Dir, Done) of false -> Failed1 = - case run_make(helpmods, Dir, Suite, UserInclude) of + case run_make(helpmods, Dir, Suite, UserInclude, []) of {error,{make_failed,BadMods}} -> [{{Dir,all},BadMods}|Failed]; {error,_} -> @@ -2669,12 +2670,12 @@ get_name(Dir) -> run_make(TestDir, Mod, UserInclude) -> - run_make(suites, TestDir, Mod, UserInclude). + run_make(suites, TestDir, Mod, UserInclude, [nowarn_export_all]). -run_make(Targets, TestDir0, Mod, UserInclude) when is_list(Mod) -> - run_make(Targets, TestDir0, list_to_atom(Mod), UserInclude); +run_make(Targets, TestDir0, Mod, UserInclude, COpts) when is_list(Mod) -> + run_make(Targets, TestDir0, list_to_atom(Mod), UserInclude, COpts); -run_make(Targets, TestDir0, Mod, UserInclude) -> +run_make(Targets, TestDir0, Mod, UserInclude, COpts) -> case locate_test_dir(TestDir0, Mod) of {ok,TestDir} -> %% send a start_make notification which may suspend @@ -2689,7 +2690,7 @@ run_make(Targets, TestDir0, Mod, UserInclude) -> XmerlInclude = get_dir(xmerl, "include"), ErlFlags = UserInclude ++ [{i,CtInclude}, {i,XmerlInclude}, - debug_info], + debug_info] ++ COpts, Result = if Mod == all ; Targets == helpmods -> case (catch ct_make:all([noexec|ErlFlags])) of |