diff options
| author | Lukas Larsson <[email protected]> | 2011-04-20 10:54:07 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-04-20 10:55:44 +0200 |
| commit | 0cc207fdd1e0cea65c45256dea110caf9be95d01 (patch) | |
| tree | 3cbd6c54476b44ed9648c810692c60be476ed59a /lib/common_test | |
| parent | 23906a01725f4494b8816c242926d08aeca0ef67 (diff) | |
| parent | a34016f35625c77f4487b649f8234b0af3b1bb3b (diff) | |
| download | otp-0cc207fdd1e0cea65c45256dea110caf9be95d01.tar.gz otp-0cc207fdd1e0cea65c45256dea110caf9be95d01.tar.bz2 otp-0cc207fdd1e0cea65c45256dea110caf9be95d01.zip | |
Merge branch 'maint-r14' into dev
* maint-r14:
Prepare release
Update framwork backwards compatability check to use TEST_SERVER_FRAMEWORK as it should and not the Module
Export ct_framework:end_tc/3 for backwards compatability reasons
Update end_tc framework calls to check the name of the framework module instead of the return value of the call
Diffstat (limited to 'lib/common_test')
| -rw-r--r-- | lib/common_test/src/ct_framework.erl | 5 |
1 files changed, 4 insertions, 1 deletions
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) -> |