aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-11-14Merge branch 'vd/jinterface_epmd_localhost'Henrik Nord
* vd/jinterface_epmd_localhost: OtpEpmd.lokupNames() may hang if network is badly configured OTP-10579
2012-11-14Merge remote branch 'upstream/maint'Ingela Anderton Andin
Conflicts: lib/ssl/src/ssl_connection.erl
2012-11-14Merge branch 'ia/ssl/terminate-handling/OTP-10574' into maintIngela Anderton Andin
* ia/ssl/terminate-handling/OTP-10574: ssl: Make sure that the ssl connection process will not hang in terminate function. ssl: Add default values to emulated socket options in internal record
2012-11-13Merge branch 'sverk/hipe-solaris-m4-bug/OTP-10577' into maintSverker Eriksson
* sverk/hipe-solaris-m4-bug/OTP-10577: erts: Change assembler comment for hipe on x86 and amd64 erts: Fix compile error on solaris in generated hipe_amd64_bifs.S
2012-11-13erts: Change assembler comment for hipe on x86 and amd64Sverker Eriksson
Previously done for ppc in c469d8ce14e9544a297d9af48c9da43137122d9a
2012-11-13erts: Fix compile error on solaris in generated hipe_amd64_bifs.SSverker Eriksson
2012-11-13ssl: Make sure that the ssl connection process will not hang in terminate ↵Ingela Anderton Andin
function. Avoid doing gen_tcp/inet socket operations in terminate if socket is already closed. Call gen_tcp:recv/3 in the "data delivery workaround" to avoid hanging.
2012-11-13ssl: Add default values to emulated socket options in internal recordIngela Anderton Andin
The absence of the active default values could cause a process leak
2012-11-12Merge branch 'sverk/halfword-valgrind-suppressions' into maintSverker Eriksson
* sverk/halfword-valgrind-suppressions: crypto: Add valgrind suppression for AES_cbc_encrypt erts: Expand valgrind suppression for zlib Add extra valgrind suppression file for halfword emulator
2012-11-12Merge branch 'maint'Björn Gustavsson
* maint: Fix compiler crash for binary matching and a complicated guard
2012-11-12Merge branch 'bjorn/compiler/binary-matching/OTP-10567' into maintBjörn Gustavsson
* bjorn/compiler/binary-matching/OTP-10567: Fix compiler crash for binary matching and a complicated guard
2012-11-12Fix merge from maintRickard Green
2012-11-12Merge branch 'maint'Rickard Green
* maint: ssl: Adopt test case to not take so long Fix bug in erts_port_task_schedule() Use reduction limit in order to determine when to do wakeup Conflicts: erts/emulator/beam/erl_port_task.c erts/emulator/beam/erl_process.c
2012-11-12Merge branch 'rickard/port-sched-bug/OTP-10556' into maintRickard Green
* rickard/port-sched-bug/OTP-10556: Fix bug in erts_port_task_schedule()
2012-11-12Merge branch 'rickard/sched-wakeup/OTP-10476' into maintRickard Green
* rickard/sched-wakeup/OTP-10476: Use reduction limit in order to determine when to do wakeup
2012-11-12ssl: Adopt test case to not take so longIngela Anderton Andin
2012-11-12Merge branch 'maint'Fredrik Gustafsson
* maint: Ssh appup modifications Updated appup for ssh Bumped revision Removed some testing variables ssh_opts is now a proper list After auth rsa and dsa passwords is set to undefined Removing the password after auth
2012-11-12Merge branch 'fredrik/ssh-password-conf/OTP-10511' into maintFredrik Gustafsson
* fredrik/ssh-password-conf/OTP-10511: Ssh appup modifications Updated appup for ssh Bumped revision Removed some testing variables ssh_opts is now a proper list After auth rsa and dsa passwords is set to undefined Removing the password after auth
2012-11-09Ssh appup modificationsFredrik Gustafsson
2012-11-09Merge branch 'maint'Lukas Larsson
* maint: Fix bug where require of same name at same config would return name in use
2012-11-09Merge branch 'lukas/common_test/multi_require_bug/OTP-10572' into maintLukas Larsson
* lukas/common_test/multi_require_bug/OTP-10572: Fix bug where require of same name at same config would return name in use
2012-11-09Fix bug where require of same name at same config would return name in useLukas Larsson
2012-11-09Merge remote branch 'upstream/maint'Ingela Anderton Andin
* upstream/maint: ssl: Do not use gen_fsm:sync_send_all_state_event/3 timeout
2012-11-09Merge branch 'ia/ssl/gen-fsm-timout/OTP-10569' into maintIngela Anderton Andin
* ia/ssl/gen-fsm-timout/OTP-10569: ssl: Do not use gen_fsm:sync_send_all_state_event/3 timeout
2012-11-09ssl: Do not use gen_fsm:sync_send_all_state_event/3 timeoutIngela Anderton Andin
The gen_fsm:sync_send_all_state_event/3 timout is a client side timeout. If timeouts are needed we want them to be server side timeouts.
2012-11-08Merge branch 'maint'Fredrik Gustafsson
* maint: Doc for quiet_mode SSH quiet mode
2012-11-08Merge branch 'fredrik/ssh-quiet-mode/OTP-10429' into maintFredrik Gustafsson
* fredrik/ssh-quiet-mode/OTP-10429: Doc for quiet_mode SSH quiet mode
2012-11-08Updated appup for sshFredrik Gustafsson
2012-11-08Merge branch 'maint'Björn Gustavsson
* maint: Fix binary append exceptions
2012-11-08Merge branch 'bjorn/erts/binary-append/OTP-10524' into maintBjörn Gustavsson
* bjorn/erts/binary-append/OTP-10524: Fix binary append exceptions
2012-11-08Doc for quiet_modeFredrik Gustafsson
2012-11-08Merge branch 'bjorn/ct/minor-corrections'Björn Gustavsson
* bjorn/ct/minor-corrections: test_server_io: Correct a few comments Handle ct:abort_current_testcase/1 when executing parallel groups Make sure that "Cover analysing..." is written to stdout Make sure that "Testing..." is not written if testing has finished
2012-11-08Merge branch 'bjorn/test_server/remove-remote-target-support'Björn Gustavsson
* bjorn/test_server/remove-remote-target-support: Remove stale support for remote target nodes
2012-11-08Remove stale support for remote target nodesBjörn Gustavsson
The support for remote target nodes has not worked in a long time. We are unlikely to ever need remot target node support and if we'll need it will be easier to start over from scratch.
2012-11-08Merge branch 'maint'Fredrik Gustafsson
2012-11-08Merge branch 'maint-r15' into maintFredrik Gustafsson
2012-11-08Merge branch 'maint'Anders Svensson
2012-11-08Merge branch 'anders/diameter/upgrade/OTP-10550' into maintAnders Svensson
* anders/diameter/upgrade/OTP-10550: Allow for no diameter on remote node in connection guard
2012-11-08Merge branch 'anders/diameter/peer_mapping/OTP-10470' into maintAnders Svensson
* anders/diameter/peer_mapping/OTP-10470: Document peer_ref() service_info Use peer_ref() service_info in traffic suite Add service_info for a peer_ref()
2012-11-08Merge branch 'anders/diameter/shared_transport/OTP-10443' into maintAnders Svensson
* anders/diameter/shared_transport/OTP-10443: Use multiple connections in traffic suite Implement service_opt() restrict_connections Document service_opt() restrict_connections
2012-11-08Merge branch 'anders/diameter/sequence_masks/OTP-10445' into maintAnders Svensson
* anders/diameter/sequence_masks/OTP-10445: Redo watchdog test suite Update/clarify some comments Add reopen message from watchdog Add options service_info Add diameter_reg:wait/1 Clarify diameter_transport doc Remove pre-OTP configure support Remove obsolete make target Use sequence masks in test suites Implement sequence masks Document sequence masks
2012-11-08Merge branch 'bjorn/stdlib/eliminate-param-module-use'Björn Gustavsson
* bjorn/stdlib/eliminate-param-module-use: dict_SUITE: Eliminate use of parameterized modules sets_SUITE: Eliminate use of parameterized modules
2012-11-08dict_SUITE: Eliminate use of parameterized modulesBjörn Gustavsson
Since the support for parameterized modules will be removed in R16, we should not use them in test cases.
2012-11-08sets_SUITE: Eliminate use of parameterized modulesBjörn Gustavsson
Since the support for parameterized modules will be removed in R16, we should not use them in test cases.
2012-11-07Bumped revisionFredrik Gustafsson
2012-11-07test_server_io: Correct a few commentsBjörn Gustavsson
2012-11-07Handle ct:abort_current_testcase/1 when executing parallel groupsBjörn Gustavsson
ct:abort_current_testcase/1 (which is a wrapper for the function with the same name in test_server_ctrl) would not work as expected when a group with parallel test cases was executing. Essentially, the abort_current_testcase message would be ignored until the group has finished and would then abort the end_per_group testcase for the group. Since there is no unique current testcase when a parallel group is executing, we must handle the abort_current_testcase message and return an error tuple. Also fix the bug that test_server_ctrl:abort_current_testcase/1 would always return 'ok'.
2012-11-07Make sure that "Cover analysing..." is written to stdoutBjörn Gustavsson
If it is written with io:fwrite/2 it will be written to the unexpected_io log, where it will not be of any use.
2012-11-07Make sure that "Testing..." is not written if testing has finishedBjörn Gustavsson
When writing messages to stdout, all messages are prefixed with "Testing" followed by the name of the test suite. We don't want to write that prefix if testing has stopped.
2012-11-07Merge branch 'siri/user_timetrap-group-test/OTP-10018'Siri Hansen
* siri/user_timetrap-group-test/OTP-10018: [common_test] Add tests for user timetraps in groups [test_server] Skip test cases if init_per_group fails in user timetrap [test_server] Add Config to run_test_case_msgloop/1 from the start
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 10:56:39 +0000