From aeb2f71edb6ecba094dcfeddf8f8255229f90b9b Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Thu, 6 Feb 2014 12:25:54 +0100
Subject: Skip upgrade_SUITE when running cerl

---
 erts/test/upgrade_SUITE.erl | 12 ++++++++++--
 1 file changed, 10 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 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]),
-- 
cgit v1.2.3