diff options
| author | Björn Gustavsson <[email protected]> | 2017-11-10 15:18:29 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2017-11-10 15:18:29 +0100 |
| commit | 494724da87d40c1f083be9451e5098ae2fb89759 (patch) | |
| tree | 3b4ac3e2bcf80da47d180912221afd8f679d4a63 /lib | |
| parent | eeb519b8a057983bc00314fd6e3ee8977278a8d8 (diff) | |
| parent | ed3f937470b1ffcdebd26b96d4282063a58de3cb (diff) | |
| download | otp-494724da87d40c1f083be9451e5098ae2fb89759.tar.gz otp-494724da87d40c1f083be9451e5098ae2fb89759.tar.bz2 otp-494724da87d40c1f083be9451e5098ae2fb89759.zip | |
Merge branch 'bjorn/cuddle-with-tests'
* bjorn/cuddle-with-tests:
Skip compile_SUITE:pre_load_check/1 when code is native-compiled
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/compiler/test/compile_SUITE.erl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl index e88a132d59..46b955b1f8 100644 --- a/lib/compiler/test/compile_SUITE.erl +++ b/lib/compiler/test/compile_SUITE.erl @@ -1318,10 +1318,13 @@ do_warnings_2([], Next, F) -> %% pre-loads the modules that are used by a typical compilation. pre_load_check(Config) -> - case test_server:is_cover() of - true -> + case {test_server:is_cover(),code:module_info(native)} of + {true,_} -> {skip,"Cover is running"}; - false -> + {false,true} -> + %% Tracing won't work. + {skip,"'code' is native-compiled"}; + {false,false} -> try do_pre_load_check(Config) after |