From 39e1f346082183697de936904231d75ec61553a9 Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Tue, 5 Apr 2011 16:59:12 +0200 Subject: Update end_tc framework calls to check the name of the framework module instead of the return value of the call --- lib/test_server/src/test_server.erl | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl index 7f0011bd68..4e6c65a532 100644 --- a/lib/test_server/src/test_server.erl +++ b/lib/test_server/src/test_server.erl @@ -1193,11 +1193,8 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) -> do_end_tc_call(M,F,Res,Return) -> Ref = make_ref(), - case test_server_sup:framework_call( - end_tc, [?pl2a(M),F,Res], Ref) of - {fail,FWReason} -> - {failed,FWReason}; - Ref -> + case ?pl2a(M) of + ct_framework -> case test_server_sup:framework_call( end_tc, [?pl2a(M),F,Res, Return], ok) of {fail,FWReason} -> @@ -1212,8 +1209,14 @@ do_end_tc_call(M,F,Res,Return) -> NewReturn -> NewReturn end; - _ -> - Return + Other -> + case test_server_sup:framework_call( + end_tc, [Other,F,Res], Ref) of + {fail,FWReason} -> + {failed,FWReason}; + _Else -> + Return + end end. %% the return value is a list and we have to check if it contains -- cgit v1.2.3 From 8f33b229f303cbd360fd8c8262e26a5a47416710 Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Tue, 5 Apr 2011 17:00:00 +0200 Subject: Export ct_framework:end_tc/3 for backwards compatability reasons --- lib/common_test/src/ct_framework.erl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib') 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) -> -- cgit v1.2.3 From 7ffe6f4faf3df263e662091c0a8de729418cbb31 Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Thu, 7 Apr 2011 17:10:21 +0200 Subject: Update framwork backwards compatability check to use TEST_SERVER_FRAMEWORK as it should and not the Module --- lib/test_server/src/test_server.erl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl index 4e6c65a532..8fe7d72270 100644 --- a/lib/test_server/src/test_server.erl +++ b/lib/test_server/src/test_server.erl @@ -1193,8 +1193,10 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) -> do_end_tc_call(M,F,Res,Return) -> Ref = make_ref(), - case ?pl2a(M) of - ct_framework -> + case os:getenv("TEST_SERVER_FRAMEWORK") of + FW when FW == "ct_framework"; + FW == "undefined"; + FW == false -> case test_server_sup:framework_call( end_tc, [?pl2a(M),F,Res, Return], ok) of {fail,FWReason} -> -- cgit v1.2.3 From a34016f35625c77f4487b649f8234b0af3b1bb3b Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Fri, 15 Apr 2011 14:50:30 +0200 Subject: Prepare release --- lib/common_test/doc/src/notes.xml | 28 ++++++++++++++++++++++++++++ lib/common_test/vsn.mk | 2 +- lib/test_server/doc/src/notes.xml | 16 ++++++++++++++++ lib/test_server/vsn.mk | 2 +- 4 files changed, 46 insertions(+), 2 deletions(-) (limited to 'lib') 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 @@ notes.xml +
Common_Test 1.5.3.1 + +
Fixed Bugs and Malfunctions + + +

+ Removes backwards incompatability introduced between + test_server and common_test in R14B02.

+

+ Own Id: OTP-9200 Aux Id: seq11818

+ + +
+ + +
Known Bugs and Problems + + +

+ Multiple skip events in test spec suite.

+

+ Own Id: OTP-9054

+ + +
+ +
+
Common_Test 1.5.3
Fixed Bugs and Malfunctions 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 diff --git a/lib/test_server/doc/src/notes.xml b/lib/test_server/doc/src/notes.xml index 9c62b0fcf6..26b6c5578c 100644 --- a/lib/test_server/doc/src/notes.xml +++ b/lib/test_server/doc/src/notes.xml @@ -32,6 +32,22 @@ notes.xml +
Test_Server 3.4.3.1 + +
Fixed Bugs and Malfunctions + + +

+ Removes backwards incompatability introduced between + test_server and common_test in R14B02.

+

+ Own Id: OTP-9200 Aux Id: seq11818

+ + +
+ +
+
Test_Server 3.4.3
Fixed Bugs and Malfunctions diff --git a/lib/test_server/vsn.mk b/lib/test_server/vsn.mk index b7c0987845..a394a3b980 100644 --- a/lib/test_server/vsn.mk +++ b/lib/test_server/vsn.mk @@ -1,2 +1,2 @@ -TEST_SERVER_VSN = 3.4.3 +TEST_SERVER_VSN = 3.4.3.1 -- cgit v1.2.3