aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-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.
2013-01-25[test_server] Update test_server 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, allowing both special characters like "/", "&", "?" etc, and latin1 or unicode characters. * Use unicode modifier 't' with ~s and ~p 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-25Update preloaded init.beamSiri Hansen
2013-01-25Make arguments given with -s option to erl aware of file name encodingSiri Hansen
OTP-10702 Arguments to functions started with the -s option to erl were converted to atoms with list_to_atom(binary_to_list(Bin)) and thus were always seen as latin1 encoded. For other arguments to erl the conversion (to string) would take into account the file name translation mode (set with +fnl, +fnu or +fna switch to erl) and try to convert using unicode:characters_to_list/2. The reason behind this is that it must be possible to give paths and filenames on the command line and get the expected encoding. With the same reasoning, this commit changes the behaviour for arguments to functions started with the -s option to also take into account the file name translation mode. The arguments are now converted to atoms by list_to_atom(unicode:characters_to_list(Bin,file:native_name_encoding())
2013-01-25erts: Optimize atom encoding to use memcpy for pure asciiSverker Eriksson
2013-01-25erts: Refactor erts_atom_get to use ErtsAtomEncodingSverker Eriksson
instead of 'is_latin1' boolean argument.
2013-01-25Merge branch 'siri/cuddle-with-tests'Siri Hansen
* siri/cuddle-with-tests: [common_test] Clean logdir for ct_surefire_SUITE [common_test] Fix log dirs on windows [test_server] Fix copyright in erl2html2_SUITE.erl Fix release_handler_SUITE:otp_9395_check_old_code
2013-01-25[common_test] Clean logdir for ct_surefire_SUITESiri Hansen
ct_surefire_SUITE:logdir/1 creates a directory named "specific_logdir" which was never cleaned. This commit makes sure the directory exists and is empty before the test case runs.
2013-01-25[common_test] Fix log dirs on windowsSiri Hansen
ct_surefire_SUITE erronously assumed that logs would always be located under priv_dir, but this is not true on windows where logs are located in temp dir. This has been corrected.
2013-01-25[test_server] Fix copyright in erl2html2_SUITE.erlSiri Hansen
2013-01-25Fix release_handler_SUITE:otp_9395_check_old_codeSiri Hansen
This test often fails dues to too high expectations. Don't expect the test to be more than 1000 times faster with no old code - it just doesn't happen!
2013-01-25Update system READMEBjörn-Egil Dahlberg