Merge branch 'maint'

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/stdlib/test/escript_SUITE.erl b/lib/stdlib/test/escript_SUITE.erl
index b6cdd0a9c7..eebfec3336 100644
--- a/lib/stdlib/test/escript_SUITE.erl
+++ b/lib/stdlib/test/escript_SUITE.erl
@@ -615,7 +615,7 @@ archive_script_file_access(Config) when is_list(Config) ->
     %% 3. If symlinks are supported, run one of the scripts via a symlink.
     %%
     %% This is in order to test error b) described above this test case.
-    case file:read_link(Symlink2) of
+    case element(1,os:type()) =:= win32 orelse file:read_link(Symlink2) of
 	{ok,_} ->
 	    run(PrivDir, "./" ++ SymlinkName2 ++ " " ++ ScriptName2,
 		[<<"ExitCode:0">>]);
diff --git a/lib/stdlib/test/escript_SUITE_data/archive_script_file_access/archive_script_file_access.erl b/lib/stdlib/test/escript_SUITE_data/archive_script_file_access/archive_script_file_access.erl
index b03c8ba70d..523621e4f3 100644
--- a/lib/stdlib/test/escript_SUITE_data/archive_script_file_access/archive_script_file_access.erl
+++ b/lib/stdlib/test/escript_SUITE_data/archive_script_file_access/archive_script_file_access.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2013. 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
@@ -56,7 +56,7 @@ main([RelArchiveFile]) ->
 
     %% If symlinks are supported on this platform...
     RelSymlinkArchiveFile = "symlink_to_" ++ RelArchiveFile,
-    case file:read_link(RelSymlinkArchiveFile) of
+    case element(1,os:type()) =:= win32 orelse file:read_link(RelSymlinkArchiveFile) of
 	{ok,_} ->
 	    DotSlashSymlinkArchiveFile = "./" ++ RelSymlinkArchiveFile,
 	    AbsSymlinkArchiveFile=filename:join(filename:dirname(AbsArchiveFile),