aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-02-06 12:25:54 +0100
committerSiri Hansen <[email protected]>2014-02-24 11:41:10 +0100
commitaeb2f71edb6ecba094dcfeddf8f8255229f90b9b (patch)
tree3f816bd5ba9ad9e54e3dc24143af19371b87bd23
parent00623ae5c4718e001653a66a6d1cdca3615d0a77 (diff)
downloadotp-aeb2f71edb6ecba094dcfeddf8f8255229f90b9b.tar.gz
otp-aeb2f71edb6ecba094dcfeddf8f8255229f90b9b.tar.bz2
otp-aeb2f71edb6ecba094dcfeddf8f8255229f90b9b.zip
Skip upgrade_SUITE when running cerl
-rw-r--r--erts/test/upgrade_SUITE.erl12
1 files changed, 10 insertions, 2 deletions
diff --git a/erts/test/upgrade_SUITE.erl b/erts/test/upgrade_SUITE.erl
index f6799467f6..16a805db52 100644
--- a/erts/test/upgrade_SUITE.erl
+++ b/erts/test/upgrade_SUITE.erl
@@ -39,8 +39,16 @@
ssh,ssl,syntax_tools,test_server,tools,typer,wx,xmerl]).
init_per_suite(Config) ->
- rm_rf(filename:join([?config(data_dir,Config),priv_dir])),
- Config.
+ %% Check that a real release is running, not e.g. cerl
+ ok = application:ensure_started(sasl),
+ case release_handler:which_releases() of
+ [{_,_,[],_}] ->
+ %% Fake release, no applications
+ {skip, "Need a real release running to create other releases"};
+ _ ->
+ rm_rf(filename:join([?config(data_dir,Config),priv_dir])),
+ Config
+ end.
init_per_testcase(Case,Config) ->
PrivDir = filename:join([?config(data_dir,Config),priv_dir,Case]),