aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-08-27Merge branch 'maint'Björn Gustavsson
* maint: make_preload: Don't fail if Perl's default file encoding is UTF-8
2012-08-27Merge branch 'bjorn/otp/fix-make_preload/OTP-10201' into maintBjörn Gustavsson
* bjorn/otp/fix-make_preload/OTP-10201: make_preload: Don't fail if Perl's default file encoding is UTF-8
2012-08-27make_preload: Don't fail if Perl's default file encoding is UTF-8Björn Gustavsson
Setting Perl's default encoding for files to UTF-8, for example like this: PERL_UNICODE=DS make would crash the build with a message similar to: form size 1413 greater than size 1237 of module at utils/make_preload line 175, <FILE> chunk 1. Tell Perl to interpret the data in BEAM files as binary by using the binmode() function. The binmode() function existed before Unicode support was added to Perl, which means that make_preload should work even in old versions of Perl. Noticed-by: Aaron Harnly
2012-08-24Merge branch 'maint'Siri Hansen
2012-08-24Merge branch 'siri/common_test/ct_netconfc/OTP-10025' into maintSiri Hansen
* siri/common_test/ct_netconfc/OTP-10025: [common_test] Handle all ssh_cm messages in ct_netconfc:handle_msg/2
2012-08-24Merge branch 'peppe/common_test/update_vsn_files' into maintPeter Andersson
* peppe/common_test/update_vsn_files: Update vsn.mk files
2012-08-24Update vsn.mk filesPeter Andersson
2012-08-24Merge branch 'maint'Fredrik Gustafsson
* maint: Fix the erlc -MP flag
2012-08-24Merge branch 'rc/fix-MP-compiler-flag/OTP-10211' into maintFredrik Gustafsson
2012-08-24Merge branch 'maint'Lukas Larsson
* maint: Configure now assumed normal doubles Bumped version nr bumped revision make list_suffix/1 and list_prefix/1 handle erl_parse() cons sequences modernized and cleaned up edoc documentation removed obsolete @spec annotations and fixed some -spec and -type annotations preserve line numbers when reverting representation updated author e-mail removed CVS keywords from source files Revise the autoconf tests for double middle endianness. Add test for floating-point output to float_SUITE. Unbreak floating point on middle-endian machines. Add support for NULL value in odbc:param_query Conflicts: xcomp/README.md
2012-08-24Merge branch 'msp/double_middle_endian/OTP-10209' into maintLukas Larsson
* msp/double_middle_endian/OTP-10209: Configure now assumed normal doubles Revise the autoconf tests for double middle endianness. Add test for floating-point output to float_SUITE. Unbreak floating point on middle-endian machines.
2012-08-24Configure now assumed normal doublesLukas Larsson
2012-08-24Merge branch 'rc/syntax_tools-1.6.8/OTP-10208' into maintFredrik Gustafsson
2012-08-24Merge branch 'mz/odbc-support-param_query/OTP-10206' into maintFredrik Gustafsson
2012-08-24Bumped version nrFredrik Gustafsson
2012-08-24Merge branch 'mz/odbc-support-param_query' into maintFredrik Gustafsson
2012-08-23Merge branch 'maint'Sverker Eriksson
2012-08-23Merge branch 'sverk/printf-string-precision-bug' into maintSverker Eriksson
* sverk/printf-string-precision-bug: erts: Fix bug in erts_printf for %s with precision
2012-08-23Merge branch 'maint'Sverker Eriksson
Conflicts: erts/preloaded/ebin/init.beam
2012-08-23Merge branch 'sverk/hipelibs-code_server-crash-maint' into maintSverker Eriksson
* sverk/hipelibs-code_server-crash-maint: Fix init:restart with hipelibs kernel: Disable hipe compilation for hipe_unified_loader
2012-08-23Merge branch 'maint'Peter Andersson
2012-08-23Merge remote branch 'origin/peppe/common_test/parallel_testcases_error' into ↵Peter Andersson
maint * origin/peppe/common_test/parallel_testcases_error: Solve problems with verbosity levels and parallel test cases
2012-08-23Merge branch 'maint'Peter Andersson
2012-08-23Merge remote branch 'origin/peppe/common_test/io_error' into maintPeter Andersson
* origin/peppe/common_test/io_error: Fix IO bug causing CT Hooks to hang at startup
2012-08-23Solve problems with verbosity levels and parallel test casesPeter Andersson
2012-08-23Fix IO bug causing CT Hooks to hang at startupPeter Andersson
2012-08-23Merge branch 'maint'Peter Andersson
2012-08-23Merge remote branch 'origin/peppe/common_test/silent_connection' into maintPeter Andersson
* origin/peppe/common_test/silent_connection: Fix deadlock problem in connection handling Implement silent_connection for ssh Conflicts: lib/common_test/src/ct_gen_conn.erl OTP-9625
2012-08-23Merge branch 'maint'Peter Andersson
2012-08-23Merge remote branch 'origin/peppe/common_test/break_and_continue' into maintPeter Andersson
* origin/peppe/common_test/break_and_continue: Fix error in documentation Implement support for test case execution break/continue Conflicts: lib/common_test/src/ct.erl lib/common_test/src/ct_run.erl OTP-10127 OTP-10172
2012-08-23Merge branch 'maint'Peter Andersson
2012-08-23Merge remote branch 'origin/peppe/common_test/verbosity_level' into maintPeter Andersson
* origin/peppe/common_test/verbosity_level: Fix doc build error Implement verbosity levels and parameter for log printout importance Conflicts: lib/common_test/src/ct_logs.erl lib/common_test/src/ct_run.erl lib/common_test/src/ct_testspec.erl lib/common_test/src/ct_util.hrl lib/common_test/test/Makefile OTP-9625 OTP-10067
2012-08-23Merge branch 'maint'Peter Andersson
2012-08-23Merge remote branch 'origin/peppe/common_test/testspec_updates' into maintPeter Andersson
* origin/peppe/common_test/testspec_updates: Test new testspec functionality and correct bugs Implement constants and new features for test specifications Conflicts: lib/common_test/src/ct_run.erl lib/common_test/test/Makefile OTP-10049 OTP-10089 OTP-10145
2012-08-23Merge branch 'maint'Peter Andersson
2012-08-23Merge remote branch 'origin/peppe/common_test/hook_init_order' into maintPeter Andersson
* origin/peppe/common_test/hook_init_order: Call CT Hook init functions in the correct order OTP-10135
2012-08-23Merge branch 'maint'Peter Andersson
2012-08-23Merge branch 'peppe/common_test/table_sorter' into maintPeter Andersson
* peppe/common_test/table_sorter: Fix installation of javascript files on windows Fix installation of javascript files Make it possible to sort the HTML tables Conflicts: lib/common_test/src/ct_util.hrl OTP-9896
2012-08-23Merge branch 'maint'Peter Andersson
2012-08-23Merge remote branch 'origin/peppe/common_test/exit_status' into maintPeter Andersson
* origin/peppe/common_test/exit_status: Implement support for returning valid exit status from ct_run OTP-9865 OTP-10087
2012-08-23Merge branch 'maint'Ingela Anderton Andin
* maint: (50 commits) ssl: Clean up of code thanks to dialyzer ssl: Add missing sslv3 alert ssl: Test suite adjustments ssl & public_key: Prepare for release ssl: Use crypto:strong_rand_bytes if possible ssl & public_key: Add use of more "sha-rsa oids" ssl: Fix inet header option to behave as in inet ssl: TLS 1.2: fix hash and signature handling ssl: TLS 1.2: fix Certificate Request list of Accepted Signatur/Hash combinations ssl: Add Signature Algorithms hello extension from TLS 1.2 ssl: Fix rizzo tests to run as intended ssl: TLS-1.1 and TLS-1.2 support should not be default until R16 ssl: Signture type bug ssl: Add crypto support check (TLS 1.2 require sha256 support) ssl: Dialyzer fixes ssl: IDEA cipher is deprecated by TLS 1.2 ssl: Run relevant tests for all SSL/TLS versions ssl: Add TLS version switches to openssl tests ssl: Enable TLS 1.2 ssl: Enable mac_hash for TLS 1.2 ...
2012-08-23Merge branch 'ia/sslv3-alert/OTP-10196' into maintIngela Anderton Andin
* ia/sslv3-alert/OTP-10196: ssl: Add missing sslv3 alert
2012-08-23Merge branch 'ia/ssl/tls1.1and1.2' into maintIngela Anderton Andin
* ia/ssl/tls1.1and1.2: (46 commits) ssl: Clean up of code thanks to dialyzer ssl: Test suite adjustments ssl & public_key: Prepare for release ssl: Use crypto:strong_rand_bytes if possible ssl & public_key: Add use of more "sha-rsa oids" ssl: Fix inet header option to behave as in inet ssl: TLS 1.2: fix hash and signature handling ssl: TLS 1.2: fix Certificate Request list of Accepted Signatur/Hash combinations ssl: Add Signature Algorithms hello extension from TLS 1.2 ssl: Fix rizzo tests to run as intended ssl: TLS-1.1 and TLS-1.2 support should not be default until R16 ssl: Signture type bug ssl: Add crypto support check (TLS 1.2 require sha256 support) ssl: Dialyzer fixes ssl: IDEA cipher is deprecated by TLS 1.2 ssl: Run relevant tests for all SSL/TLS versions ssl: Add TLS version switches to openssl tests ssl: Enable TLS 1.2 ssl: Enable mac_hash for TLS 1.2 ssl: Implement TLS 1.2 signature support ...
2012-08-23Merge branch 'sverk/ets-test_ms-bug/OTP-10190' into maintSverker Eriksson
* sverk/ets-test_ms-bug/OTP-10190: Fix bug in ets:test_ms/2.
2012-08-23Merge remote branch 'origin/peppe/common_test/ct_hooks_errors' into maintPeter Andersson
* origin/peppe/common_test/ct_hooks_errors: Fix IO printout crash caused by hook function Fix timetrap error in pre-hooks Conflicts: lib/common_test/src/cth_surefire.erl OTP-10050 OTP-10069 OTP-10072
2012-08-23ssl: Clean up of code thanks to dialyzerIngela Anderton Andin
2012-08-23Merge branch 'maint'Ingela Anderton Andin
* maint: Fix assembler comments for hipe on ppc odbc: remove "-" in hostname from generated unique table name
2012-08-23Merge branch 'ia/odbc/test-suite-maint' into maintIngela Anderton Andin
* ia/odbc/test-suite-maint: odbc: remove "-" in hostname from generated unique table name
2012-08-23Merge branch 'sverk/hipe-ppc-assembler-comment' into maintSverker Eriksson
* sverk/hipe-ppc-assembler-comment: Fix assembler comments for hipe on ppc
2012-08-23Merge branch 'maint' of super:otp into maintFredrik Gustafsson
* 'maint' of super:otp: Revert "Merge branch 'nox/compile-column-numbers' into maint" compiler: Warn if the size of a binary segment is invalid Allow non-ASCII characters in Xref filanmes Add powerpc dso xcomp file