aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-08-20Merge branch 'pan/heart_and_times/OTP-10111' into maintPatrik Nyblom
* pan/heart_and_times/OTP-10111: Make heart use clock_gettime when available
2012-08-17Merge branch 'siri/common_test/ct_netconfc/OTP-10025' into maintSiri Hansen
* siri/common_test/ct_netconfc/OTP-10025: [common_test] Move ct_netconfc_SUITE into datadir and run with ct_test_support [common_test] Don't abort test if opening of connection fails [common_test] Don't allow named (required) connection to be opened twice [common_test] Don't abort test run if connection process crashes [common_test] Add netconf client, ct_netconfc
2012-08-17Merge branch 'bmk/snmp/snmp4221_integration2' into maintMicael Karlberg
2012-08-17Merge branch 'bmk/inets/inets591_integration' into maintMicael Karlberg
2012-08-17[common_test] Move ct_netconfc_SUITE into datadir and run with ct_test_supportSiri Hansen
2012-08-17[common_test] Don't abort test if opening of connection failsSiri Hansen
When opening a connection, the connection process would link itself to ct_util_server before calling the init callback, e.g. in ct_netconfc, ct_telnet etc. If the init callback failed, then ct_util_server would get the 'EXIT'. ct_util looks up the pid in the connection table, but since the connection is not yet registered it is not found. ct_util does not know which process it is and will thus die - aborting the complete test run. This commit moves the link(CtUtilServer) after the init callback, so a crash in the init callback will not be detected by ct_util_server - the caller process, however, will get a 'DOWN' message due to monitoring and ct_gen_conn:start will give an error return.
2012-08-17[common_test] Don't allow named (required) connection to be opened twiceSiri Hansen
Earlier, it was possible to open connection (ct_gen_conn) with the same (required) name twice, which could give unexpected results. Such attempts will now return {error,{connection_exists,OtherClient}}.
2012-08-17[common_test] Don't abort test run if connection process crashesSiri Hansen
Earlier ct_util_server would terminate and thus abort the complete test run if a connection process (ct_gen_conn) crashed. This is now changed so that ct_util will only print an error report (in the test case log) and continue the rest of the test.
2012-08-17[common_test] Add netconf client, ct_netconfcSiri Hansen
The netconf client supports basic netconf functionality over SSH. In order to allow testing of both success and failure cases, it is intentionally written to allow non-standard behavior. In order for the netconf client to use the generic connection mechanism in common_test, ct_gen_conn has been updated to be more flexible: Added options: {reconnect,bool()} {forward_messages,bool()} {use_existing_connection,bool()} Allow handle_msg to return {reply,Reply,State} | {noreply,State} | {stop,Reply,State} If forward_messages==true, the ct_gen_conn callback must also implement: handle_msgs(Msg,State) -> {noreply,State} | {stop,State}
2012-08-16Merge branch 'bmk/inets/httpd/improving_security_test_case' into ↵Micael Karlberg
bmk/inets/inets591_integration
2012-08-16[inets/httpd] Add another (cosmetic) printout for security test caseMicael Karlberg
2012-08-15Merge branch 'sverk/ets-compressed-binary-bug/OTP-10182' into maintSverker Eriksson
* sverk/ets-compressed-binary-bug/OTP-10182: Fix corrupted binaries in compressed ETS tables Make ETS compile with #define DEBUG_CLONE
2012-08-15Merge branch 'sverk/crypto-unaligned-aes-cfb/OTP-10136' into maintSverker Eriksson
* sverk/crypto-unaligned-aes-cfb/OTP-10136: crypto: Allow aes_cfb_128_{en|de}crypt to accept unaligned data
2012-08-15Merge branch 'gustav/asn1/enumerated_n2n/OTP-10144' into maintGustav Simonsson
* gustav/asn1/enumerated_n2n/OTP-10144: Add support for extensible enumeration types in n2n generated functions. Make n2n option work for enumerated types without extension markers. Add test enumeration types for testing n2n option when using the name2num and num2name functions on an enumeration value not in the extension root of an enumeration type with extension marker.
2012-08-15Merge branch 'gustav/asn1/integer_single_value_predefined/OTP-10139' into maintGustav Simonsson
* gustav/asn1/integer_single_value_predefined/OTP-10139: In generation of encoding functions for enumeration types, the values used for generating the range check in case of a value range should be sorted and have duplicates removed. Add sorting in constraint checking on single values. Conflicts: lib/asn1/test/testConstraints.erl
2012-08-15Merge branch 'gustav/asn1/per_integer_ranges/OTP-10128' into maintGustav Simonsson
* gustav/asn1/per_integer_ranges/OTP-10128: Keep encoded octets of constrained whole number value and range as binaries and use erlang:byte_size to get length of octets and range. For speed. Add support for larger integer ranges in per encode/decode
2012-08-15Merge branch 'gustav/kernel/packages-docs-empty-func' into maintGustav Simonsson
* gustav/kernel/packages-docs-empty-func: Remove empty function in packages docs
2012-08-15Update primary bootstrapBjörn Gustavsson
2012-08-15Fix broken building of bootstrap compilerBjörn Gustavsson
Commit df8e67e203b83f95d1e098fec88ad5d0ad840069 broke "./otp_build update_primary" because epp:parse_file/4 was added and used from the compiler, but the epp module is not part of the primary compiler that is used to compile the bootstrap compiler. Fix the problem by including the epp module in the primary compiler.
2012-08-15Merge branch 'bjorn/compiler/minor-fixes/OTP-10185' into maintBjörn Gustavsson
* bjorn/compiler/minor-fixes/OTP-10185: erl_lint: Add a deprecated warning for literal tuple funs beam_utils:live_opt/1: Correct handling of try_case_end/1 Correct guard_SUITE_tuple_size.S beam_type: Print the offending function if this pass crashes beam_validator: Validate the size operand in bs_init_bits and bs_init2
2012-08-15erl_lint: Add a deprecated warning for literal tuple funsBjörn Gustavsson
The run-time warning for use of tuple funs will not catch the use of literal tuple funs, such as: if {erlang,'+'}(3,X) =:= 0 -> true; true -> false end. Therefore, add a compile-time warning to give users some warning before they stop working in R16.
2012-08-15beam_utils:live_opt/1: Correct handling of try_case_end/1Björn Gustavsson
Liveness for the try_case_end/1 instruction should be calculated in the same way as for the case_end/1 instruction.
2012-08-15Correct guard_SUITE_tuple_size.SBjörn Gustavsson
The number of live registers in the gc_bif instructions was wrong. It was not noticed because the beam_type pass silently corrected it.
2012-08-15beam_type: Print the offending function if this pass crashesBjörn Gustavsson
2012-08-15beam_validator: Validate the size operand in bs_init_bits and bs_init2Björn Gustavsson
2012-08-14Remove empty function in packages docsGustav Simonsson
2012-08-14Merge branch 'bmk/snmp/bad_decode_TimeTicks/maint/OTP-10132' into ↵Micael Karlberg
bmk/snmp/snmp4221_integration2 Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/src/misc/snmp_pdus.erl
2012-08-14Merge branch 'tja/fix-base' into maintFredrik Gustafsson
2012-08-14Merge branch 'nox/compile-column-numbers' into maintFredrik Gustafsson
* nox/compile-column-numbers: Fix messages ordering with column numbers Fix type compile:err_info/0 Test column number reporting in error_SUITE Fix printing of errors with column numbers Create a new "column" option in compile Allow setting of initial position in epp Export type erl_scan:location/0
2012-08-14Fix corrupted binaries in compressed ETS tablesSverker Eriksson
2012-08-14Make ETS compile with #define DEBUG_CLONESverker Eriksson
2012-08-13Merge branch 'mh/doc-now-vs-timestamp/OTP-10180' into maintFredrik Gustafsson
* mh/doc-now-vs-timestamp/OTP-10180: Doc fix: link from erlang:now/0 to os:timestamp/0
2012-08-13Merge branch 'mh/emacs-mode/atom-dollar/OTP-10178' into maintFredrik Gustafsson
* mh/emacs-mode/atom-dollar/OTP-10178: Fix highlighting of atoms ending with a dollar sign
2012-08-13[snmp] Add bug compatible fixes to TimeTicks decodeMicael Karlberg
Add handling of incorrectly encoded TimeTicks and Unsigned32.
2012-08-10Merge branch 'rc/eunit-2.2.3/OTP-10173' into maintFredrik Gustafsson
* rc/eunit-2.2.3/OTP-10173: Include fixture setup and cleanup errors in Eunit Surefire report documentation fixes add {test,M,F} as a better variant of {M,F} and make the latter obsolete minor cleanup Write chars as UTF-8 to file detect and report bad return values from generators and instantiators eunit_tests should not be listed in eunit.app improved layout of error messages - stack trace before error term bumped revision make stack trace pruning know about the new format Make EUnit print stacktraces with location information Add option 'no_tty' to silent the default tty report
2012-08-10Include fixture setup and cleanup errors in Eunit Surefire reportMagnus Henoch
An error during fixture setup means that some tests could not be run, and therefore needs to be highlighted in the test report. Likewise, a cleanup failure is often a problem that needs to be looked into. Since setup and cleanup are not part of any single test in Eunit's view, I include them as phantom test cases in the report whenever they fail.
2012-08-10documentation fixesRichard Carlsson
2012-08-10add {test,M,F} as a better variant of {M,F} and make the latter obsoleteRichard Carlsson
2012-08-10minor cleanupRichard Carlsson
2012-08-10Write chars as UTF-8 to fileLukas Larsson
2012-08-10detect and report bad return values from generators and instantiatorsRichard Carlsson
2012-08-10eunit_tests should not be listed in eunit.appRichard Carlsson
2012-08-10improved layout of error messages - stack trace before error termRichard Carlsson
2012-08-10bumped revisionRichard Carlsson
2012-08-10make stack trace pruning know about the new formatRichard Carlsson
2012-08-10Make EUnit print stacktraces with location informationKlas Johansson
The format of stacktraces was changed in Erlang/OTP R15, adding location information. This had the effect that EUnit did not recognize stack traces as such and only printed the exception term. This patch makes Eunit recognize and print the new stacktrace format as well as the old.
2012-08-10Add option 'no_tty' to silent the default tty reportRichard Carlsson
2012-08-10Merge branch 'rc/edoc-0.7.10/OTP-10174' into maintFredrik Gustafsson
* rc/edoc-0.7.10/OTP-10174: bumped revision List behaviour callbacks in Edoc when using -callback attribute added special case for file names under Windows, thanks to Beads Land-Trujillo
2012-08-08Merge branch 'siri/erl_prim_loader/archive-scripts/OTP-10071' into maintSiri Hansen
* siri/erl_prim_loader/archive-scripts/OTP-10071: Bugfix escript_SUITE:archive_script_file_access Update preloaded Fix flattening of paths in erl_prim_loader
2012-08-08Bugfix escript_SUITE:archive_script_file_accessSiri Hansen
Used internal function do_run/3 instead of run/3 for executing escript. This will always fail on windows.