aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tools
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2011-03-08 17:43:31 +0100
committerLukas Larsson <[email protected]>2011-03-08 17:43:31 +0100
commit8f3edd734829736a53d6afcac4794c3c9891de9d (patch)
tree4d32587ac4d80b0f8dde4bf170ab3c81790e21d1 /lib/tools
parent6d462ec24fbe6348b6a5364e6a656446ae24ae50 (diff)
parent97337e16638529f24b6231ada3b4333813448cee (diff)
downloadotp-8f3edd734829736a53d6afcac4794c3c9891de9d.tar.gz
otp-8f3edd734829736a53d6afcac4794c3c9891de9d.tar.bz2
otp-8f3edd734829736a53d6afcac4794c3c9891de9d.zip
Merge branch 'lukas/tools/cover_mem_footprint/OTP-9043' into dev
* lukas/tools/cover_mem_footprint/OTP-9043: Fix spelling on analyse Add short sleep to prevent timing issues on slow machines Update cover tests which depend on compiled files to be skipped if the compile testcase is skipped Conflicts: lib/tools/test/cover_SUITE.erl
Diffstat (limited to 'lib/tools')
-rw-r--r--lib/tools/test/cover_SUITE.erl8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index 494ef55f59..67197c80cb 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -70,7 +70,12 @@ init_per_group(_GroupName, Config) ->
end_per_group(_GroupName, Config) ->
Config.
-init_per_testcase(TC, Config) when TC =:= misc; TC =:= compile ->
+init_per_testcase(TC, Config) when TC =:= misc;
+ TC =:= compile;
+ TC =:= analyse;
+ TC =:= distribution;
+ TC =:= otp_5031;
+ TC =:= stop ->
case code:which(crypto) of
Path when is_list(Path) ->
init_per_testcase(dummy_tc, Config);
@@ -366,6 +371,7 @@ distribution(Config) when is_list(Config) ->
%% Check that stop() unloads on all nodes
?line ok = cover:stop(),
+ ?line timer:sleep(100), %% Give nodes time to unload on slow machines.
?line LocalBeam = code:which(f),
?line N2Beam = rpc:call(N2,code,which,[f]),
?line true = is_unloaded(LocalBeam),