diff options
| author | Dan Gudmundsson <[email protected]> | 2013-03-26 11:30:02 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-03-26 11:30:02 +0100 |
| commit | 61613acb659553004538ad13ded3d6bf343bf6a7 (patch) | |
| tree | 7f612de6f889f19b483e8be4d18455826476977f /lib/stdlib/test/escript_SUITE_data | |
| parent | b2ad2c6e0261a410b53e5be8f1ae38a12408aa8f (diff) | |
| parent | 7e884c7d51bc8b0e03673998b242dc6edee3a28e (diff) | |
| download | otp-61613acb659553004538ad13ded3d6bf343bf6a7.tar.gz otp-61613acb659553004538ad13ded3d6bf343bf6a7.tar.bz2 otp-61613acb659553004538ad13ded3d6bf343bf6a7.zip | |
Merge branch 'dgud/testcase_fixes' into maint
* dgud/testcase_fixes:
Fix timers
mnesia: Decrease test times
Add debug printouts
wx: Fix failing testcases
stdlib: Ignore symlink tests on windows
Diffstat (limited to 'lib/stdlib/test/escript_SUITE_data')
| -rw-r--r-- | lib/stdlib/test/escript_SUITE_data/archive_script_file_access/archive_script_file_access.erl | 4 |
1 files changed, 2 insertions, 2 deletions
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), |