kernel: Test hipe and hipe_llvm separate

in code_SUITE:upgrade. Combining both takes time.

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) ->