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

1 files changed, 2 insertions, 12 deletions

diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE_data/test_server_SUITE.erl
index ab25e4ad2f..fc2adcd651 100644
--- a/lib/test_server/test/test_server_SUITE_data/test_server_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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
@@ -433,7 +433,7 @@ start_stop_node(Config) when is_list(Config) ->
 	    ?t:comment("WARNING: Node started with {wait,false}"
 			     " is up faster than expected...");
 	false ->
-	    wait_for_node(Node4,0),
+	    test_server:wait_for_node(Node4),
 	    true = lists:member(Node4,nodes())
     end,
 
@@ -450,16 +450,6 @@ start_stop_node(Config) when is_list(Config) ->
 
     ok.
 
-
-wait_for_node(Node,Acc) ->
-    case net_adm:ping(Node) of
-	pang -> 
-	    timer:sleep(100),
-	    wait_for_node(Node,Acc+100);
-	pong ->
-	    Acc
-    end.
-
 cleanup_nodes_init(doc) -> ["Test that nodes are terminated when test case"
 			    " is finished unless {cleanup,false} is given."];
 cleanup_nodes_init(Config) when is_list(Config) ->