aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-03-09Merge branch 'peppe/common_test/html_improvements' into maintPeter Andersson
* peppe/common_test/html_improvements: Fix problems with formatted test_server printouts Make sure special characters are escaped in e.g. pal and log printouts Conflicts: lib/test_server/src/test_server.erl
2016-03-09Merge branch 'bjorn/cuddle-with-tests' into maintBjörn Gustavsson
* bjorn/cuddle-with-tests: io_SUITE: Don't fail on fast computers with rough timers
2016-03-09Merge branch 'siri/crashdump-dir/OTP-13388' into maintSiri Hansen
* siri/crashdump-dir/OTP-13388: Fix code_SUITE after test_server change Set default value for crash_dump_dir
2016-03-09Merge branch 'anders/diameter/18/dialyzer/OTP-13400' into maintAnders Svensson
* anders/diameter/18/dialyzer/OTP-13400: Fix dialyzer warnings
2016-03-08erts: Fix alloc_SUITE:rbtree and migration for win64Sverker Eriksson
One little (unsigned long) left behind.
2016-03-08Merge branch 'anders/diameter/18.3/OTP-13322' into maintAnders Svensson
* anders/diameter/18.3/OTP-13322: vsn -> 1.11.2 Update appup for 18.3
2016-03-08Merge branch 'peppe/common_test/cth_improvements' into maintPeter Andersson
* peppe/common_test/cth_improvements: Add missing internal hook functions Fix remaining issues Update ct_hooks test suites Introduce new CT hook functions OTP-13242
2016-03-08Merge branch 'peppe/common_test/rm_unwanted_tests' into maintPeter Andersson
* peppe/common_test/rm_unwanted_tests: Fix remaining issues Enable execution of multiple test cases or groups from a test spec term OTP-13241
2016-03-08Merge branch 'henrik/doc-fixes' into maintHenrik Nord
* henrik/doc-fixes: Fix typo in INSTALL.md Update README.md Fix typo in 'app' documentation s/is/are
2016-03-08Merge branch 'sverk/bad_printable_range' into maintSverker Eriksson
* sverk/bad_printable_range: stdlib: Fix io_SUITE:bad_printable_range for windows
2016-03-08Fix problems with formatted test_server printoutsPeter Andersson
2016-03-08Make sure special characters are escaped in e.g. pal and log printoutsPeter Andersson
2016-03-08Merge remote-tracking branch 'origin/dgud/wx/bugs' into maintDan Gudmundsson
* origin/dgud/wx/bugs: wx: Use wrapper classes where possible wx: Wait before throwing away early callbacks to wx_objects wx: Add wxWindow:SetTransparent and CanSetTransperant wx: Add wxWindow SetDoubleBuffered and IsDoubleBuffered from wxWidgets 3.0 wx: Remove http_util usage wx: Tiny optimization wx: Fix a crash with sending two binaries to command queue
2016-03-08Merge branch 'dgud/test-cuddle' into maintDan Gudmundsson
* dgud/test-cuddle: Test windows registry in places we are allowed to write test: do not divide by zero
2016-03-08Test windows registry in places we are allowed to writeDan Gudmundsson
Since Windows 8 we are not allowed (in non elevated mode) to write to hklm.
2016-03-08test: do not divide by zeroDan Gudmundsson
2016-03-07Fix dialyzer warningsAnders Svensson
Whether making record declarations unreadable to compensate for dialyzer's ignorance of match specs is worth it is truly debatable.
2016-03-07Merge branch 'anders/diameter/retransmission/OTP-13342' into maintAnders Svensson
* anders/diameter/retransmission/OTP-13342: Fix handling of shared peer connections in watchdog state SUSPECT Remove unnecessary parentheses Remove dead export
2016-03-07Merge branch 'anders/diameter/18/performance/OTP-13164' into maintAnders Svensson
* anders/diameter/18/performance/OTP-13164: Make peer handling more efficient Remove unnecessary erlang:monitor/2 qualification
2016-03-07stdlib: Fix io_SUITE:bad_printable_range for windowsSverker Eriksson
avoid os:cmd as it treats stderr different on windows.
2016-03-07io_SUITE: Don't fail on fast computers with rough timersBjörn Gustavsson
On a computer which is fast, but with timers with low resolution, the measured time for an empty queue could be zero, which could cause the test case to fail. Add a calibration function to scale up the amount the amount of work so that the measured time will not be lower than 50 ms.
2016-03-07Merge branch 'msantos/tftp-wrap-block-counter/PR-965' into maintRaimo Niskanen
* msantos/tftp-wrap-block-counter/PR-965: tftp: support transfer of files > 65535 blocks
2016-03-07Merge branch 'bjorn/asn1/fix-recursion-problem' into maintBjörn Gustavsson
* bjorn/asn1/fix-recursion-problem: asn1_SUITE_value: Don't test the LDAP module
2016-03-05Add missing internal hook functionsPeter Andersson
2016-03-04Fix remaining issuesPeter Andersson
2016-03-03Fix remaining issuesPeter Andersson
2016-03-03asn1_SUITE_value: Don't test the LDAP moduleBjörn Gustavsson
asn1ct:test(Mod) will generate sample values for data types in an ASN.1 modules. The following definition from LDAP can cause problems for asn1ct:test/1: Filter ::= CHOICE { and [0] SET SIZE (1..MAX) OF filter Filter, or [1] SET SIZE (1..MAX) OF filter Filter, not [2] Filter, equalityMatch [3] AttributeValueAssertion, substrings [4] SubstringFilter, greaterOrEqual [5] AttributeValueAssertion, lessOrEqual [6] AttributeValueAssertion, present [7] AttributeDescription, approxMatch [8] AttributeValueAssertion, extensibleMatch [9] MatchingRuleAssertion, ... } If we were unlucky (which we were on some computers), the construction of sample values would not terminate. Eliminate the problem for now by not testing the LDAP module. This workaround should be removed when we have added some limitation to the recursion in asn1ct_value when generating values.
2016-03-03Fix code_SUITE after test_server changeSiri Hansen
test_server:start_node does no longer add the test_server path to the new node, since the needed code is present in the default path. This caused two test cases in code_SUITE to fail. code_SUITE:mult_lib_roots: Expected the test_server path to be first in the code path. This check is removed. code_SUITE:bad_erl_libs: Started a node with "-env ERL_LIBS ", i.e. not giving any value to the ERL_LIBS variable. This test succeeded by accident, since the combination with arguments set by test_server_node.erl and by slave.erl caused the node start to work, and no further checks were present in the test. This part of the test case is now removed.
2016-03-03Set default value for crash_dump_dirSiri Hansen
test_server_sup:crash_dump_dir() is expected to return {ok,Dir}, but if there was no test framework set, then it would return just 'ok'. To avoid crash, the function will no returm {ok,Cwd} if no framework is set.
2016-03-02Merge branch 'ia/msantos/unsupported-protocols' into maintIngela Anderton Andin
* ia/msantos/unsupported-protocols: Skips any sockets with unsupported protocols.
2016-03-02Skips any sockets with unsupported protocols.Ingela Anderton Andin
Patch from end of PR 864 Fixes problem reported in the PR by jeckersb In this error case, a negative file descriptor is now saved at listensock[i], which leads to a buffer overflow later on at https://github.com/msantos/otp/blob/epmd-IPv6-node-reg2/erts/epmd/src/epmd_srv.c#L498 when calling FD_ISSET(listensock[i],&read_mask). To reproduce this: Completely disable IPv6 with ipv6.disable=1 on the kernel command line Build with fortified code (RHEL/CentOS default): CFLAGS='-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic -fno-strict-aliasing'
2016-03-02Merge branch 'legoscia/tls_ipv6_dist' into maintHenrik Nord
* legoscia/tls_ipv6_dist: Add inet6_tls_dist, for TLS distribution over IPv6 Conflicts: lib/ssl/src/ssl_tls_dist_proxy.erl OTP-13391
2016-03-02Merge branch 'ia/inets/httpd-gracefull-error/OTP-13389' into maintIngela Anderton Andin
* ia/inets/httpd-gracefull-error/OTP-13389: inets: No error reports for expected termination
2016-03-02Merge branch 'siri/ct_netconfc/log-open-close/OTP-13386' into maintSiri Hansen
* siri/ct_netconfc/log-open-close/OTP-13386: Log open and close of netconf connections
2016-03-02Merge branch 'ia/public_key/missinig-nl/OTP-13381' into maintIngela Anderton Andin
* ia/public_key/missinig-nl/OTP-13381: public_key: An encapsulated PEM header shall be followed by a blank line
2016-03-02Merge branch 'siri/crashdump-dir/OTP-13388' into maintSiri Hansen
* siri/crashdump-dir/OTP-13388: Set dir for slave node's erl_crash.dump
2016-03-01wx: Use wrapper classes where possibleDan Gudmundsson
2016-03-01Set dir for slave node's erl_crash.dumpSiri Hansen
This was earlier filename:dirname(code:which(test_server)). On Microsoft Windows, this pointed to a directory under c:/Program Files, and in later versions this directory is no longer writable. The framework (common_test) log dir is now used instead.
2016-03-01Merge branch 'sverk/halt-INT_MIN' into maintSverker Eriksson
OTP-13251 * sverk/halt-INT_MIN: erts: Make erlang:halt() accept bignums as Status erts: Change erl_exit into erts_exit kernel: Remove calls to erl_exit
2016-03-01Merge branch 'msantos/epmd-IPv6-node-reg2/PR-864/OTP-13364' into maintIngela Anderton Andin
* msantos/epmd-IPv6-node-reg2/PR-864/OTP-13364: epmd: support IPv6 node registration
2016-03-01wx: Wait before throwing away early callbacks to wx_objectsDan Gudmundsson
If synced callbacks arrive early before the return value from init had been synced to proc_lib. The callbacks where ignored. Added a short timeout to avoid the scheduling raise but we don't want block the wxe_server in case of deadlock in init, so sleep for a short while and check again, and drop the callback when init takes to long.
2016-03-01inets: No error reports for expected terminationIngela Anderton Andin
2016-03-01Log open and close of netconf connectionsSiri Hansen
Commit 4cf832f1ad163f5b25dd8a6f2d314c169c23c82f erroneously removed logging of open and close of netconf connections. This is now corrected.
2016-03-01Update ct_hooks test suitesPeter Andersson
2016-03-01Introduce new CT hook functionsPeter Andersson
2016-02-29Merge branch 'maint-r16' into maintSverker Eriksson
Fake merge. OTP-13384 was backported from OTP 18.
2016-02-29Enable execution of multiple test cases or groups from a test spec termPeter Andersson
2016-02-29Merge branch 'hans/ssh/maint_cuddle_tests' into maintHans Nilsson
2016-02-29vsn -> 1.11.2Anders Svensson
2016-02-29Update appup for 18.3Anders Svensson
OTP-13164 more efficient peer lookup OTP-13342 remote watchdog transition into state SUSPECT