diff options
| author | Rickard Green <[email protected]> | 2014-12-08 12:17:06 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-12-08 12:17:06 +0100 |
| commit | fe5969db22c97af8c26658db5a326158a78fe2e3 (patch) | |
| tree | 4abe7c1e641cfe098926574605aa6d1b275a4109 /erts | |
| parent | d124ada26599caa1e86ffbf6883fcf8484b0b9c7 (diff) | |
| parent | ccbbf5ae09286e71761b42a4b203384002997b84 (diff) | |
| download | otp-fe5969db22c97af8c26658db5a326158a78fe2e3.tar.gz otp-fe5969db22c97af8c26658db5a326158a78fe2e3.tar.bz2 otp-fe5969db22c97af8c26658db5a326158a78fe2e3.zip | |
Merge branch 'maint'
* maint:
Add .appup file
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/test/upgrade_SUITE.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/test/upgrade_SUITE.erl b/erts/test/upgrade_SUITE.erl index 7b3bc1b063..4858bfdfb7 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 |