diff options
| author | Erlang/OTP <[email protected]> | 2010-03-25 14:23:21 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-03-25 14:23:21 +0000 |
| commit | 7ffd0736fa636a871b39412ab037d7fb1ed04cf1 (patch) | |
| tree | 9d57389bc0f41dcaaeaea445a059b4458f9bd797 /erts/emulator/test/Makefile | |
| parent | 01d605fdb7c396b5c98a9151baf3882930d0c6af (diff) | |
| parent | d179c1522c73de550bce45c7f5d5055e04b93f32 (diff) | |
| download | otp-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 'erts/emulator/test/Makefile')
| -rw-r--r-- | erts/emulator/test/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile index b1374950b2..df2faf1450 100644 --- a/erts/emulator/test/Makefile +++ b/erts/emulator/test/Makefile @@ -1,19 +1,19 @@ # # %CopyrightBegin% -# -# Copyright Ericsson AB 1997-2009. All Rights Reserved. -# +# +# Copyright Ericsson AB 1997-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% # @@ -61,7 +61,7 @@ MODULES= \ exception_SUITE \ float_SUITE \ fun_SUITE \ - fun_r11_SUITE \ + fun_r12_SUITE \ gc_SUITE \ guard_SUITE \ hash_SUITE \ |