diff options
| author | Sverker Eriksson <[email protected]> | 2016-10-07 16:55:08 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-10-14 14:43:50 +0200 |
| commit | ee0531308b0cc57f0312e1d0676635969d8a8029 (patch) | |
| tree | 5333f5938e3177f141f1d3e12cb06d22f176b957 /lib/kernel | |
| parent | 8bb80fe76f5b4debe981e42ba70260c5a12b250f (diff) | |
| download | otp-ee0531308b0cc57f0312e1d0676635969d8a8029.tar.gz otp-ee0531308b0cc57f0312e1d0676635969d8a8029.tar.bz2 otp-ee0531308b0cc57f0312e1d0676635969d8a8029.zip | |
kernel: Fix code_SUITE:upgrade for non-hipe
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/test/code_SUITE.erl | 7 | ||||
| -rw-r--r-- | lib/kernel/test/code_SUITE_data/upgrade_client.erl | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl index 1be4c364d5..96f8ff2c5f 100644 --- a/lib/kernel/test/code_SUITE.erl +++ b/lib/kernel/test/code_SUITE.erl @@ -487,9 +487,10 @@ load_binary(Config) when is_list(Config) -> upgrade(Config) -> DataDir = proplists:get_value(data_dir, Config), - T = [beam, hipe], - %%T = [beam], - %%T = [hipe], + T = case erlang:system_info(hipe_architecture) of + undefined -> [beam]; + _ -> [beam,hipe] + end, [upgrade_do(DataDir, Client, T) || Client <- T], ok. diff --git a/lib/kernel/test/code_SUITE_data/upgrade_client.erl b/lib/kernel/test/code_SUITE_data/upgrade_client.erl index 7ca0df7f5c..98d36f6014 100644 --- a/lib/kernel/test/code_SUITE_data/upgrade_client.erl +++ b/lib/kernel/test/code_SUITE_data/upgrade_client.erl @@ -60,7 +60,6 @@ run(Dir, Upgradee1, Upgradee2, Other1, Other2) -> Env1 = "Env1", put(loc1_fun, upgradee:get_local_fun(Env1)), - erlang:display(sverk_break), ?line {1,Env1} = (get(loc1_fun))(), put(exp1exp2_fun, upgradee:get_exp1exp2_fun()), |