Merge branch 'peppe/common_test_r14_dev_2' into dev

* peppe/common_test_r14_dev_2:
  Misc documentation updates
  Add documentation for run_test program
  Step vsn for test_server to 3.4
  Make {repeat*,N} property in group execute the group N times exactly
  Fix so that ct_run converts relative diretories in the code path to absolute
  Fix bug in handling framework:end_tc timeouts
  Fix bug that prevents the interactive shell mode to start properly
  Fix failing multiply timetrap test case
  Minor fixes in code and test suites
  Add support for executing pre-loaded suites (e.g. modules loaded as binaries)
  Add test suite for remote loading of binary suites
  Fix error with {repeat,0} property in groups causing double iterations
  Add support for config info functions (e.g. init_per_suite/0)
  Add support for dynamic timetrap handling
  Have end_per_testcase run even after timetrap_timeout and abort_testcase
  Flush old DOWN messages in demonitor
  Add groups in test specifications
  Add new tests for test case groups and test specifications
  Improve and fix various test suites
  Add event_handler_init start flag that can pass init arguments to event handlers
  ...

OTP-8703 peppe/common_test_r14_dev_2

3 files changed, 16 insertions, 14 deletions

diff --git a/lib/webtool/doc/src/start_webtool.xml b/lib/webtool/doc/src/start_webtool.xml
index 184285c631..b525b38845 100644
--- a/lib/webtool/doc/src/start_webtool.xml
+++ b/lib/webtool/doc/src/start_webtool.xml
@@ -4,7 +4,7 @@
 <comref>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-    
+
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-    
+
     </legalnotice>
 
     <title>start_webtool</title>
@@ -56,7 +56,7 @@ Or  http://127.0.0.1:8888/
 Usage: start_webtool application [ browser ]
 
 Available applications are: [orber,appmon,crashdump_viewer,webcover]
-Default browser is 'iexplore' (Internet Explorer) on Windows or else 'netscape'        </pre>
+Default browser is 'iexplore' (Internet Explorer) on Windows or else 'firefox'        </pre>
         <p>To start any of the listed applications, give the
           application name as the first argument, e.g.</p>
         <pre>
@@ -68,7 +68,7 @@ Starting webcover...
 Sending URL to netscape...done        </pre>
         <p>The WebTool application WebCover is then started and the
           default browser is used. The default browser is Internet
-          Explorer on Windows or else Netscape.
+          Explorer on Windows or else Firefox.
           </p>
         <p>To use another browser, give the browser's start command
           as the second argument, e.g.</p>
diff --git a/lib/webtool/src/webtool.erl b/lib/webtool/src/webtool.erl
index 51d821751c..1be903b827 100644
--- a/lib/webtool/src/webtool.erl
+++ b/lib/webtool/src/webtool.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2001-2010. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 -module(webtool).
@@ -139,7 +139,7 @@ script_start([App]) ->
     DefaultBrowser = 
 	case os:type() of
 	    {win32,_} -> iexplore;
-	    _ -> netscape
+	    _ -> firefox
 	end,
     script_start([App,DefaultBrowser]);
 script_start([App,Browser]) ->
@@ -159,6 +159,8 @@ script_start([App,Browser]) ->
 			  "http://localhost:" ++ PortStr ++ "/" ++ StartPage
 		  end,
 	    case Browser of 
+		none ->
+		    ok;
                 iexplore when OSType == win32->
                     io:format("Starting internet explorer...\n"),
                     {ok,R} = win32reg:open(""),
@@ -170,7 +172,7 @@ script_start([App,Browser]) ->
 		_ when OSType == win32 ->
                     io:format("Starting ~w...\n",[Browser]),
                     os:cmd("\"" ++ atom_to_list(Browser) ++ "\" " ++ Url);
-		B when B==netscape; B==mozilla ->
+		B when B==firefox; B==mozilla ->
 		    io:format("Sending URL to ~w...",[Browser]),
 		    BStr = atom_to_list(Browser),
 		    SendCmd = BStr ++ " -raise -remote \'openUrl(" ++ 
@@ -209,7 +211,7 @@ usage() ->
       "\nUsage: start_webtool application [ browser ]\n"
       "\nAvailable applications are: ~p\n"
       "Default browser is \'iexplore\' (Internet Explorer) on Windows "
-      "or else \'netscape\'\n",
+      "or else \'firefox\'\n",
       [Apps]),
     stop().
 
diff --git a/lib/webtool/vsn.mk b/lib/webtool/vsn.mk
index 712e3abbaf..6b76883330 100644
--- a/lib/webtool/vsn.mk
+++ b/lib/webtool/vsn.mk
@@ -1 +1 @@
-WEBTOOL_VSN=0.8.6
+WEBTOOL_VSN=0.8.7