aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-01-29Revert "Prepare release"Sverker Eriksson
This reverts commit a0e362765d9d4afb0211f49eb787d2139b3eb7be. Conflicts: erts/vsn.mk
2013-01-29Merge branch 'rickard/r16/port-optimizations/OTP-10336'Rickard Green
* rickard/r16/port-optimizations/OTP-10336: Fix spelling in communication.xml Fix unmanaged thread progress delay
2013-01-29Fix spelling in communication.xmlRickard Green
Thanks to Richard O'Keefe
2013-01-29Fix unmanaged thread progress delayRickard Green
2013-01-28Merge branch 'rickard/async-default/OTP-10736'Rickard Green
* rickard/async-default/OTP-10736: Use no async threads for erlc
2013-01-28Revert "erts: Remove forgotten vxworks includes"Björn-Egil Dahlberg
This reverts commit 624751813b30a367c8255e86f26f7342aeb33cbc. Overzealous removal of vxworks includes
2013-01-28Merge branch 'sa/dialyzer-minor-fixes/R16A'Fredrik Gustafsson
* sa/dialyzer-minor-fixes/R16A: Fix wording of error message Fix reference results of a Dialyzer test
2013-01-28Fix wording of error messageStavros Aronis
2013-01-28Fix reference results of a Dialyzer testStavros Aronis
2013-01-28Merge branch 'pan/wx_and_gcc45'Patrik Nyblom
* pan/wx_and_gcc45: Make Mac wx use Apple compilers regardless of $CC
2013-01-28Merge branch 'sverk/ets-write_concurrency-locks'Sverker Eriksson
* sverk/ets-write_concurrency-locks: erts,stdlib: Increase number of locks for write_concurrency OTP-10787
2013-01-28Merge branch 'sverk/code_write_permission-assert'Sverker Eriksson
* sverk/code_write_permission-assert: erts: Fix ASSERT crash in erts_try_seize_code_write_permission
2013-01-28erts: Fix ASSERT crash in erts_try_seize_code_write_permissionSverker Eriksson
ASSERT(code_writing_process != c_p); The assert was actually harmless and could be removed as one solution. But I think it's better to keep it as a way to catch bugs that would otherwise lead to horrible deadlocks if a thread "forgets" to call erts_release_code_write_permission(). As a result erts_release_code_write_permission() must be called BEFORE resuming the suspended process.
2013-01-28Merge branch 'sverk/enc_atom-opt'Sverker Eriksson
* sverk/enc_atom-opt: erts: Optimize atom encoding to use memcpy for pure ascii erts: Refactor erts_atom_get to use ErtsAtomEncoding
2013-01-28Merge branch 'lukas/erts/fix_driver_call_memleak/OTP-10336'Lukas Larsson
* lukas/erts/fix_driver_call_memleak/OTP-10336: Fix memory leak in driver call functionality
2013-01-28Fix memory leak in driver call functionalityLukas Larsson
2013-01-28Merge branch 'bmk/inets/prepare-for-release'Micael Karlberg
2013-01-28Merge branch 'fredrik/ssh/dialyzer-and-doc'Fredrik Gustafsson
* fredrik/ssh/dialyzer-and-doc: Fixed some broken links in ssh doc Fixed some ssh documentation
2013-01-28Fixed some broken links in ssh docFredrik Gustafsson
2013-01-28Merge branch 'lukas/r16a/testcases'Lukas Larsson
* lukas/r16a/testcases: Do not crash init_per_suite when nif load fails
2013-01-28Merge branch 'sverk/ic/tests'Sverker Eriksson
* sverk/ic/tests: ic: Making tests pass after changes in erl_interface and jinterface ic: Revert --enable-silent-rules for test Makefile OTP-10785
2013-01-28Merge branch 'lukas/erl_interface/test_atom_as_functions/OTP-10753'Lukas Larsson
* lukas/erl_interface/test_atom_as_functions/OTP-10753: Return if size test fails Add utf8 atom encode and decode testcases Validate UTF8/ASCII when buf is NULL
2013-01-28Merge branch 'ia/ssh/dialyzer-and-doc'Ingela Anderton Andin
* ia/ssh/dialyzer-and-doc: ssh: Fix dialyzer and doc warnings
2013-01-28Merge branch 'peppe/common_test/testspec_include'Peter Andersson
* peppe/common_test/testspec_include: Fix failing test case OTP-9881
2013-01-28Fix failing test casePeter Andersson
OTP-9881
2013-01-28Merge branch 'fredrik/dialyzer/fix-tc-data'Fredrik Gustafsson
* fredrik/dialyzer/fix-tc-data: Testcase expecting newline
2013-01-27Merge branch 'peppe/common_test/testspec_include'Peter Andersson
* peppe/common_test/testspec_include: Fix problem with tests running in wrong order OTP-9881
2013-01-27Fix problem with tests running in wrong orderPeter Andersson
OTP-9881
2013-01-27Merge remote branch 'origin/peppe/common_test/restore_config'Peter Andersson
* origin/peppe/common_test/restore_config: Add verification terms in test suite Add test case to verify that config data gets properly restored OTP-10070
2013-01-27Merge branch 'peppe/common_test/testspec_include'Peter Andersson
* peppe/common_test/testspec_include: Add more tests Update documentation Add tests and correct errors Update CT Master Implement support for including test specifications Make it possible to execute one test run per test specification Conflicts: lib/common_test/src/ct_master.erl lib/common_test/src/ct_run.erl lib/common_test/src/ct_testspec.erl OTP-9881
2013-01-27Add more testsPeter Andersson
2013-01-26Update primary bootstrapBjörn Gustavsson
2013-01-26Merge branch 'bjorn/remove-tuple-funs/OTP-10170'Björn Gustavsson
* bjorn/remove-tuple-funs/OTP-10170: erl_lint: Removes vestiges of tuple fun support
2013-01-26Merge branch 'bjorn/remove-packages/OTP-10348'Björn Gustavsson
* bjorn/remove-packages/OTP-10348: erl_lint: Remove vestiges of package support shell: Remove vestiges of package support
2013-01-25Merge branch 'pan/fix-compiler-warnings-clang-and-new-gcc'Patrik Nyblom
* pan/fix-compiler-warnings-clang-and-new-gcc: Fix compiler warnings from GCC 4.7.1 on ARCH Linux Fix clang compiler warnings on FreeBSD in erts
2013-01-25Make Mac wx use Apple compilers regardless of $CCPatrik Nyblom
If using gcc 4.5 from MacPorts, or probably any other third party "real" gcc to compile the VM, an unusable wx-driver was created, as the wx application requires the apple compilers for all files (not only ObjC) since we started to support Cocoa wxWidgets.
2013-01-25Update preloaded modulesSiri Hansen
2013-01-25Merge branch 'siri/unicode'Siri Hansen
* siri/unicode: [test_server] Don't escape : and @ in test log links [test_server] Don't create latin1 filenames if filename mode is utf8 [test_server] Ensure correct encoding in header for erl2html2:convert [common_test] Update common test modules to handle unicode [ts] Use unicode:characters_to_list/2 instead of binary_to_list/1 [test_server] Add tests for unicode support [test_server] Write link target with correct encoding in erl2html2 [test_server] Update test_server to handle unicode Update preloaded init.beam Make arguments given with -s option to erl aware of file name encoding OTP-10702 OTP-10783
2013-01-25Update copyright yearsBjörn-Egil Dahlberg
2013-01-25Merge branch 'bjorn/add-release-notes-tickets'Björn Gustavsson
* bjorn/add-release-notes-tickets: Update copyright year OTP-10784 OTP-10786
2013-01-25Update copyright yearBjörn Gustavsson
We need a dummy commit to add some ticket numbers for additional release notes.
2013-01-25Merge branch 'dgud/wx/depr-driver-if'Dan Gudmundsson
* dgud/wx/depr-driver-if: Document howto build wxWidgets on mac wx: Fix crash in glu tesselate wx: Remove deprecated driver_send_term usage wx: Removed wx internal event
2013-01-25Merge branch 'dgud/wx/treectrl/OTP-10743'Dan Gudmundsson
* dgud/wx/treectrl/OTP-10743: wx: Add wxTreeCtrl:isTreeItemIdOk/1 wx: Fix wxTreeCtrl return values
2013-01-25[test_server] Don't escape : and @ in test log linksSiri Hansen
If escaping :, then links of type "file:///c:/ldisk..." will not work. Escaping @ does not create any problems, but the link becomes harder to read and most modern browsers can handle this.
2013-01-25[test_server] Don't create latin1 filenames if filename mode is utf8Siri Hansen
Skipping test_server_latin1_***_SUITE if filename:native_name_encoding is utf8.
2013-01-25[test_server] Ensure correct encoding in header for erl2html2:convertSiri Hansen
When running under framework common_test, the encoding statement in the HTML header of the file generated with erl2html2:convert would sometimes be faulty. This has been corrected.
2013-01-25[common_test] Update common test modules to handle unicodeSiri Hansen
* Use UTF-8 encoding for all HTML files, except the HTML version of the test suite generated with erl2html2:convert, which will have the same encoding as the original test suite (.erl) file. * Encode link targets in HTML files with test_server_ctrl:uri_encode/1. * Use unicode modifier 't' with ~s when appropriate. * Use unicode:characters_to_list and unicode:characters_to_binary for conversion between binaries and strings instead of binary_to_list and list_to_binary.
2013-01-25[ts] Use unicode:characters_to_list/2 instead of binary_to_list/1Siri Hansen
When reading text files with file:read_file/1, assume that the file has the default encding (epp:default_encoding()) and covert the binary to string by unicode:characters_to_list(Bin,DefaultEncoding) instead of binary_to_list(Bin) as before.
2013-01-25[test_server] Add tests for unicode supportSiri Hansen
2013-01-25[test_server] Write link target with correct encoding in erl2html2Siri Hansen
If the encoding of the source file was utf-8, then the link target could be faulty encoded in the resulting HTML file. This has been corrected.