diff options
Diffstat (limited to 'lib/eunit')
| -rw-r--r-- | lib/eunit/doc/src/notes.xml | 29 | ||||
| -rw-r--r-- | lib/eunit/src/Makefile | 2 | ||||
| -rw-r--r-- | lib/eunit/src/eunit_proc.erl | 13 | ||||
| -rw-r--r-- | lib/eunit/src/eunit_surefire.erl | 2 | ||||
| -rw-r--r-- | lib/eunit/vsn.mk | 2 |
5 files changed, 42 insertions, 6 deletions
diff --git a/lib/eunit/doc/src/notes.xml b/lib/eunit/doc/src/notes.xml index 1fa5993ac6..941ff6e84c 100644 --- a/lib/eunit/doc/src/notes.xml +++ b/lib/eunit/doc/src/notes.xml @@ -32,6 +32,35 @@ </header> <p>This document describes the changes made to the EUnit application.</p> +<section><title>Eunit 2.2.6</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fix I/O-protocol error handling in eunit. Thanks to Yuki + Ito.</p> + <p> + Own Id: OTP-11373</p> + </item> + <item> + <p> + Do not attempt to detect lists of printable characters in + format. Thanks to Roberto Aloi.</p> + <p> + Own Id: OTP-11467</p> + </item> + <item> + <p> + Fix silent make rule (Thanks to Anthony Ramine )</p> + <p> + Own Id: OTP-11516</p> + </item> + </list> + </section> + +</section> + <section><title>Eunit 2.2.5</title> <section><title>Improvements and New Features</title> diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile index e88e28df83..e6dab67363 100644 --- a/lib/eunit/src/Makefile +++ b/lib/eunit/src/Makefile @@ -95,7 +95,7 @@ info: realclean: clean $(EBIN)/%.$(EMULATOR):%.erl - erlc -W $(ERL_COMPILE_FLAGS) -o$(EBIN) $< + $(erlc_verbose)erlc -W $(ERL_COMPILE_FLAGS) -o$(EBIN) $< $(OBJECTS): $(PARSE_TRANSFORM_BIN) diff --git a/lib/eunit/src/eunit_proc.erl b/lib/eunit/src/eunit_proc.erl index ec7d93fd48..03d1a18321 100644 --- a/lib/eunit/src/eunit_proc.erl +++ b/lib/eunit/src/eunit_proc.erl @@ -643,11 +643,11 @@ io_request({get_until, _Prompt, _M, _F, _As}, Buf) -> io_request({setopts, _Opts}, Buf) -> {ok, Buf}; io_request(getopts, Buf) -> - {error, {error, enotsup}, Buf}; + {{error, enotsup}, Buf}; io_request({get_geometry,columns}, Buf) -> - {error, {error, enotsup}, Buf}; + {{error, enotsup}, Buf}; io_request({get_geometry,rows}, Buf) -> - {error, {error, enotsup}, Buf}; + {{error, enotsup}, Buf}; io_request({requests, Reqs}, Buf) -> io_requests(Reqs, {ok, Buf}); io_request(_, Buf) -> @@ -657,3 +657,10 @@ io_requests([R | Rs], {ok, Buf}) -> io_requests(Rs, io_request(R, Buf)); io_requests(_, Result) -> Result. + +-ifdef(TEST). +io_error_test_() -> + [?_assertMatch({error, enotsup}, io:getopts()), + ?_assertMatch({error, enotsup}, io:columns()), + ?_assertMatch({error, enotsup}, io:rows())]. +-endif. diff --git a/lib/eunit/src/eunit_surefire.erl b/lib/eunit/src/eunit_surefire.erl index cc021625d5..a2463d32e8 100644 --- a/lib/eunit/src/eunit_surefire.erl +++ b/lib/eunit/src/eunit_surefire.erl @@ -174,7 +174,7 @@ handle_cancel(group, Data, St) -> setup_failed -> "fixture setup "; cleanup_failed -> "fixture cleanup " end - ++ io_lib:format("~p", [proplists:get_value(id, Data)]), + ++ io_lib:format("~w", [proplists:get_value(id, Data)]), Desc = format_desc(proplists:get_value(desc, Data)), TestCase = #testcase{ name = Name, description = Desc, diff --git a/lib/eunit/vsn.mk b/lib/eunit/vsn.mk index be06c81559..8f816b3b94 100644 --- a/lib/eunit/vsn.mk +++ b/lib/eunit/vsn.mk @@ -1 +1 @@ -EUNIT_VSN = 2.2.5 +EUNIT_VSN = 2.2.6 |