aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-12-08 12:16:33 +0100
committerRickard Green <[email protected]>2014-12-08 12:16:33 +0100
commitccbbf5ae09286e71761b42a4b203384002997b84 (patch)
treefb7e46ac976b113c74b2abc3d616735eb7bff531 /erts
parent2f53998eebd3f14930ae792c89e64e57d4ad8a82 (diff)
parented4f65e9e52bc0792b4a4e6a45acb99cf0e695b2 (diff)
downloadotp-ccbbf5ae09286e71761b42a4b203384002997b84.tar.gz
otp-ccbbf5ae09286e71761b42a4b203384002997b84.tar.bz2
otp-ccbbf5ae09286e71761b42a4b203384002997b84.zip
Merge branch 'rickard/appup-files/OTP-12358' into maint
* rickard/appup-files/OTP-12358: Add .appup file
Diffstat (limited to 'erts')
-rw-r--r--erts/test/upgrade_SUITE.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/test/upgrade_SUITE.erl b/erts/test/upgrade_SUITE.erl
index d5a920e03d..217056971e 100644
--- a/erts/test/upgrade_SUITE.erl
+++ b/erts/test/upgrade_SUITE.erl
@@ -37,8 +37,9 @@
%% - hipe does not support any upgrade at all
%% - dialyzer requires hipe (in the .app file)
%% - typer requires hipe (in the .app file)
+%% - erl_interface, jinterface support no upgrade
-define(appup_exclude,
- [dialyzer,hipe,typer]).
+ [dialyzer,hipe,typer,erl_interface,jinterface]).
init_per_suite(Config) ->
%% Check that a real release is running, not e.g. cerl