aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-08-31Merge branch 'bjorn/fix-make/OTP-13855' into maintBjörn Gustavsson
* bjorn/fix-make/OTP-13855: make, ct_make: Handle warning attributes in source files
2016-08-31Merge branch 'gotthardp/crypto/add-cmac/ERL-82/PR-1138/OTP-13779'Raimo Niskanen
* gotthardp/crypto/add-cmac/ERL-82/PR-1138/OTP-13779: Skip the cmac test cases on older OpenSSL Added a reference to cmac RFC in the description part of the man page Fix building crypto/cmac_nif on 64-bit machines. crypto:cmac calculating the Cipher-based Message Authentication Code
2016-08-31Merge branch 'maint'Raimo Niskanen
2016-08-31Merge branch 'raimo/gen_statem-callback_mode/OTP-13752' into maintRaimo Niskanen
* raimo/gen_statem-callback_mode/OTP-13752: ssl: Upgrade suite testing skipped if stdlib upgrade is required Fix version numbers and dependencies Conflicts: lib/ssl/src/ssl.appup.src lib/ssl/vsn.mk
2016-08-31Merge branch 'master' of git-server.otp.ericsson.se:otpHans Nilsson
2016-08-31Merge branch 'maint' of git-server.otp.ericsson.se:otp into maintHans Nilsson
2016-08-31Merge branch 'maint'Hans Nilsson
2016-08-31Merge branch 'hans/ssh/test_fixes/OTP-13854' into maintHans Nilsson
Fixes problems found by test suites as well as by Codenomicon/Defensics: - reduce max random padding to 15 bytes (Codenomicon/Defensics) - inclomplete pdu handling (Codenomicon/Defensics) - badmatch - non-blocking send fixes deadlock in ssh_connection_SUITE:interrupted_send
2016-08-31Merge branch 'maint'Ingela Anderton Andin
2016-08-31Merge branch 'ingela/ssl/cuddle' into maintIngela Anderton Andin
* ingela/ssl/cuddle: ssl: Test and test suites shall be independent of each other
2016-08-31Merge branch 'maint'Hans Nilsson
2016-08-31Merge branch 'hans/ssh/ensure_all_started/PR-1147/OTP-13843' into maintHans Nilsson
2016-08-31Merge branch 'maint'Ingela Anderton Andin
2016-08-31Merge branch 'ingela/ssl/gracefulness/OTP-13834' into maintIngela Anderton Andin
* ingela/ssl/gracefulness/OTP-13834: ssl: Gracefulness behaviour when receiving partially malformed messages
2016-08-31ssl: Gracefulness behaviour when receiving partially malformed messagesIngela Anderton Andin
2016-08-30Merge branch 'maint'Ingela Anderton Andin
2016-08-30Merge branch 'ingela/ssl/ERL-232/OTP-13853' into maintIngela Anderton Andin
* ingela/ssl/ERL-232/OTP-13853: ssl: Remove clause that postponed unexpected messages
2016-08-30Merge branch 'maint'Ingela Anderton Andin
2016-08-30Merge branch 'ingela/ssl/tests-timouts' into maintIngela Anderton Andin
* ingela/ssl/tests-timouts: ssl: Timeout tuning
2016-08-30ssl: Timeout tuningIngela Anderton Andin
Skip some test on really slow solaris machines
2016-08-30Fix is-dirty-cpu/is-dirty-io scheduler predicatesRickard Green
2016-08-30Merge branch 'maint'Sverker Eriksson
2016-08-30Merge branch 'sverker/erl_interface/vxworks-socklen_t' into maintSverker Eriksson
2016-08-30Ensure correct mbuf_sz value in process structureRickard Green
2016-08-30Merge branch 'maint'Sverker Eriksson
2016-08-30Merge branch 'sverker/erl_interface-win-home/OTP-13849' into maintSverker Eriksson
* sverker/erl_interface-win-home: erl_interface: Look for .erlang.cookie in windows directory erl_interface: Refactor get_home()
2016-08-30Merge branch 'rickard/time-unit/OTP-13735' into maintRickard Green
* rickard/time-unit/OTP-13735: Update test-cases to use new symbolic time units Replace misspelled symbolic time units Conflicts: erts/doc/src/erlang.xml erts/emulator/test/long_timers_test.erl
2016-08-30Merge branch 'maint'Sverker Eriksson
2016-08-30erts: Improve z_SUITE:core_filesSverker Eriksson
to print name of test log dir in same dir as core, which will indicate offending application.
2016-08-30Merge branch 'maint'Rickard Green
* maint: Fix dirty schedulers build on windows
2016-08-30Merge branch 'rickard/ds-win-32bit/OTP-13759' into maintRickard Green
* rickard/ds-win-32bit/OTP-13759: Fix dirty schedulers build on windows
2016-08-30Merge branch 'maint'Rickard Green
* maint: Fix dirty_nif_SUITE:dirty_call_while_terminated test case Adjust process_SUITE:no_priority_inversion2 Allow larger timeout delay in driver_SUITE Ignore long time failures during high CPU utilization Cleanup in statistics_SUITE:runtime_update test Improve timer tests in driver_SUITE Fix statistics_SUITE:scheduler_wall_time test Fix scheduler_SUITE:scheduler_suspend test Fix scheduler_SUITE:scheduler_threads test Fix scheduler_SUITE:update_cpu_info test Skip nif_SUITE:consume_timeslice test when debug compiled Increase time margin in timer_bif_SUITE:start_timer_1 test
2016-08-30Merge branch 'rickard/test-cuddle' into maintRickard Green
* rickard/test-cuddle: Fix dirty_nif_SUITE:dirty_call_while_terminated test case Adjust process_SUITE:no_priority_inversion2 Allow larger timeout delay in driver_SUITE Ignore long time failures during high CPU utilization Cleanup in statistics_SUITE:runtime_update test Improve timer tests in driver_SUITE Fix statistics_SUITE:scheduler_wall_time test Fix scheduler_SUITE:scheduler_suspend test Fix scheduler_SUITE:scheduler_threads test Fix scheduler_SUITE:update_cpu_info test Skip nif_SUITE:consume_timeslice test when debug compiled Increase time margin in timer_bif_SUITE:start_timer_1 test
2016-08-30Fix dirty_nif_SUITE:dirty_call_while_terminated test caseRickard Green
Prevent binary from being prematurely GCed
2016-08-30Adjust process_SUITE:no_priority_inversion2Rickard Green
2016-08-30Merge branch 'maint'Sverker Eriksson
2016-08-30Merge branch 'sverker/load-corrupt-beam/ERL-216/OTP-13848' into maintSverker Eriksson
* sverker/load-corrupt-beam/ERL-216: erts:: Unsignify a bunch of loader variables erts: Reject an invalid beam code header size erts: Fix load of beam with invalid imports and atom numbers
2016-08-30Forgot ticket OTP-13846Sverker Eriksson
for PR-1146 merged at f3e018dc3bb3c74b88c7454f6a1888938215f912
2016-08-30make, ct_make: Handle warning attributes in source filesBjörn Gustavsson
epp learned to handle the -warning() directive in 14d72f02, but make and ct_make were not updated to expect a {warning,_} return value from epp:parse_erl_form/1.
2016-08-29Merge branch 'maint'Rickard Green
* maint: Fix tracing of processes executing dirty Perform check_process_code while process is executing dirty Fix purge of code Reclaim literal area after purge has completed Separate literal area from code Conflicts: erts/emulator/beam/global.h
2016-08-29Merge branch 'rickard/ds-trace/OTP-13822' into maintRickard Green
* rickard/ds-trace/OTP-13822: Fix tracing of processes executing dirty
2016-08-29Merge branch 'rickard/ds-purge-module/OTP-13808' into maintRickard Green
* rickard/ds-purge-module/OTP-13808: Perform check_process_code while process is executing dirty Conflicts: erts/doc/src/erl_nif.xml
2016-08-29Merge branch 'rickard/fun-purge-bug/OTP-13809' and ↵Rickard Green
'rickard/new-purge-strategy/OTP-13833' into maint * rickard/fun-purge-bug/OTP-13809: Fix purge of code Reclaim literal area after purge has completed Separate literal area from code Conflicts: erts/doc/src/erlang.xml erts/emulator/beam/beam_bif_load.c erts/emulator/beam/erl_init.c erts/preloaded/ebin/init.beam
2016-08-29ssh: reduce random padding to 15 bytesHans Nilsson
This is to get rid of some warnings in Codenomicon/Defensics. It also speeds up the communications.
2016-08-29ssl: Remove clause that postponed unexpected messagesIngela Anderton Andin
2016-08-29ssh: Add non-blocking sendHans Nilsson
This is to try to fix ssh_connection_SUITE:interrupted_send problem. On machines with small buffers (<65k) like some Windows and *BSDs, this test case could deadlock with both sides having filled tcp receice buffers but stuck in prim_inet:send. This commit fixes this.
2016-08-29ssh: fix Codenomicon/Defensics auth problem with incomplete pduHans Nilsson
Trailing pdu values being 0 or empty strings are just excluded from the pdu by Codenomicon/Defensics. This is wrong but some kind of habit "out there". This commit makes Erlang SSH accept such pdu in one place because Defensics is king of security tests ...
2016-08-29ssh: fix changed badmatch error msg in ssh_algorithms_SUITEHans Nilsson
2016-08-29Fix tracing of processes executing dirtyRickard Green
2016-08-29Perform check_process_code while process is executing dirtyRickard Green