diff options
| author | Björn Gustavsson <[email protected]> | 2017-04-21 10:04:50 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2017-04-21 10:04:50 +0200 |
| commit | 4f67e66b82c6a5c4f0b1fd7932e7e57f86dd202f (patch) | |
| tree | f9873e261c0921d10cb7ef53f4e6ece035ee3355 /lib | |
| parent | b80a70b1ca7ca73a6f1c0aece098e258a0c45595 (diff) | |
| parent | 033deb9af6b3755ea1ffcf3a4f31d5c458f155da (diff) | |
| download | otp-4f67e66b82c6a5c4f0b1fd7932e7e57f86dd202f.tar.gz otp-4f67e66b82c6a5c4f0b1fd7932e7e57f86dd202f.tar.bz2 otp-4f67e66b82c6a5c4f0b1fd7932e7e57f86dd202f.zip | |
Merge branch 'bjorn/remove-r12-r15-compatibility' into run-travis
* bjorn/remove-r12-r15-compatibility:
compile: Remove the r12 through r15 options
test_server: Change compatibility to R16
crashdump_helper: Change compatibility to R18
Remove test case for testing compatibility with R9B
Do atom roundtripping with an R16B node
Remove -compile(r12)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common_test/src/test_server_node.erl | 4 | ||||
| -rw-r--r-- | lib/compiler/src/compile.erl | 8 | ||||
| -rw-r--r-- | lib/observer/test/crashdump_helper.erl | 2 | ||||
| -rw-r--r-- | lib/stdlib/test/io_proto_SUITE.erl | 1 |
4 files changed, 3 insertions, 12 deletions
diff --git a/lib/common_test/src/test_server_node.erl b/lib/common_test/src/test_server_node.erl index 0b406c54cc..92c610730e 100644 --- a/lib/common_test/src/test_server_node.erl +++ b/lib/common_test/src/test_server_node.erl @@ -18,11 +18,11 @@ %% %CopyrightEnd% %% -module(test_server_node). --compile(r12). +-compile(r16). %%% %%% The same compiled code for this module must be possible to load -%%% in R12B and later. +%%% in R16B and later. %%% %% Test Controller interface diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl index 03b52932d1..019d8ba864 100644 --- a/lib/compiler/src/compile.erl +++ b/lib/compiler/src/compile.erl @@ -213,14 +213,6 @@ expand_opt(report, Os) -> [report_errors,report_warnings|Os]; expand_opt(return, Os) -> [return_errors,return_warnings|Os]; -expand_opt(r12, Os) -> - [no_recv_opt,no_line_info,no_utf8_atoms|Os]; -expand_opt(r13, Os) -> - [no_record_opt,no_recv_opt,no_line_info,no_utf8_atoms|Os]; -expand_opt(r14, Os) -> - [no_record_opt,no_line_info,no_utf8_atoms|Os]; -expand_opt(r15, Os) -> - [no_record_opt,no_utf8_atoms|Os]; expand_opt(r16, Os) -> [no_record_opt,no_utf8_atoms|Os]; expand_opt(r17, Os) -> diff --git a/lib/observer/test/crashdump_helper.erl b/lib/observer/test/crashdump_helper.erl index e57c8162e4..fce15bca89 100644 --- a/lib/observer/test/crashdump_helper.erl +++ b/lib/observer/test/crashdump_helper.erl @@ -20,7 +20,7 @@ -module(crashdump_helper). -export([n1_proc/2,remote_proc/2]). --compile(r13). +-compile(r18). -include_lib("common_test/include/ct.hrl"). n1_proc(N2,Creator) -> diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl index 4cc4e3292c..b795cb0b61 100644 --- a/lib/stdlib/test/io_proto_SUITE.erl +++ b/lib/stdlib/test/io_proto_SUITE.erl @@ -18,7 +18,6 @@ %% %CopyrightEnd% %% -module(io_proto_SUITE). --compile(r12). -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]). |