diff options
| author | Dan Gudmundsson <[email protected]> | 2013-02-26 12:22:09 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-02-26 13:14:44 +0100 |
| commit | 27db861821db111d0f0355ae5c1bbb08b0f892af (patch) | |
| tree | e9b47f1171b78d03c60555c85092caa468d141ee /lib/stdlib/test | |
| parent | 29bfbfdde67e7a0d182aa791317e1d80fe8d0d5d (diff) | |
| download | otp-27db861821db111d0f0355ae5c1bbb08b0f892af.tar.gz otp-27db861821db111d0f0355ae5c1bbb08b0f892af.tar.bz2 otp-27db861821db111d0f0355ae5c1bbb08b0f892af.zip | |
stdlib: Ignore symlink tests on windows
Symlinks only partially works on windows 7, ignore those tests
on windows machines for now
Diffstat (limited to 'lib/stdlib/test')
| -rw-r--r-- | lib/stdlib/test/escript_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/stdlib/test/escript_SUITE_data/archive_script_file_access/archive_script_file_access.erl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/stdlib/test/escript_SUITE.erl b/lib/stdlib/test/escript_SUITE.erl index cf5fb12686..a28be65ec3 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), |