aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorJonas Karlsson <[email protected]>2013-11-22 09:45:05 +0100
committerLukas Larsson <[email protected]>2014-02-24 15:16:01 +0100
commit3d24208d607501207af371098c1466758844e667 (patch)
treeeac7ea6e50b820332bcc7dd6c0f186d4265a289e /lib/kernel
parent7d924d6c1279178db9c81fd04dd87c8d902a6549 (diff)
downloadotp-3d24208d607501207af371098c1466758844e667.tar.gz
otp-3d24208d607501207af371098c1466758844e667.tar.bz2
otp-3d24208d607501207af371098c1466758844e667.zip
ose: efile driver updates.
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/test/file_SUITE.erl23
-rw-r--r--lib/kernel/test/prim_file_SUITE.erl9
2 files changed, 19 insertions, 13 deletions
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index 15b7016f7d..6b52493f46 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -1261,7 +1261,7 @@ file_info_basic_directory(Config) when is_list(Config) ->
?line test_directory("/", read_write),
?line test_directory("c:/", read_write),
?line test_directory("c:\\", read_write);
- {unix, _} ->
+ _ ->
?line test_directory("/", read)
end,
test_server:timetrap_cancel(Dog).
@@ -2045,15 +2045,15 @@ e_delete(Config) when is_list(Config) ->
%% No permission.
?line case os:type() of
- {unix, _} ->
+ {win32, _} ->
+ %% Remove a character device.
+ ?line {error, eacces} = ?FILE_MODULE:delete("nul");
+ _ ->
?line ?FILE_MODULE:write_file_info(
Base, #file_info {mode=0}),
?line {error, eacces} = ?FILE_MODULE:delete(Afile),
?line ?FILE_MODULE:write_file_info(
- Base, #file_info {mode=8#600});
- {win32, _} ->
- %% Remove a character device.
- ?line {error, eacces} = ?FILE_MODULE:delete("nul")
+ Base, #file_info {mode=8#600})
end,
?line [] = flush(),
@@ -2155,6 +2155,9 @@ e_rename(Config) when is_list(Config) ->
%% At least Windows NT can
%% successfully move a file to
%% another drive.
+ ok;
+ {ose, _} ->
+ %% disabled for now
ok
end,
[] = flush(),
@@ -2235,14 +2238,14 @@ e_del_dir(Config) when is_list(Config) ->
%% No permission.
case os:type() of
- {unix, _} ->
+ {win32, _} ->
+ ok;
+ _ ->
ADirectory = filename:join(Base, "no_perm"),
ok = ?FILE_MODULE:make_dir(ADirectory),
?FILE_MODULE:write_file_info( Base, #file_info {mode=0}),
{error, eacces} = ?FILE_MODULE:del_dir(ADirectory),
- ?FILE_MODULE:write_file_info( Base, #file_info {mode=8#600});
- {win32, _} ->
- ok
+ ?FILE_MODULE:write_file_info( Base, #file_info {mode=8#600})
end,
[] = flush(),
test_server:timetrap_cancel(Dog),
diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl
index 84618a881e..3e6a85eadd 100644
--- a/lib/kernel/test/prim_file_SUITE.erl
+++ b/lib/kernel/test/prim_file_SUITE.erl
@@ -454,7 +454,7 @@ open1(Config) when is_list(Config) ->
?line {ok,0} = ?PRIM_FILE:position(Fd1,bof),
?line {ok, Str} = ?PRIM_FILE:read(Fd1,Length),
?line case ?PRIM_FILE:read(Fd2,Length) of
- Str -> Str;
+ {ok,Str} -> Str;
eof -> Str
end,
?line ok = ?PRIM_FILE:close(Fd2),
@@ -1664,7 +1664,7 @@ e_rename(Config) when is_list(Config) ->
%% successfully move a file to
%% another drive.
ok;
- _ ->
+ {unix, _ } ->
OtherFs = "/tmp",
?line NameOnOtherFs =
filename:join(OtherFs,
@@ -1688,7 +1688,10 @@ e_rename(Config) when is_list(Config) ->
Else ->
Else
end,
- Com
+ Com;
+ {ose, _} ->
+ %% disabled for now
+ ok
end,
?line test_server:timetrap_cancel(Dog),
Comment.