aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-07-11Merge branch 'siri/cuddle-master'Siri Hansen
* siri/cuddle-master: Make crashdump_viewer_SUITE independent of OTP version
2016-07-11Merge branch 'maint'Lukas Larsson
* maint: erts: After a call to a tracer nif, reset htop erts: Check if return_to trace is enabled for bif
2016-07-11Merge branch 'lukas/erts/tracing/bif_return_to_trace_fix/OTP-13734' into maintLukas Larsson
* lukas/erts/tracing/bif_return_to_trace_fix/OTP-13734: erts: After a call to a tracer nif, reset htop erts: Check if return_to trace is enabled for bif
2016-07-11erts: After a call to a tracer nif, reset htopLukas Larsson
This is needed in order for the heap to never contain any pointers to invalid memory. This is good for performance and debugging reasons.
2016-07-11Merge branch 'maint'Lukas Larsson
2016-07-11Merge branch 'lukas/erts/spawn_driver_relative_cd/ERL-175/OTP-13733' into maintLukas Larsson
* lukas/erts/spawn_driver_relative_cd/ERL-175/OTP-13733: erts: Add port_SUITE:cd invalid dir testcase erts: Fix spawn driver with relative cd option erts: Fix HARD_DEBUG printouts in erl_child_setup erts: Improve error printouts in erl_child_setup Conflicts: erts/emulator/test/port_SUITE.erl
2016-07-08Merge branch 'maint'Ingela Anderton Andin
2016-07-08Merge branch 'ingela/odbc/ctify' into maintIngela Anderton Andin
* ingela/odbc/ctify: odbc: Convert doc clauses form test_server to ct odbc: Replace test_server with ct eqvivalents odbc: Remove legacy config macros odbc: Remove legacy suite clauses from test suites
2016-07-08Merge branch 'maint'Ingela Anderton Andin
2016-07-08Merge branch 'ingela/ssl/ECC-select-hash-sign/OTP-13711' into maintIngela Anderton Andin
* ingela/ssl/ECC-select-hash-sign/OTP-13711: ssl: Correct handling of signature algorithm selection ssl: Simplify and refactor tests
2016-07-08ssl: Correct handling of signature algorithm selectionIngela Anderton Andin
In TLS-1.2 the selection of the servers algorithms and the the possible selection of algorithms for the client certificate verify message have different requirements.
2016-07-08ssl: Simplify and refactor testsIngela Anderton Andin
Tests in ECC_SUITE did not always use the certs implied by the name. Variable naming also confused the intent. ssl_certificate_verify_SUITE did not clean up properly and tests could fail due to cache problems.
2016-07-08erts: Check if return_to trace is enabled for bifLukas Larsson
We have to do an extra check if the return_to trace is enabled here as it may have been cleared by the bif after the flags where created by the call_trace.
2016-07-07Merge branch 'maint'Sverker Eriksson
2016-07-07Merge branch 'sverker/child-setup-debugging' into maintSverker Eriksson
2016-07-07Merge branch 'maint'Sverker Eriksson
2016-07-07Merge branch 'sverker/spawn-driver-env-test' into maintSverker Eriksson
2016-07-07Merge branch 'maint'Hans Bolinder
* maint: wx: Prepare for using Erlang types and specs syntax_tools: Improve types syntax_tools: Improve seealso:s referring to types erl_docgen: Allow 'seealso' in 'name' erl_docgen: Generate type links in callback module creating erlref erl_docgen: Correct callback module for creating erlref erl_docgen: Improve callback module for creating erlref edoc: Correct types
2016-07-07Merge branch 'hasse/erl_docgen/generated_type_links/ERL-120/OTP-13720' into ↵Hans Bolinder
maint * hasse/erl_docgen/generated_type_links/ERL-120/OTP-13720: wx: Prepare for using Erlang types and specs syntax_tools: Improve types syntax_tools: Improve seealso:s referring to types erl_docgen: Allow 'seealso' in 'name' erl_docgen: Generate type links in callback module creating erlref erl_docgen: Correct callback module for creating erlref erl_docgen: Improve callback module for creating erlref edoc: Correct types
2016-07-07wx: Prepare for using Erlang types and specsHans Bolinder
Create correct links to datatypes outside of the wx application. The added time for generating the doc/specs/specs_* files is unwelcome (they are currently not used).
2016-07-07syntax_tools: Improve typesHans Bolinder
2016-07-07syntax_tools: Improve seealso:s referring to typesHans Bolinder
Extract specs och types from source files, which ensures that seealso:s referring to, for example, erl_parse:abstract_form(), are assigned working links.
2016-07-07erl_docgen: Allow 'seealso' in 'name'Hans Bolinder
2016-07-07erl_docgen: Generate type links in callback module creating erlrefHans Bolinder
Create links to types, but generate no links to local types.
2016-07-07erl_docgen: Correct callback module for creating erlrefHans Bolinder
Show map fields correctly.
2016-07-07erl_docgen: Improve callback module for creating erlrefHans Bolinder
Create `Module:Type()' instead of `Type() (see module Module)'.
2016-07-07edoc: Correct typesHans Bolinder
2016-07-07Merge branch 'maint'Hans Bolinder
* maint: syntax_tools: Make erl_tidy work on input file with tilde
2016-07-07Merge branch ↵Hans Bolinder
'mbucc/syntax_tools/fix_erl_tidy_tilde/ERL-151/PR-1071/OTP-13725' into maint * mbucc/syntax_tools/fix_erl_tidy_tilde/ERL-151/PR-1071/OTP-13725: syntax_tools: Make erl_tidy work on input file with tilde
2016-07-06syntax_tools: Make erl_tidy work on input file with tildeMark Bucciarelli
See also http://bugs.erlang.org/browse/ERL-151.
2016-07-06Merge branch 'maint'Hans Bolinder
* maint: dialyzer: Suppress warns on generated case stmts
2016-07-06Merge branch 'margnus1/dialyzer/suppress_warns/ERL-159/PR-1121/OTP-13723' ↵Hans Bolinder
into maint * margnus1/dialyzer/suppress_warns/ERL-159/PR-1121/OTP-13723: dialyzer: Suppress warns on generated case stmts
2016-07-05Merge branch 'sverker/gcbif-trace-wrapper'Sverker Eriksson
2016-07-05Merge branch 'maint'Sverker Eriksson
2016-07-05Merge branch 'hipe-trap-gc/PR-1116/OTP-13724' into maintSverker Eriksson
* hipe-trap-gc/PR-1116: hipe: Fix bug in trap frame allocation wrappers hipe: Add assertion for gc in bif without wrapper
2016-07-05erts: Add port_SUITE:cd invalid dir testcaseLukas Larsson
2016-07-05Merge branch 'maint'Hans Bolinder
* maint: Fix return value spec for ets:match_object
2016-07-05Merge branch 'iilyak/stdlib/correct_ets_specs/PR-1113/OTP-13721' into maintHans Bolinder
* iilyak/stdlib/correct_ets_specs/PR-1113/OTP-13721: Fix return value spec for ets:match_object
2016-07-04dialyzer: Suppress warns on generated case stmtsMagnus Lång
Warnings about clauses that cannot match and are also compiler generated are suppressed unless none of the clauses return. This feature is useful for non-Erlang BEAM languages (such as Elixir) that compile to Erlang and expand certain language constructs into case statements. In that case, as long as the language construct can succeed, these warnings are undesired and appear spurious to users that do not check the Erlang code that their program expands into. Thanks to José Valim for the test (slightly modified).
2016-07-04Merge branch 'maint'Hans Bolinder
* maint: edoc: Provide a slightly better fix for unmatched returns
2016-07-04Fix return value spec for ets:match_objectILYA Khlopotov
ets:match_object/1 and ets:match_object/3 return list of matches
2016-07-04Merge branch 'kostis/edoc/minor_changes' into maintHans Bolinder
* kostis/edoc/minor_changes: edoc: Provide a slightly better fix for unmatched returns
2016-07-04edoc: Provide a slightly better fix for unmatched returnsKostis Sagonas
An attempt to shut off Dialyzer's unmatched return warnings made a change that simply ignored the return type of a function. It's arguably better to modify the code of this function to not return something "by accident." While at it, rewrote a slighty confusing use of a list comprehension without a generator to a case statement.
2016-07-01erts: Fix gcbif trace wrappersSverker Eriksson
Broken on master by f0f4e72c8ec5c08993ff.
2016-07-01Merge branch 'maint'Ingela Anderton Andin
2016-07-01Merge branch 'ingela/ssl/dist-stop-nodes' into maintIngela Anderton Andin
* ingela/ssl/dist-stop-nodes: ssl: All started test nodes must be cleaned up
2016-07-01erts: Fix spawn driver with relative cd optionLukas Larsson
2016-07-01erts: Fix HARD_DEBUG printouts in erl_child_setupLukas Larsson
2016-07-01erts: Improve error printouts in erl_child_setupLukas Larsson
Add prints to stderr with a small description of the error so that errors will be easier to debug. Also if a protocol error is detected, erl_child_setup will abort instead of exit.
2016-07-01Merge branch 'maint'Ingela Anderton Andin