The R13B03 release.OTP_R13B03

1 files changed, 212 insertions, 0 deletions

diff --git a/lib/kernel/test/os_SUITE.erl b/lib/kernel/test/os_SUITE.erl
new file mode 100644
index 0000000000..667f267079
--- /dev/null
+++ b/lib/kernel/test/os_SUITE.erl
@@ -0,0 +1,212 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1997-2009. 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(os_SUITE).
+
+-export([all/1]).
+-export([space_in_cwd/1, quoting/1, space_in_name/1, bad_command/1,
+	 find_executable/1, unix_comment_in_command/1]).
+
+-include("test_server.hrl").
+
+all(suite) ->
+    [space_in_cwd, quoting, space_in_name, bad_command, find_executable,
+     unix_comment_in_command].
+
+space_in_cwd(doc) ->
+    "Test that executing a command in a current working directory "
+	"with space in its name works.";
+space_in_cwd(suite) -> [];
+space_in_cwd(Config) when list(Config) ->
+    ?line PrivDir = ?config(priv_dir, Config),
+    ?line Dirname = filename:join(PrivDir, "cwd with space"),
+    ?line ok = file:make_dir(Dirname),
+    ?line ok = file:set_cwd(Dirname),
+
+    %% Using `more' gives the almost the same result on both Unix and Windows.
+
+    Cmd = case os:type() of
+	      {win32, _} ->
+		  "more";
+	      {unix, _} ->
+		  "more </dev/null"
+	  end,
+
+    ?line case os:cmd(Cmd) of
+	      [] -> ok;				% Unix.
+	      "\r\n" -> ok;			% Windows.
+	      Other ->
+		  ?line test_server:fail({unexpected, Other})
+	  end,
+
+    ?t:sleep(5),
+    ?line [] = receive_all(),
+    ok.
+
+quoting(doc) -> "Test that various ways of quoting arguments work.";
+quoting(suite) -> [];
+quoting(Config) when list(Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+    ?line Echo = filename:join(DataDir, "my_echo"),
+
+    ?line comp("one", os:cmd(Echo ++ " one")),
+    ?line comp("one::two", os:cmd(Echo ++ " one two")),
+    ?line comp("one two", os:cmd(Echo ++ " \"one two\"")),
+    ?line comp("x::one two::y", os:cmd(Echo ++ " x \"one two\" y")),
+    ?line comp("x::one two", os:cmd(Echo ++ " x \"one two\"")),
+    ?line comp("one two::y", os:cmd(Echo ++ " \"one two\" y")),
+    ?line comp("x::::y", os:cmd(Echo ++ " x \"\" y")),
+    ?t:sleep(5),
+    ?line [] = receive_all(),
+    ok.
+
+space_in_name(doc) ->
+    "Test that program with a space in its name can be executed.";
+space_in_name(suite) -> [];
+space_in_name(Config) when list(Config) ->
+    ?line PrivDir = ?config(priv_dir, Config),
+    ?line DataDir = ?config(data_dir, Config),
+    ?line Spacedir = filename:join(PrivDir, "program files"),
+    Ext = case os:type() of
+	      {win32,_} -> ".exe";
+	      _ -> ""
+	  end,
+    ?line OrigEcho = filename:join(DataDir, "my_echo" ++ Ext),
+    ?line Echo0 = filename:join(Spacedir, "my_echo" ++ Ext),
+
+    %% Copy the `my_echo' program to a directory whose name contains a space.
+
+    ?line ok = file:make_dir(Spacedir),
+    ?line {ok, Bin} = file:read_file(OrigEcho),
+    ?line ok = file:write_file(Echo0, Bin),
+    ?line Echo = filename:nativename(Echo0),
+    ?line ok = file:change_mode(Echo, 8#777),	% Make it executable on Unix.
+
+    %% Run the echo program.
+
+    ?line comp("", os:cmd("\"" ++ Echo ++ "\"")),
+    ?line comp("a::b::c", os:cmd("\"" ++ Echo ++ "\" a b c")),
+    ?t:sleep(5),
+    ?line [] = receive_all(),
+    ok.
+    
+bad_command(doc) ->
+    "Check that a bad command doesn't crasch the server or the emulator (it used to).";
+bad_command(suite) -> [];
+bad_command(Config) when list(Config) ->
+    ?line catch os:cmd([a|b]),
+    ?line catch os:cmd({bad, thing}),
+
+    %% This should at least not crash (on Unix it typically returns
+    %% a message from the shell).
+    ?line os:cmd("xxxxx"),
+
+    ok.
+
+find_executable(suite) -> [];
+find_executable(doc) -> [];
+find_executable(Config) when list(Config) ->
+    case os:type() of
+	{win32, _} -> 
+	    ?line DataDir = filename:join(?config(data_dir, Config), "win32"),
+	    ?line ok = file:set_cwd(filename:join([DataDir, "current"])),
+	    ?line Bin = filename:join(DataDir, "bin"),
+	    ?line Abin = filename:join(DataDir, "abin"),
+	    ?line UsrBin = filename:join([DataDir, "usr", "bin"]),
+	    ?line {ok, Current} = file:get_cwd(),
+	    
+	    ?line Path = lists:concat([Bin, ";", Abin, ";", UsrBin]),
+	    ?line io:format("Path = ~s", [Path]),
+	    
+	    %% Search for programs in Bin (second element in PATH).
+	    ?line find_exe(Abin, "my_ar", ".exe", Path),
+	    ?line find_exe(Abin, "my_ascii", ".com", Path),
+	    ?line find_exe(Abin, "my_adb", ".bat", Path),
+	    
+	    %% Search for programs in Abin (second element in PATH).
+	    ?line find_exe(Abin, "my_ar", ".exe", Path),
+	    ?line find_exe(Abin, "my_ascii", ".com", Path),
+	    ?line find_exe(Abin, "my_adb", ".bat", Path),
+	    
+	    %% Search for programs in the current working directory.
+	    ?line find_exe(Current, "my_program", ".exe", Path),
+	    ?line find_exe(Current, "my_command", ".com", Path),
+	    ?line find_exe(Current, "my_batch", ".bat", Path),
+	    ok;
+	{unix, _}  -> 
+	    ok;
+	vxworks -> 
+	    ok
+    end.
+
+find_exe(Where, Name, Ext, Path) ->
+    Expected = filename:join(Where, Name++Ext),
+    case os:find_executable(Name, Path) of
+	Expected ->
+	    ok;
+	Name when list(Name) ->
+	    case filename:absname(Name) of
+		Expected ->
+		    ok;
+		Other ->
+		    io:format("Expected ~p; got (converted to absolute) ~p",
+			      [Expected, Other]),
+		    test_server:fail()
+	    end;
+	Other ->
+	    io:format("Expected ~p; got ~p", [Expected, Other]),
+	    test_server:fail()
+    end.
+
+unix_comment_in_command(doc) ->
+    "OTP-1805: Test that os:cmd(\"ls #\") works correctly (used to hang).";
+unix_comment_in_command(suite) -> [];
+unix_comment_in_command(Config) when list(Config) ->
+    ?line Dog = test_server:timetrap(test_server:seconds(20)),
+    ?line Priv = ?config(priv_dir, Config),
+    ?line ok = file:set_cwd(Priv),
+    ?line _ = os:cmd("ls #"),			% Any result is ok.
+    ?t:sleep(5),
+    ?line [] = receive_all(),
+    ?line test_server:timetrap_cancel(Dog),
+    ok.
+
+
+comp(Expected, Got) ->
+    case strip_nl(Got) of
+	Expected ->
+	    ok;
+	Other ->
+	    ok = io:format("Expected: ~s\n", [Expected]),
+	    ok = io:format("Got:      ~s\n", [Other]),
+	    test_server:fail()
+    end.
+
+%% Like lib:nonl/1, but strips \r as well as \n.
+
+strip_nl([$\r, $\n]) -> [];
+strip_nl([$\n])      -> [];
+strip_nl([H|T])      -> [H|strip_nl(T)];
+strip_nl([])         -> [].
+
+receive_all() ->
+    receive
+	X -> [X|receive_all()]
+    after 0 -> []
+    end.
+