aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/test/os_SUITE.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-02-25 15:01:29 +0100
committerBjörn Gustavsson <[email protected]>2016-03-09 14:02:50 +0100
commit362707ca44fcfb269f9d981dee13233f1aa7cf2d (patch)
tree6b31c594a14168614eb4170b8f268c1525e0232b /lib/kernel/test/os_SUITE.erl
parent9870d22b2401b60221aa42c78bdb7ec4a812e9e7 (diff)
downloadotp-362707ca44fcfb269f9d981dee13233f1aa7cf2d.tar.gz
otp-362707ca44fcfb269f9d981dee13233f1aa7cf2d.tar.bz2
otp-362707ca44fcfb269f9d981dee13233f1aa7cf2d.zip
Eliminate use of ?config() macro
?config is ugly and not recommended. Use proplists:get_value/2 instead.
Diffstat (limited to 'lib/kernel/test/os_SUITE.erl')
-rw-r--r--lib/kernel/test/os_SUITE.erl16
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/kernel/test/os_SUITE.erl b/lib/kernel/test/os_SUITE.erl
index 8fd7f0dc3f..271ce80807 100644
--- a/lib/kernel/test/os_SUITE.erl
+++ b/lib/kernel/test/os_SUITE.erl
@@ -63,7 +63,7 @@ space_in_cwd(doc) ->
"with space in its name works.";
space_in_cwd(suite) -> [];
space_in_cwd(Config) when is_list(Config) ->
- ?line PrivDir = ?config(priv_dir, Config),
+ PrivDir = proplists:get_value(priv_dir, Config),
?line Dirname = filename:join(PrivDir, "cwd with space"),
?line ok = file:make_dir(Dirname),
?line ok = file:set_cwd(Dirname),
@@ -91,7 +91,7 @@ space_in_cwd(Config) when is_list(Config) ->
quoting(doc) -> "Test that various ways of quoting arguments work.";
quoting(suite) -> [];
quoting(Config) when is_list(Config) ->
- ?line DataDir = ?config(data_dir, Config),
+ DataDir = proplists:get_value(data_dir, Config),
?line Echo = filename:join(DataDir, "my_echo"),
?line comp("one", os:cmd(Echo ++ " one")),
@@ -109,7 +109,7 @@ quoting(Config) when is_list(Config) ->
cmd_unicode(doc) -> "Test that unicode arguments work.";
cmd_unicode(suite) -> [];
cmd_unicode(Config) when is_list(Config) ->
- ?line DataDir = ?config(data_dir, Config),
+ DataDir = proplists:get_value(data_dir, Config),
?line Echo = filename:join(DataDir, "my_echo"),
?line comp("one", os:cmd(Echo ++ " one")),
@@ -124,8 +124,8 @@ 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 is_list(Config) ->
- ?line PrivDir = ?config(priv_dir, Config),
- ?line DataDir = ?config(data_dir, Config),
+ PrivDir = proplists:get_value(priv_dir, Config),
+ DataDir = proplists:get_value(data_dir, Config),
?line Spacedir = filename:join(PrivDir, "program files"),
Ext = case os:type() of
{win32,_} -> ".exe";
@@ -180,7 +180,7 @@ find_executable(doc) -> [];
find_executable(Config) when is_list(Config) ->
case os:type() of
{win32, _} ->
- ?line DataDir = filename:join(?config(data_dir, Config), "win32"),
+ DataDir = filename:join(proplists:get_value(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"),
@@ -213,7 +213,7 @@ find_executable(Config) when is_list(Config) ->
?line find_exe(Current, "my_batch", ".bat", Path),
ok;
{unix, _} ->
- DataDir = ?config(data_dir, Config),
+ DataDir = proplists:get_value(data_dir, Config),
%% Smoke test.
case lib:progname() of
@@ -254,7 +254,7 @@ 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 is_list(Config) ->
- ?line Priv = ?config(priv_dir, Config),
+ Priv = proplists:get_value(priv_dir, Config),
?line ok = file:set_cwd(Priv),
?line _ = os:cmd("ls #"), % Any result is ok.
?t:sleep(5),