diff options
| author | Fredrik Gustafsson <[email protected]> | 2012-08-10 10:58:45 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2012-08-10 10:58:45 +0200 |
| commit | f968ff87b1d6fb74237010bffa0390953337425e (patch) | |
| tree | cd31772649b8f1e599e7fbe2cf7b76b1c2dc7a7b /lib/eunit/src/eunit.erl | |
| parent | f20c64056d2f36d1ea7b07faf2a104378f4c97ee (diff) | |
| parent | 95a78de4810ca25f7175d8eb7bb8f05e38034122 (diff) | |
| download | otp-f968ff87b1d6fb74237010bffa0390953337425e.tar.gz otp-f968ff87b1d6fb74237010bffa0390953337425e.tar.bz2 otp-f968ff87b1d6fb74237010bffa0390953337425e.zip | |
Merge branch 'rc/eunit-2.2.3/OTP-10173' into maint
* 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
Diffstat (limited to 'lib/eunit/src/eunit.erl')
| -rw-r--r-- | lib/eunit/src/eunit.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/eunit/src/eunit.erl b/lib/eunit/src/eunit.erl index 95857e83c8..51846d73b3 100644 --- a/lib/eunit/src/eunit.erl +++ b/lib/eunit/src/eunit.erl @@ -139,7 +139,7 @@ test(Tests, Options) -> %% @private %% @doc See {@link test/2}. test(Server, Tests, Options) -> - Listeners = [eunit_tty:start(Options) | listeners(Options)], + Listeners = listeners(Options), Serial = eunit_serial:start(Listeners), case eunit_server:start_test(Server, Serial, Tests, Options) of {ok, Reference} -> test_run(Reference, Listeners); @@ -194,7 +194,10 @@ submit(Server, T, Options) -> eunit_server:start_test(Server, Dummy, T, Options). listeners(Options) -> - Ps = start_listeners(proplists:get_all_values(report, Options)), + %% note that eunit_tty must always run, because it sends the final + %% {result,...} message that the test_run() function is waiting for + Ls = [{eunit_tty, Options} | proplists:get_all_values(report, Options)], + Ps = start_listeners(Ls), %% the event_log option is for debugging, to view the raw events case proplists:get_value(event_log, Options) of undefined -> |