From d9ebb210d5299306945c68e43ce6642f9a2d1617 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Tue, 18 Feb 2014 13:30:24 +0100
Subject: Start all non-core applications as temporary in upgrade_SUITE

---
 erts/test/upgrade_SUITE.erl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'erts/test/upgrade_SUITE.erl')

diff --git a/erts/test/upgrade_SUITE.erl b/erts/test/upgrade_SUITE.erl
index 690ee0bad0..bcdac2a66e 100644
--- a/erts/test/upgrade_SUITE.erl
+++ b/erts/test/upgrade_SUITE.erl
@@ -284,7 +284,7 @@ create_relfile(Node,CreateDir,RelName0,RelVsn) ->
 						 true ->
 						     [];
 						 false ->
-						     [{App,Vsn}]
+						     [{App,Vsn,restart_type(App)}]
 					     end;
 					 _ ->
 					     []
@@ -309,6 +309,11 @@ create_relfile(Node,CreateDir,RelName0,RelVsn) ->
     ok = file:close(Fd),
     {RelName,Apps,ErtsVsn}.
 
+restart_type(App) when App==kernel; App==stdlib; App==sasl ->
+    permanent;
+restart_type(_) ->
+    temporary.
+
 copy_file(Src, Dest) ->
     copy_file(Src, Dest, []).
 
@@ -400,7 +405,8 @@ start_node(Start,ExpStatus,ExpVsn,ExpApps) ->
             Error
     end.
 
-wait_node_up(ExpStatus,ExpVsn,ExpApps) ->
+wait_node_up(ExpStatus,ExpVsn,ExpApps0) ->
+    ExpApps = [{A,V} || {A,V,_T} <- ExpApps0],
     Node = node_name(?upgr_sname),
     wait_node_up(Node,ExpStatus,ExpVsn,lists:keysort(1,ExpApps),60).
 
-- 
cgit v1.2.3