aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-06-10Merge branch 'hans/ssh/no_erlint_func/OTP-11697'Hans Nilsson
* hans/ssh/no_erlint_func/OTP-11697: ssh: Replace erlint/1 in ssh_message.erl and ssh_auth.erl
2015-06-10Merge branch 'hans/ssh/check_auth_methods_server/OTP-12790'Hans Nilsson
* hans/ssh/check_auth_methods_server/OTP-12790: ssh: change pwd->password for keyboard-interactive ssh save keybard-interactive data in #ssh{} ssh: make server check auth_methods when rec request
2015-06-10Merge branch 'hans/ssh/upgrade_suite/OTP-12676'Hans Nilsson
* hans/ssh/upgrade_suite/OTP-12676: ssh: Upgrade test suite
2015-06-10Merge branch 'nybek/fix_inet_drv_add_multi_timer_logic'Henrik Nord
* nybek/fix_inet_drv_add_multi_timer_logic: Fix add_multi_timer() in inet_drv Fix 6 tests in gen_tcp_misc_SUITE OTP-12817
2015-06-10Merge branch 'richcarl/avoid-try-native-load'Henrik Nord
* richcarl/avoid-try-native-load: Update list of funcalls in kernel code_SUITE Move architecture knowledge out of hipe loader Avoid repeated calls to system_info in hipe loader Avoid exception overhead if HiPE is disabled HiPE help shouldn't modify the calling process OTP-12816
2015-06-10Merge branch 'richcarl/break-out-asserts/OTP-12808'Björn Gustavsson
* richcarl/break-out-asserts/OTP-12808: Break out assert macros from eunit to stdlib assert.hrl
2015-06-10Merge branch 'ferd/deny-client-renegotiation'Henrik Nord
* ferd/deny-client-renegotiation: Add disable client-initiated renegotiation option Conflicts: lib/ssl/doc/src/ssl.xml lib/ssl/src/ssl.erl OTP-12815
2015-06-10Merge branch 'essen/fix-alpn-test'Henrik Nord
* essen/fix-alpn-test: ssl: Fix small error in an ALPN test
2015-06-10Merge branch 'ia/ssl/appup'Ingela Anderton Andin
* ia/ssl/appup: ssl: Update appup for 18
2015-06-09ssh: Upgrade test suiteHans
This suite tests that upgrade/downgrade works from/to both minor and major versions. It is modelled after the ssl_upgrade_SUITE. A precondition for success is that the ssh.appup file is correct.
2015-06-09ssh: change pwd->password for keyboard-interactiveHans Nilsson
2015-06-09ssh save keybard-interactive data in #ssh{}Hans Nilsson
2015-06-09ssh: make server check auth_methods when rec requestHans Nilsson
2015-06-09ssh: Replace erlint/1 in ssh_message.erl and ssh_auth.erlHans
In the old times there was no binary notation which handled this particulary case, but now we can write big-signed-integer-unit:8 directly in binaries. The undocumented internal function ssh_bits:erlint/1 is removed.
2015-06-09Merge branch 'hans/ssh/cuddle_tests'Hans Nilsson
* hans/ssh/cuddle_tests: ssh: add test cases for disconnectfun
2015-06-09Merge branch 'hans/ssh/missing_doc'Hans Nilsson
* hans/ssh/missing_doc: ssh: add missing doc for option auth_method_kb_interactive_data
2015-06-09Merge branch 'scrapinghub/asn1_for_http_proxy_suite'Zandra Hird
* scrapinghub/asn1_for_http_proxy_suite: inets: add asn1 to httpc proxy suite
2015-06-09Merge branch 'dgud/wx/float-return'Dan Gudmundsson
* dgud/wx/float-return: wx: Optimize binary args wx: Driver lock cleanup wx: Optimize event and return value construction wx: Cleanup tests wx: Fix bad float in return values
2015-06-08ssh: add test cases for disconnectfunHans Nilsson
OTP-12786
2015-06-08Merge branch 'ia/ssh/name-spaces/OTP-12675'Ingela Anderton Andin
* ia/ssh/name-spaces/OTP-12675: ssh: Correct Makefile ssh: Add profile option
2015-06-08Merge branch 'ia/inets/name-spaces/OTP-12674'Ingela Anderton Andin
* ia/inets/name-spaces/OTP-12674: inets: Modernize code inets: Add profile option
2015-06-08Merge branch 'richcarl/shut-up-xmerl'Henrik Nord
* richcarl/shut-up-xmerl: Stop xmerl printing to stdout OTP-12810
2015-06-08Merge branch 'lharc/ct2'Henrik Nord
* lharc/ct2: ct_slave: ssh_port, ssh_opts options to start/3 common_test: start ssh and dependencies OTP-12809
2015-06-08Merge branch 'egil/fix-inet_res'Björn-Egil Dahlberg
* egil/fix-inet_res: kernel: Fix inet time conversion
2015-06-08kernel: Fix inet time conversionBjörn-Egil Dahlberg
2015-06-08ssh: add missing doc for option auth_method_kb_interactive_dataHans Nilsson
2015-06-08Merge branch 'hans/ssh/cuddle_tests'Hans Nilsson
* hans/ssh/cuddle_tests: ssh: Change to ct:sleep in ssh_basic_SUITE ssh: add empty password to the probing ssh_test_lib:openssh_sanity_check/1 ssh: Replace ct:sleep with timer:sleep for long sleeps ssh: timeout fixes in ssh_basic_SUITE
2015-06-08Merge branch 'mikpe/mnesia-openlog-emfile'Henrik Nord
* mikpe/mnesia-openlog-emfile: mnesia: don't delete log file on emfile error OTP-12807
2015-06-08Merge branch 'egil/fix-internal_hash-list-opt'Björn-Egil Dahlberg
* egil/fix-internal_hash-list-opt: erts: Fix faulty list optimization in make_internal_hash
2015-06-08erts: Fix faulty list optimization in make_internal_hashBjörn-Egil Dahlberg
Reported-by: Rory Byrne
2015-06-08ssl: Update appup for 18Ingela Anderton Andin
2015-06-05Merge branch 'henrik/typo-fix-branch'Henrik Nord
* henrik/typo-fix-branch: Fixing typo
2015-06-05Merge branch 'richcarl/eunit-2.2.10'Henrik Nord
* richcarl/eunit-2.2.10: bumped revision clean up a comment Improve surefire xml <testcase> element Conflicts: lib/eunit/src/eunit_surefire.erl lib/eunit/vsn.mk
2015-06-05inets: add asn1 to httpc proxy suiteKirilll Zaborsky
httpc_proxy_SUITE should have asn1 properly started to be invokable standaone
2015-06-05Merge branch 'hans/ssh/check_dirs/OTP-12788'Hans Nilsson
* hans/ssh/check_dirs/OTP-12788: ssh: Check that user_dir and system_dir exists and are readable
2015-06-05Merge branch 'hans/ssh/disconnectfun/OTP-12789'Hans Nilsson
* hans/ssh/disconnectfun/OTP-12789: ssh: make disconnectfun work for both server&client
2015-06-05ssh: Check that user_dir and system_dir exists and are readableHans
2015-06-05Merge branch 'scrapinghub/proper_stop_on_handling_keepalive_queue'Zandra Hird
* scrapinghub/proper_stop_on_handling_keepalive_queue: inets: proper stop for httpc_handler K-A queue failure OTP-12803
2015-06-05ssh: Change to ct:sleep in ssh_basic_SUITEHans
2015-06-05Merge branch 'dgud/observer/cdw-update/OTP-12363'Dan Gudmundsson
* dgud/observer/cdw-update/OTP-12363: observer: cdv add scheduler information observer: cdv add more ets information Reorder scheduler information in crashdumps
2015-06-05observer: cdv add scheduler informationDan Gudmundsson
New info in 18.
2015-06-05observer: cdv add more ets informationDan Gudmundsson
Info available from erl-18 nodes.
2015-06-05Reorder scheduler information in crashdumpsDan Gudmundsson
To make it easier to parse stack trace information from tools
2015-06-05Merge branch 'bjorn/kernel/cuddle-with-tests'Björn Gustavsson
* bjorn/kernel/cuddle-with-tests: Clean up rpc_SUITE:call_benchmark/1 Eliminate use of erlang:now/0 for generating random numbers Eliminate use of erlang:now/0 for measuring time Eliminate use of erlang:now/0 for generating unique node names
2015-06-05Clean up rpc_SUITE:call_benchmark/1Björn Gustavsson
The call_benchmark/1 test case is supposed to return a comment about the number of RPC calls per second, but the return value from the function that produces the comment (do_call_benchmark/4) is ignored. The test case is essentially useless except as a smoke test. Simplify the test case and correct the showing of the number of RPC calls per second, as well as eliminate the use of erlang:now/0.
2015-06-05wx: Optimize binary argsDan Gudmundsson
2015-06-04Fix add_multi_timer() in inet_drvRory Byrne
Fix the sorting logic in add_multi_timer() and expand the test case coverage around this area.
2015-06-04ssh: add empty password to the probing ssh_test_lib:openssh_sanity_check/1Hans
This is to give a quick end if the test is run a maskin where it can't log in to the OpenSSH server.
2015-06-04Merge branch 'zhird/leoliu/dbg_wx_trace/arg-to-gui_enable_updown'Zandra Hird
* zhird/leoliu/dbg_wx_trace/arg-to-gui_enable_updown: Fix argument to gui_enable_updown in dbg_wx_trace:init/6
2015-06-04Fix 6 tests in gen_tcp_misc_SUITERory Byrne
All of the tests are related to gen_tcp:accept/[1,2] and each of them has the same problem: they ignore the return value of the ?EXPECT_ACCEPTS macro.