diff options
| author | Sverker Eriksson <[email protected]> | 2016-10-20 15:16:47 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-10-21 15:00:31 +0200 |
| commit | 7a48251e07d662261de68798de6a91ab8ad5ffe7 (patch) | |
| tree | 839655e9b3e20e41413b78c37ea511ad8c3e8882 /lib/kernel/test/code_SUITE.erl | |
| parent | 72026389d89a2e9530d3594df742588bace7079a (diff) | |
| download | otp-7a48251e07d662261de68798de6a91ab8ad5ffe7.tar.gz otp-7a48251e07d662261de68798de6a91ab8ad5ffe7.tar.bz2 otp-7a48251e07d662261de68798de6a91ab8ad5ffe7.zip | |
kernel: Test hipe and hipe_llvm separate
in code_SUITE:upgrade. Combining both takes time.
Diffstat (limited to 'lib/kernel/test/code_SUITE.erl')
| -rw-r--r-- | lib/kernel/test/code_SUITE.erl | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl index 8d517d144e..342f9ad5c3 100644 --- a/lib/kernel/test/code_SUITE.erl +++ b/lib/kernel/test/code_SUITE.erl @@ -487,16 +487,21 @@ load_binary(Config) when is_list(Config) -> upgrade(Config) -> DataDir = proplists:get_value(data_dir, Config), - T = case erlang:system_info(hipe_architecture) of - undefined -> [beam]; - _ -> - case hipe:llvm_support_available() of - false -> [beam,hipe]; - true -> [beam,hipe,hipe_llvm] - end - end, - - [upgrade_do(DataDir, Client, T) || Client <- T], + case erlang:system_info(hipe_architecture) of + undefined -> + upgrade_do(DataDir, beam, [beam]); + + _ -> + T = [beam, hipe], + [upgrade_do(DataDir, Client, T) || Client <- T], + + case hipe:llvm_support_available() of + false -> ok; + true -> + T2 = [beam, hipe_llvm], + [upgrade_do(DataDir, Client, T2) || Client <- T2] + end + end, ok. upgrade_do(DataDir, Client, T) -> |