diff options
| author | Niclas Eklund <[email protected]> | 2011-04-20 18:05:50 +0200 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2011-04-20 18:05:50 +0200 |
| commit | 74b2add269e39a5776e429318aeb6bdfb0b41e8c (patch) | |
| tree | 0f1f2b59c7b4ccfde7fa095bcc87fe77301daf48 /lib/common_test | |
| parent | 1b4ef1f5dffb5a99244169b7adf315a513795ee7 (diff) | |
| parent | a34016f35625c77f4487b649f8234b0af3b1bb3b (diff) | |
| download | otp-74b2add269e39a5776e429318aeb6bdfb0b41e8c.tar.gz otp-74b2add269e39a5776e429318aeb6bdfb0b41e8c.tar.bz2 otp-74b2add269e39a5776e429318aeb6bdfb0b41e8c.zip | |
Merge branch 'maint-r14' of super:otp into nick/ssh/memory_leak/OTP-9232
Diffstat (limited to 'lib/common_test')
| -rw-r--r-- | lib/common_test/doc/src/notes.xml | 28 | ||||
| -rw-r--r-- | lib/common_test/src/ct_framework.erl | 5 | ||||
| -rw-r--r-- | lib/common_test/vsn.mk | 2 |
3 files changed, 33 insertions, 2 deletions
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml index fef1222fcb..d6caebc4fe 100644 --- a/lib/common_test/doc/src/notes.xml +++ b/lib/common_test/doc/src/notes.xml @@ -32,6 +32,34 @@ <file>notes.xml</file> </header> +<section><title>Common_Test 1.5.3.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Removes backwards incompatability introduced between + test_server and common_test in R14B02.</p> + <p> + Own Id: OTP-9200 Aux Id: seq11818 </p> + </item> + </list> + </section> + + + <section><title>Known Bugs and Problems</title> + <list> + <item> + <p> + Multiple skip events in test spec suite.</p> + <p> + Own Id: OTP-9054</p> + </item> + </list> + </section> + +</section> + <section><title>Common_Test 1.5.3</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl index 38a2aa53ac..3d4f674160 100644 --- a/lib/common_test/src/ct_framework.erl +++ b/lib/common_test/src/ct_framework.erl @@ -24,7 +24,7 @@ -module(ct_framework). --export([init_tc/3, end_tc/4, get_suite/2, report/2, warn/1]). +-export([init_tc/3, end_tc/3, end_tc/4, get_suite/2, report/2, warn/1]). -export([error_notification/4]). -export([overview_html_header/1]). @@ -434,6 +434,9 @@ try_set_default(Name,Key,Info,Where) -> %%% %%% @doc Test server framework callback, called by the test_server %%% when a test case is finished. +end_tc(Mod, Fun, Args) -> + %% Have to keep end_tc/3 for backwards compatabilty issues + end_tc(Mod, Fun, Args, '$end_tc_dummy'). end_tc(?MODULE,error_in_suite,_, _) -> % bad start! ok; end_tc(Mod,Func,{TCPid,Result,[Args]}, Return) when is_pid(TCPid) -> diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk index 8a4853e070..9ba8e43d8d 100644 --- a/lib/common_test/vsn.mk +++ b/lib/common_test/vsn.mk @@ -1,3 +1,3 @@ -COMMON_TEST_VSN = 1.5.3 +COMMON_TEST_VSN = 1.5.3.1 |