aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-08-14Merge branch 'maint', remote-tracking branch 'upstream'Fredrik Gustafsson
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-14Merge branch 'maint'Fredrik Gustafsson
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 'maint'Fredrik Gustafsson
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-10Merge branch 'maint'Fredrik Gustafsson
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-08Update preloadedSiri Hansen
Changed: erts/preloaded/ebin/erl_prim_loader.beam
2012-08-08Merge branch 'maint'Siri Hansen
Conflicts: erts/preloaded/ebin/erl_prim_loader.beam
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.
2012-08-08Merge branch 'maint'Björn Gustavsson
* maint: compiler: Eliminate EXIT messages from the temporary compiler process
2012-08-08bumped revisionRichard Carlsson
2012-08-08List behaviour callbacks in Edoc when using -callback attributeMagnus Henoch
Defining a behaviour_info/1 function is no longer the only way to define a behaviour; you can use -callback attributes as well. This change makes edoc aware of the latter, such that the module documentation page for a behaviour module will list the name and arity of the required callback functions. Ideally, edoc should use the type information present in the callback attributes, but with this change, the documentation is at least no worse than when using an explicit behaviour_info function.
2012-08-08added special case for file names under Windows, thanks to Beads Land-TrujilloRichard Carlsson
2012-08-07Update preloadedSiri Hansen
erl_prim_loader.beam
2012-08-07Fix flattening of paths in erl_prim_loaderSiri Hansen
When correcting OTP-10071, a new error was introduced in erl_prim_loader. In order to improve ability to detect if a file was inside the primary archive, all paths were flattened - i.e. "." and ".." were removed. This implementation had some faults, and it did not take symlinks into account. This has been corrected.
2012-08-07Fix highlighting of atoms ending with a dollar signMagnus Henoch
Like this: 'atom$'. In that example, the last single quote should be recognised as ending the atom. This needs a font-lock workaround similar to the one for strings.
2012-08-06compiler: Eliminate EXIT messages from the temporary compiler processBjörn Gustavsson
If a process trap exits, calling the compiler would leave an EXIT message in the message queue of the calling process because the compiler spawns a temporary work process. Eliminate the EXIT process by monitoring the temporary process instead of linking to it. Reported-by: Jeremy Heater
2012-08-06Merge branch 'maint'Björn Gustavsson
* maint: compile_SUITE: Correct the forms_2 test case to work on Windows
2012-08-06compile_SUITE: Correct the forms_2 test case to work on WindowsBjörn Gustavsson
Correct the forms_2 test case introduced in 2d785c07fbf9f533bf so that it will work on Windows. As originally written, the test case assumed that filename:absname("/foo/bar") would return "/foo/bar", which is not true on Windows (typically, the result will be "c:/foo/bar"). While at it, clean up indentation, the overlong line, and comments.
2012-08-03Merge branch 'rickard/tab-unref-thr-prgr/OTP-10167'Rickard Green
* rickard/tab-unref-thr-prgr/OTP-10167: Use thread progress instead of scheduling misc aux work were possible Conflicts: erts/emulator/beam/erl_process.h
2012-08-03Merge branch 'rickard/proc-sched/OTP-9892'Rickard Green
* rickard/proc-sched/OTP-9892: Read message queue lengths while having lock Remove development debug code Fix bug scheduling free processes Conflicts: erts/emulator/beam/erl_message.c
2012-08-02Use thread progress instead of scheduling misc aux work were possibleRickard Green
Functionality for scheduling operations at thread progress later has been introduced. Deallocation of ETS table structures were previously done by scheduling misc aux work. Deallocation of process structures (not released yet) was also implemented this way. Instead of using the misc aux work functionality these implementation now use the newly introduced functionality for scheduling operations at thread progress later. By using this new functionaliy we reduce the amount of memory allocation/deallocation operations needed.
2012-08-02Merge 'rickard/thr-prgr-use/OTP-10116' and 'rickard/proc-sched/OTP-9892'Rickard Green
Conflicts: erts/emulator/beam/erl_process.c
2012-08-02Read message queue lengths while having lockRickard Green
2012-08-02Remove development debug codeRickard Green
2012-08-02Fix bug scheduling free processesRickard Green
2012-08-02sys_pre_expand: Fix BASE never being setTomas Janousek
Commit a612e99fb5aaa934fe5a8591db0f083d7fa0b20a turned module attributes from 2-tuples to 3-tuples but forgot to update get_base/1, breaking BASE for parametric modules.
2012-08-01Merge branch 'mh/remove-compilation-error-regexp'Henrik Nord
* mh/remove-compilation-error-regexp: Remove Erlang-specific compilation error regexp OTP-10168
2012-07-31Merge branch 'maint'Rickard Green
* maint: Use annotate level 1 for 'gdb' with 'emacs' in 'cerl'
2012-07-31Merge branch 'rickard/cerl-emacs-gdb' into maintRickard Green
* rickard/cerl-emacs-gdb: Use annotate level 1 for 'gdb' with 'emacs' in 'cerl'
2012-07-31Merge branch 'maint'Rickard Green
* maint: Use static allocation of process lock queues Conflicts: erts/emulator/beam/erl_process_lock.c erts/emulator/beam/erl_process_lock.h
2012-07-31Merge branch 'rickard/proc-lock-queues/OTP-10163' into maintRickard Green
* rickard/proc-lock-queues/OTP-10163: Use static allocation of process lock queues
2012-07-31Merge branch 'maint'Rickard Green
* maint: Improve the enqueue operation of delayed dealloc Implement delayed aux work wake up Conflicts: erts/emulator/beam/erl_alloc_util.c erts/emulator/beam/erl_process.h