diff options
author | Siri Hansen <[email protected]> | 2012-10-12 16:34:42 +0200 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2012-10-30 11:18:40 +0100 |
commit | 76795e21ef68e2af29d22deee09a729a14f8a29a (patch) | |
tree | b9e445d69092c8fbeba40a7d0f187b0c34daf27d | |
parent | deaae761fb03ba2a49ac6ed2459acf577698d57d (diff) | |
download | otp-76795e21ef68e2af29d22deee09a729a14f8a29a.tar.gz otp-76795e21ef68e2af29d22deee09a729a14f8a29a.tar.bz2 otp-76795e21ef68e2af29d22deee09a729a14f8a29a.zip |
[common_test] Don't stop cover before stopping slave node
In order to avoid crash of processes that hold old code, cover is no
longer stopped before slave nodes are stopped. Instead cover:flush is
used which only fetches cover data from the slave.
This, along with similar changes in test_server allows all common_test
modules to be included in cover analysis.
-rw-r--r-- | lib/common_test/test/common_test.cover | 11 | ||||
-rw-r--r-- | lib/common_test/test/ct_test_support.erl | 4 |
2 files changed, 2 insertions, 13 deletions
diff --git a/lib/common_test/test/common_test.cover b/lib/common_test/test/common_test.cover index b6e5fa4de6..e8e01a9312 100644 --- a/lib/common_test/test/common_test.cover +++ b/lib/common_test/test/common_test.cover @@ -1,13 +1,2 @@ %% -*- erlang -*- {incl_app,common_test,details}. -{excl_mods,common_test,[ct_config, - ct_gen_conn, - ct_event, - ct_logs, - ct_master, - ct_master_logs, - ct_master_status, - ct_run, - ct_slave, - ct_util, - vts]}. diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl index 80cca4a1cc..c05b6d87c0 100644 --- a/lib/common_test/test/ct_test_support.erl +++ b/lib/common_test/test/ct_test_support.erl @@ -117,7 +117,7 @@ end_per_suite(Config) -> CTNode = proplists:get_value(ct_node, Config), PrivDir = proplists:get_value(priv_dir, Config), true = rpc:call(CTNode, code, del_path, [filename:join(PrivDir,"")]), - cover:stop(CTNode), + cover:flush(CTNode), slave:stop(CTNode), ok. @@ -149,7 +149,7 @@ end_per_testcase(_TestCase, Config) -> case wait_for_ct_stop(CTNode) of %% Common test was not stopped to we restart node. false -> - cover:stop(CTNode), + cover:flush(CTNode), slave:stop(CTNode), start_slave(Config,proplists:get_value(trace_level,Config)), {fail, "Could not stop common_test"}; |