diff options
| author | Siri Hansen <[email protected]> | 2012-10-31 16:51:15 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-10-31 16:51:30 +0100 |
| commit | a6d90a806eeac9a75ffbadbe1f5322d1b3a2710d (patch) | |
| tree | e4e03916764ad79af1d05eeb87e5b029b3dc9e5f /lib/stdlib/test | |
| parent | c16c80532af30922cb222f75971cd2aecdb9e36c (diff) | |
| parent | c3d34e536e9516ab54a9f5e9a30e21043eda565b (diff) | |
| download | otp-a6d90a806eeac9a75ffbadbe1f5322d1b3a2710d.tar.gz otp-a6d90a806eeac9a75ffbadbe1f5322d1b3a2710d.tar.bz2 otp-a6d90a806eeac9a75ffbadbe1f5322d1b3a2710d.zip | |
Merge branch 'siri/cover-tests'
* siri/cover-tests: (21 commits)
[common_test] Extend timer for flushing error logger
[cover] Allow reconnection if node has been disconnected or down
[cover] Don't kill remote nodes when connection to main node is lost
[test_server] Add option {start_cover,false} to test_server:start_node
Use code:lib_dir instead of code:which to get application directory
[common_test] Add test for OTP-9956
Include all kernel modules in code coverage analysis
[common_test] Add test suite for code coverage support
[common_test, test_server] Don't flush cover if cover is not running
[common_test] Add option cover_stop
[test_server] Allow cross cover analysis when testing through common_test
[test_server] Start cover in test_server:wait_for_node
[test_server] Multiply timers with timetrap_scale_factor when starting nodes
Include all stdlib modules in code coverage analysis
[test_server] Include all test_server modules in code coverage analysis
Skip epp_SUITE:otp_8911 if cover is running
[common_test] Start cover on slave nodes if running cover tests
[common_test] Don't stop cover before stopping slave node
[test_server] Don't stop cover after test is finished
[cover] Add support for test_server
...
OTP-10427
Diffstat (limited to 'lib/stdlib/test')
| -rw-r--r-- | lib/stdlib/test/epp_SUITE.erl | 9 | ||||
| -rw-r--r-- | lib/stdlib/test/stdlib.cover | 15 |
2 files changed, 8 insertions, 16 deletions
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl index f79414db49..77c615d6d9 100644 --- a/lib/stdlib/test/epp_SUITE.erl +++ b/lib/stdlib/test/epp_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1998-2011. All Rights Reserved. +%% Copyright Ericsson AB 1998-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -1236,6 +1236,13 @@ otp_8911(doc) -> otp_8911(suite) -> []; otp_8911(Config) when is_list(Config) -> + case test_server:is_cover() of + true -> + {skip, "Testing cover, so can not run when cover is already running"}; + false -> + do_otp_8911(Config) + end. +do_otp_8911(Config) -> ?line {ok, CWD} = file:get_cwd(), ?line ok = file:set_cwd(?config(priv_dir, Config)), diff --git a/lib/stdlib/test/stdlib.cover b/lib/stdlib/test/stdlib.cover index 61f4f064b9..e71be880cb 100644 --- a/lib/stdlib/test/stdlib.cover +++ b/lib/stdlib/test/stdlib.cover @@ -1,17 +1,2 @@ %% -*- erlang -*- {incl_app,stdlib,details}. - -{excl_mods,stdlib, - [erl_parse, - erl_eval, - ets, - filename, - gen_event, - gen_server, - gen, - lists, - io, - io_lib, - io_lib_format, - io_lib_pretty, - proc_lib]}. |