aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-11-22Merge branch 'maint'Björn Gustavsson
* maint: Rename otp_8949_a/0 which common_test interprets as an info function
2013-11-22Rename otp_8949_a/0 which common_test interprets as an info functionBjörn Gustavsson
Before running a test case named testcase/1, common_test will call testcase/0 (the info function). Exceptions and illegal return values would be silently ignored. In a planned update to common_test, errors will instead cause the test case to fail. The test case otp_8949_a/1 has a helper function called otp_8949_a/0. Rename it to do_otp_8949_a/0. While at it, also fix a copy and paste bug in the list of test cases. otp_8949_a was run twice; otp_8949_b was never run.
2013-11-21Merge branch 'maint'Lukas Larsson
* maint: odbc: Add configure check for sql.h
2013-11-21Merge branch 'ia/odbc/sql.h/OTP-11483' into maintLukas Larsson
* ia/odbc/sql.h/OTP-11483: odbc: Add configure check for sql.h
2013-11-21odbc: Add configure check for sql.hIngela Anderton Andin
2013-11-20Merge branch 'maint'Sverker Eriksson
2013-11-20Merge branch 'sverk/hash_SUITE-bit_level_binaries' into maintSverker Eriksson
* sverk/hash_SUITE-bit_level_binaries: erts: Fix test case hash_SUITE:bit_level_binaries
2013-11-20Merge branch 'maint'Björn Gustavsson
* maint: Fix complicated union of INTEGER constraints
2013-11-20Merge branch 'bjorn/asn1/fix-union-bug/OTP-11411' into maintBjörn Gustavsson
* bjorn/asn1/fix-union-bug/OTP-11411: Fix complicated union of INTEGER constraints
2013-11-20Merge branch 'maint'Björn Gustavsson
* maint: Fix truncated pointers in erl_crash.dump
2013-11-20Merge branch 'bjorn/erts/fix-erl_crash_dump/OTP-11450' into maintBjörn Gustavsson
* bjorn/erts/fix-erl_crash_dump/OTP-11450: Fix truncated pointers in erl_crash.dump
2013-11-20Merge branch 'maint'Hans Nilsson
2013-11-20Merge branch 'hans/inets/ftps/OTP-11037' into maintHans Nilsson
* hans/inets/ftps/OTP-11037: ftp,ssl: Fixes broken type link (ssloption). ftp: Adds dynamic cert generation to tests. ftp: Clean Makefile and conf file ftp: Linking rfc-refs. ftp: Add documentation. ftp: delete old test files ftp: small fixes ftp: Add ftps documentation ftp: Add timeouts to ssl:connect ftps: working . added some printouts ftp: towards a working ftps, chapter 1 ftp: old ftp_SUITE re-written and works ftp: Implement ftps (upgrade to TLS) ftp: Implement ftps (upgrade to TLS)
2013-11-19ftp,ssl: Fixes broken type link (ssloption).Hans Nilsson
2013-11-19ftp: Adds dynamic cert generation to tests.Hans Nilsson
2013-11-19ftp: Clean Makefile and conf fileHans Nilsson
2013-11-19ftp: Linking rfc-refs.Hans Nilsson
2013-11-19ftp: Add documentation.Hans Nilsson
2013-11-19ftp: delete old test filesHans Nilsson
2013-11-19ftp: small fixesHans Nilsson
2013-11-19ftp: Add ftps documentationHans Nilsson
2013-11-19ftp: Add timeouts to ssl:connectHans Nilsson
2013-11-19ftps: workingHans Nilsson
2013-11-19.Hans Nilsson
2013-11-19added some printoutsHans Nilsson
2013-11-19ftp: towards a working ftps, chapter 1Hans Nilsson
2013-11-19ftp: old ftp_SUITE re-written and worksHans Nilsson
2013-11-19ftp: Implement ftps (upgrade to TLS)Ingela Anderton Andin
2013-11-19ftp: Implement ftps (upgrade to TLS)Ingela Anderton Andin
2013-11-19erts: Fix test case hash_SUITE:bit_level_binariesSverker Eriksson
Commontest doesn't like exported functions with same name as test case.
2013-11-19Merge branch 'maint'Björn-Egil Dahlberg
2013-11-19Merge branch 'egil/preloaded-debug_info' into maintBjörn-Egil Dahlberg
* egil/preloaded-debug_info: preloaded: Add debug_info to preloaded
2013-11-19Merge branch 'maint'Björn-Egil Dahlberg
2013-11-19Merge branch 'egil/clarify-erts-doc' into maintBjörn-Egil Dahlberg
* egil/clarify-erts-doc: erts: Clarify documentation for erlang:statistics(run_queue)
2013-11-18Merge branch 'maint'Fredrik Gustafsson
2013-11-18Merge branch 'metadave/dp_typo/OTP-11475' into maintFredrik Gustafsson
* metadave/dp_typo/OTP-11475: fixed typo
2013-11-18Merge branch 'maint'Siri Hansen
Conflicts: erts/preloaded/ebin/erl_prim_loader.beam
2013-11-18Merge branch 'siri/erl_prim_loader/normalize-and-backslash/OTP-11170' into maintSiri Hansen
* siri/erl_prim_loader/normalize-and-backslash/OTP-11170: Update preloaded Fix bug with backslash in erl_prim_loader:normalize/1
2013-11-18Merge branch 'maint'Fredrik Gustafsson
2013-11-18Merge branch 'fredrik/fix_tests_ssl_not_present/OTP-11474' into maintFredrik Gustafsson
* fredrik/fix_tests_ssl_not_present/OTP-11474: [eldap, inets]: fix testcases when ssl not is present
2013-11-18Merge branch 'maint'Fredrik Gustafsson
Conflicts: bootstrap/lib/kernel/ebin/os.beam
2013-11-18Merge branch 'mhssler/add-os-unsetenv/OTP-11446' into maintFredrik Gustafsson
* mhssler/add-os-unsetenv/OTP-11446: erts: remove ?line macro in testcases Update primary bootstrap Add os:unsetenv/1
2013-11-15Merge branch 'maint'Sverker Eriksson
2013-11-15Merge branch 'sverk/cerl-gdb-fix' into maintSverker Eriksson
* sverk/cerl-gdb-fix: erts: Fix cerl -gdb
2013-11-15Update preloadedSiri Hansen
2013-11-15Merge branch 'maint'Fredrik Gustafsson
2013-11-15Merge branch 'potatosalad/public_key_incorrect_emailaddress/OTP-11470' into ↵Fredrik Gustafsson
maint * potatosalad/public_key_incorrect_emailaddress/OTP-11470: public_key_SUITE: Rename id-at-countryName to id-emailAddress public_key: Workaround for incorrectly encoded utf8 emailAddress
2013-11-15Fix bug with backslash in erl_prim_loader:normalize/1Siri Hansen
This function normalizes a path: * convert atoms to strings * flatten strings * convert backslash to a forward slash The bugfix is to only convert backslashes to forward slashes on windows and not on any other platforms.
2013-11-14fixed typoDave Parfitt
2013-11-14Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin