aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2015-09-17 12:43:30 +0200
committerSiri Hansen <[email protected]>2015-09-17 12:43:30 +0200
commit6c9f25aafc8682387f13f6a6ac505ffaeff476c0 (patch)
tree0c1b1ac47acea7f0e8b3ac8b42ed424fd9861969 /erts
parente81be158ef17428532c76bcf7d4c69284163be1e (diff)
parentb37793a7b42114816ee8c0dc86217253c7e74781 (diff)
downloadotp-6c9f25aafc8682387f13f6a6ac505ffaeff476c0.tar.gz
otp-6c9f25aafc8682387f13f6a6ac505ffaeff476c0.tar.bz2
otp-6c9f25aafc8682387f13f6a6ac505ffaeff476c0.zip
Merge branch 'siri/cuddle-maint' into maint
* siri/cuddle-maint: Exclude ose application from upgrade test
Diffstat (limited to 'erts')
-rw-r--r--erts/test/upgrade_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/test/upgrade_SUITE.erl b/erts/test/upgrade_SUITE.erl
index 8a91cf5b7e..83cd2359d8 100644
--- a/erts/test/upgrade_SUITE.erl
+++ b/erts/test/upgrade_SUITE.erl
@@ -40,7 +40,7 @@
%% - typer requires hipe (in the .app file)
%% - erl_interface, jinterface support no upgrade
-define(appup_exclude,
- [dialyzer,hipe,typer,erl_interface,jinterface]).
+ [dialyzer,hipe,typer,erl_interface,jinterface,ose]).
init_per_suite(Config) ->
%% Check that a real release is running, not e.g. cerl