aboutsummaryrefslogtreecommitdiffstats
path: root/lib/webtool/src/webtool.erl
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2010-05-24 17:38:19 +0200
committerRaimo Niskanen <[email protected]>2010-06-09 16:19:19 +0200
commit5cf552a62742c6ddc974ba5491188576d512254e (patch)
treeef3a2c560545d8fe493d6bead6f4dbecf545b594 /lib/webtool/src/webtool.erl
parent215cdbcb6312caf49cd1fd1b37f0fb5842b5e13d (diff)
downloadotp-5cf552a62742c6ddc974ba5491188576d512254e.tar.gz
otp-5cf552a62742c6ddc974ba5491188576d512254e.tar.bz2
otp-5cf552a62742c6ddc974ba5491188576d512254e.zip
Add run_test program for Common Test
Common Test may now be started with the program run_test instead of the legacy shell script with the same name. Minor updates have also been made to the Webtool application.
Diffstat (limited to 'lib/webtool/src/webtool.erl')
-rw-r--r--lib/webtool/src/webtool.erl8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/webtool/src/webtool.erl b/lib/webtool/src/webtool.erl
index 51d821751c..006f43f8b3 100644
--- a/lib/webtool/src/webtool.erl
+++ b/lib/webtool/src/webtool.erl
@@ -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().