diff options
| author | Siri Hansen <[email protected]> | 2014-02-18 13:30:24 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-02-24 11:41:10 +0100 |
| commit | d9ebb210d5299306945c68e43ce6642f9a2d1617 (patch) | |
| tree | d60c5b2b56f0dd172b373ba4fb4a823568cbb837 | |
| parent | 41b4ec74fcbe8fedcc7b832ff7c6501e441292ac (diff) | |
| download | otp-d9ebb210d5299306945c68e43ce6642f9a2d1617.tar.gz otp-d9ebb210d5299306945c68e43ce6642f9a2d1617.tar.bz2 otp-d9ebb210d5299306945c68e43ce6642f9a2d1617.zip | |
Start all non-core applications as temporary in upgrade_SUITE
| -rw-r--r-- | erts/test/upgrade_SUITE.erl | 10 |
1 files changed, 8 insertions, 2 deletions
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). |