aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-01-23Merge branch 'maint'Henrik Nord
2012-01-23Merge branch 'jz/error-logic-efile_sendfile' into maintHenrik Nord
* jz/error-logic-efile_sendfile: erts: minor fix for unnecessary condition OTP-9872
2012-01-23Merge branch 'jz/sendfile_chunk_size' into maintHenrik Nord
* jz/sendfile_chunk_size: erts: change SENDFILE_CHUNK_SIZE from signed to unsigned Conflicts: erts/emulator/drivers/unix/unix_efile.c OTP-9872
2012-01-23Merge branch 'henrik/wx/fix-pdf-name/OTP-9850' into maintHenrik Nord
* henrik/wx/fix-pdf-name/OTP-9850: Change the name of generated pdf file for documentation consistency
2012-01-19Merge branch 'maint'Micael Karlberg
2012-01-19Merge branch 'maint-r15' into maintMicael Karlberg
2012-01-18Merge branch 'maint'Björn Gustavsson
* maint: Update primary bootstrap erl_lint: Consistently reject local calls from guards
2012-01-18Update primary bootstrapBjörn Gustavsson
2012-01-18Merge branch 'bjorn/compiler/bif-call-bug/OTP-9866' into maintBjörn Gustavsson
* bjorn/compiler/bif-call-bug/OTP-9866: erl_lint: Consistently reject local calls from guards
2012-01-18Merge branch 'maint'Björn-Egil Dahlberg
2012-01-18Merge branch 'egil/fix-error_logger-calendar/OTP-9854' into maintBjörn-Egil Dahlberg
* egil/fix-error_logger-calendar/OTP-9854: stdlib: Refactor to tag all times in error logger stdlib: Use utc time as base in error logger
2012-01-18Merge branch 'raimo/64-bit-efile_drv/OTP-9820' into maintErlang/OTP
* raimo/64-bit-efile_drv/OTP-9820: file_SUITE: Assume 64-bit windows has enough memory erts: Badarg if port output overflows iov_len prim_file_SUITE: large_file success depends on wordsize file_SUITE: Increase timeout for large_file file_SITE,prim_file_SUITE: Accept old OpenBSD pecularity prim_file_SUITE: large_write - meaner test data and check result content file_SUITE: large_write - check mem size before creating huge binary erts: rewrite efile_writev to handle partial writes correctly erts: Bugfix - driver_deq freed wrong length due to short type (int) prim_file_SUITE: Add large_write/1 file_SUITE: Add large_write/1 file_SUITE: Refactor large_file/1 file_SUITE: Fix unix_free/1
2012-01-17erl_lint: Consistently reject local calls from guardsBjörn Gustavsson
If a guard test (such as is_list/1) has a local definition in a module (or is imported), erl_lint will reject a call to it from a guard if the call is not at the top-level: foo(L) when is_list(L) =:= true -> %% Will be rejected. ok. is_list(_) -> ok. But if the call is at the top-level, it will be accepted (and cause a crash in a later compiler pass): foo(L) when is_list(L) -> %% Will be accepted by erl_lint ok. is_list(_) -> ok. This inconsistency was an oversight introduced when it became possible to override BIFs with local definitions.
2012-01-17Merge branch 'bmk/snmp/snmp4215_integration/r15' into maint-r15Erlang/OTP
* bmk/snmp/snmp4215_integration/r15: [snmp] Fixed release notes. Used wrong ticket number [snmp/agent] Updated appup file [snmp/agent] Updated release notes [snmp/agent] Removed the (unused) serializer part [snmp/agent] Use unique temporary file name during vacm table dumnping [snmp/agent] Add common timestamp format function. [snmp/agent] Synchronization feature added [snmp/agent] Creating a unique temporary file whe dumping vacm [snmp/agent] Changed version [snmp/agent] Found another old-style fun (2-tuple) [snmp/agent] Removed use of old style tuple funs
2012-01-17Merge branch 'bmk/snmp/snmp4215_integration/r14' into ↵Micael Karlberg
bmk/snmp/snmp4215_integration/r15 Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/doc/src/notes_history.xml lib/snmp/src/app/snmp.appup.src lib/snmp/vsn.mk
2012-01-16[snmp] Fixed release notes. Used wrong ticket numberMicael Karlberg
OTP-9783
2012-01-16Merge branch 'maint'Ingela Anderton Andin
2012-01-16Merge branch 'ia/ssh/test-maint' into maintIngela Anderton Andin
* ia/ssh/test-maint: Remove generation of new test keys, use checked in test keys Improve test case structure so that test should pass on all platforms Exec test case should ignore stderr messages Do not run ssh_to_openssh_SUITE if there is no oppenssh server running
2012-01-13Merge branch 'maint'Raimo Niskanen
2012-01-13Merge branch 'maint-r15' into maintRaimo Niskanen
2012-01-13Merge branch 'raimo/opu-fixes' into maint-r15Raimo Niskanen
* raimo/opu-fixes: inet_res_SUITE: Improve portability of run-named inet_res_SUITE: Go back to old way to kill test name server
2012-01-13Merge branch 'maint'Raimo Niskanen
2012-01-13Merge branch 'raimo/opu-fixes' into maintRaimo Niskanen
* raimo/opu-fixes: inet_res_SUITE: Improve portability of run-named
2012-01-12Merge branch 'maint'Adam Lindberg
2012-01-12Merge branch 'alind/public_key/gitignore_fix' into maintAdam Lindberg
* alind/public_key/gitignore_fix: [public_key] Fix .gitignore to use relative paths
2012-01-12[public_key] Fix .gitignore to use relative pathsAdam Lindberg
2012-01-12Merge branch 'bmk/snmp/agent/synchronizing_vacm_dumping/r14/OTP-9851' into ↵Micael Karlberg
bmk/snmp/snmp4215_integration/r14 Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src
2012-01-12[snmp/agent] Updated appup fileMicael Karlberg
2012-01-12[snmp/agent] Updated release notesMicael Karlberg
OTP-9851
2012-01-12[snmp/agent] Removed the (unused) serializer partMicael Karlberg
OTP-9851
2012-01-12[snmp/agent] Use unique temporary file name during vacm table dumnpingMicael Karlberg
Removed the use synchronization mechanism during vacm table dumping. This could not be placed in the master agent since it was sometimes used from the master agent. Also is was credated and used from the top agent supervisor, befor the master agent process was created... OTP-9851
2012-01-12[snmp/agent] Add common timestamp format function.Micael Karlberg
OTP-9851
2012-01-12[snmp/agent] Synchronization feature addedMicael Karlberg
OTP-9851
2012-01-12[snmp/agent] Creating a unique temporary file whe dumping vacmMicael Karlberg
Attempting to create a unique temporary file when dumping the vacm table to disk. OTP-9851
2012-01-11Merge branch 'maint'Sverker Eriksson
2012-01-11Merge branch 'sverk/inet_drv-valgrind-uninitialised' into maintSverker Eriksson
* sverk/inet_drv-valgrind-uninitialised: otp,erts: Add phony valgrind target erts: Better suppression of uninitialised sctp_sndrcvinfo
2012-01-11Merge branch 'sverk/wait_for_test_procs' into maintSverker Eriksson
* sverk/wait_for_test_procs: stdlib: Enable unused 'end_per_testcase' in ets_SUITE
2012-01-11Merge branch 'sverk/hipe-hibernate-sparc-bug' into maintSverker Eriksson
* sverk/hipe-hibernate-sparc-bug: erts: Make GC tolerate hibernated process without hipe stack
2012-01-11Merge branch 'sverk/nif_SUITE-skip-threading' into maintSverker Eriksson
* sverk/nif_SUITE-skip-threading: erts: Add missing cleanup to nif_SUITE:threading erts: Skip nif_SUITE:threading if not supported
2012-01-11Remove generation of new test keys, use checked in test keysIngela Anderton Andin
There is no need to generate new test keys every time, they do not have a timestamp as certificates. This also reduces the need to duplicate test code from public_key.
2012-01-11Improve test case structure so that test should pass on all platformsIngela Anderton Andin
2012-01-11Exec test case should ignore stderr messagesIngela Anderton Andin
2012-01-11Do not run ssh_to_openssh_SUITE if there is no oppenssh server runningIngela Anderton Andin
2012-01-11Merge branch 'maint'Björn Gustavsson
* maint: compile_SUITE: Add test of 'sys_pre_attributes' Correct syntax in compiler.cover Cover v3_kernel:get_line/1 core_SUITE: Cover the nomatch_shadow warning in v3_kernel core_SUITE: Cover v3_kernel:build_match/2 bs_match_SUITE: Add a test case to cover bsm_ensure_no_partition_2/5 core_fold_SUITE: Cover sys_core_fold:is_safe_bool_expr_1/3 core_SUITE: Cover sys_core_fold:eval_is_boolean/2 core_SUITE: Cover sys_core_fold:make_effect_seq/2 beam_validator_SUITE:beam_files/1: Validate modules in parallel compilation_SUITE: Compile compiler modules in parallel compilation_SUITE: Prevent cover from being run on slave nodes test_lib:p_run/2: Be careful about how many parallel processes we use Remove part_eval_SUITE
2012-01-11Merge branch 'bjorn/compiler/tests' into maintBjörn Gustavsson
* bjorn/compiler/tests: compile_SUITE: Add test of 'sys_pre_attributes' Correct syntax in compiler.cover Cover v3_kernel:get_line/1 core_SUITE: Cover the nomatch_shadow warning in v3_kernel core_SUITE: Cover v3_kernel:build_match/2 bs_match_SUITE: Add a test case to cover bsm_ensure_no_partition_2/5 core_fold_SUITE: Cover sys_core_fold:is_safe_bool_expr_1/3 core_SUITE: Cover sys_core_fold:eval_is_boolean/2 core_SUITE: Cover sys_core_fold:make_effect_seq/2 beam_validator_SUITE:beam_files/1: Validate modules in parallel compilation_SUITE: Compile compiler modules in parallel compilation_SUITE: Prevent cover from being run on slave nodes test_lib:p_run/2: Be careful about how many parallel processes we use Remove part_eval_SUITE
2012-01-11compile_SUITE: Add test of 'sys_pre_attributes'Björn Gustavsson
2012-01-10Merge branch 'maint'Björn-Egil Dahlberg
2012-01-10Merge branch 'egil/revert-type-information' into maintBjörn-Egil Dahlberg
* egil/revert-type-information: syntax_tools: Remove warnings of missing types hipe: Remove warnings of missing types in records syntax_tools: Suppress warning of unused variable Revert "hipe: Add type information to cfg_info record" Revert "syntax_tool: Add missing type information"
2012-01-10Merge branch 'maint'Hans Bolinder
* maint: Handle nowarn_unused_function like the compiler does
2012-01-09file_SUITE: Assume 64-bit windows has enough memoryRaimo Niskanen
Temporary workaround until there is a memory info function conveniantly usable from test suites.