diff options
author | Björn-Egil Dahlberg <[email protected]> | 2016-04-07 16:30:31 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2016-04-07 16:30:31 +0200 |
commit | 2f1ce217b9eaa0ef4be778193e232ee5faf00a15 (patch) | |
tree | 0fd88de2faf6f7750d07f3b6b8b79ecb85a556a1 | |
parent | 51f4cb8a43162df3aa2caade4535db31fb979b76 (diff) | |
download | otp-2f1ce217b9eaa0ef4be778193e232ee5faf00a15.tar.gz otp-2f1ce217b9eaa0ef4be778193e232ee5faf00a15.tar.bz2 otp-2f1ce217b9eaa0ef4be778193e232ee5faf00a15.zip |
Replace test_server:os_type/0 with os:type/0
-rw-r--r-- | erts/test/ignore_cores.erl | 2 | ||||
-rw-r--r-- | erts/test/install_SUITE.erl | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/erts/test/ignore_cores.erl b/erts/test/ignore_cores.erl index 4af5efe834..da6f6850c6 100644 --- a/erts/test/ignore_cores.erl +++ b/erts/test/ignore_cores.erl @@ -94,7 +94,7 @@ setup(Suite, Testcase, Config, SetCwd) when is_atom(Suite), end, ok = file:write_file(filename:join([IgnDir, "ignore_core_files"]), <<>>), %% cores are dumped in /cores on MacOS X - CoresDir = case {?t:os_type(), filelib:is_dir("/cores")} of + CoresDir = case {os:type(), filelib:is_dir("/cores")} of {{unix,darwin}, true} -> filelib:fold_files("/cores", "^core.*$", diff --git a/erts/test/install_SUITE.erl b/erts/test/install_SUITE.erl index 4f244d2476..a9a90dcf1e 100644 --- a/erts/test/install_SUITE.erl +++ b/erts/test/install_SUITE.erl @@ -550,23 +550,23 @@ expect(X, Y) -> init_per_suite(Config) -> PD = proplists:get_value(priv_dir, Config), - SymLinks = case ?t:os_type() of - {win32, _} -> false; - _ -> - case file:make_symlink("nothing", - filename:join(PD, - "symlink_test")) of - ok -> true; - _ -> false - end - end, + SymLinks = case os:type() of + {win32, _} -> false; + _ -> + case file:make_symlink("nothing", + filename:join(PD, "symlink_test")) of + ok -> true; + _ -> false + end + end, [{symlinks, SymLinks} | Config]. end_per_suite(_Config) -> ok. init_per_testcase(Case, Config) -> - init_per_testcase_aux(proplists:get_value(symlinks,Config),?t:os_type(),Case,Config). + init_per_testcase_aux(proplists:get_value(symlinks,Config), + os:type(),Case,Config). init_per_testcase_aux(_, {win32, _}, _Case, _Config) -> {skip, "Not on windows"}; |