aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/test/test_lib.erl
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2010-03-25 14:23:21 +0000
committerErlang/OTP <otp@erlang.org>2010-03-25 14:23:21 +0000
commit7ffd0736fa636a871b39412ab037d7fb1ed04cf1 (patch)
tree9d57389bc0f41dcaaeaea445a059b4458f9bd797 /lib/compiler/test/test_lib.erl
parent01d605fdb7c396b5c98a9151baf3882930d0c6af (diff)
parentd179c1522c73de550bce45c7f5d5055e04b93f32 (diff)
downloadotp-7ffd0736fa636a871b39412ab037d7fb1ed04cf1.tar.gz
otp-7ffd0736fa636a871b39412ab037d7fb1ed04cf1.tar.bz2
otp-7ffd0736fa636a871b39412ab037d7fb1ed04cf1.zip
Merge branch 'bg/compiler-remove-r11-support' into dev
* bg/compiler-remove-r11-support: compiler: Don't support the no_binaries option erts: Don't support the put_string/3 instruction compiler: Don't support the no_constant_pool option compiler: Don't support the r11 option test_server: Don't support communication with R11 nodes binary_SUITE: Don't test bit-level binary roundtrips with R11 nodes erts: Test compatibility of funs with R12 instead of R11 OTP-8531 bg/compiler-remove-r11-support
Diffstat (limited to 'lib/compiler/test/test_lib.erl')
-rw-r--r--lib/compiler/test/test_lib.erl15
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/compiler/test/test_lib.erl b/lib/compiler/test/test_lib.erl
index 3099538071..231b86b0b6 100644
--- a/lib/compiler/test/test_lib.erl
+++ b/lib/compiler/test/test_lib.erl
@@ -1,19 +1,19 @@
%%
%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
-%%
+%%
+%% Copyright Ericsson AB 2003-2010. All Rights Reserved.
+%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
%% compliance with the License. You should have received a copy of the
%% Erlang Public License along with this software. If not, it can be
%% retrieved online at http://www.erlang.org/.
-%%
+%%
%% Software distributed under the License is distributed on an "AS IS"
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
%% the License for the specific language governing rights and limitations
%% under the License.
-%%
+%%
%% %CopyrightEnd%
%%
-module(test_lib).
@@ -56,9 +56,7 @@ opt_opts(Mod) ->
(no_new_binaries) -> true;
(no_new_apply) -> true;
(no_gc_bifs) -> true;
- (no_constant_pool) -> true;
(no_stack_trimming) -> true;
- (no_binaries) -> true;
(debug_info) -> true;
(_) -> false
end, Opts).
@@ -70,6 +68,5 @@ opt_opts(Mod) ->
get_data_dir(Config) ->
Data0 = ?config(data_dir, Config),
{ok,Data1,_} = regexp:sub(Data0, "_no_opt_SUITE", "_SUITE"),
- {ok,Data2,_} = regexp:sub(Data1, "_post_opt_SUITE", "_SUITE"),
- {ok,Data,_} = regexp:sub(Data2, "_r11_SUITE", "_SUITE"),
+ {ok,Data,_} = regexp:sub(Data1, "_post_opt_SUITE", "_SUITE"),
Data.