aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/test/escript_SUITE.erl
diff options
context:
space:
mode:
authorDan Gudmundsson <dgud@erlang.org>2013-03-26 11:30:02 +0100
committerDan Gudmundsson <dgud@erlang.org>2013-03-26 11:30:02 +0100
commit61613acb659553004538ad13ded3d6bf343bf6a7 (patch)
tree7f612de6f889f19b483e8be4d18455826476977f /lib/stdlib/test/escript_SUITE.erl
parentb2ad2c6e0261a410b53e5be8f1ae38a12408aa8f (diff)
parent7e884c7d51bc8b0e03673998b242dc6edee3a28e (diff)
downloadotp-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.erl')
-rw-r--r--lib/stdlib/test/escript_SUITE.erl2
1 files changed, 1 insertions, 1 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">>]);