aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-08-08 16:17:30 +0200
committerSiri Hansen <[email protected]>2012-08-08 16:17:30 +0200
commit4e3cd7868d0d42c066b8222472b741195c76ecad (patch)
tree405e1813cc8d3bebd12e2e795e2409594c14b22b /lib
parent07835e74471b9ad1c8399806643db752aa237566 (diff)
downloadotp-4e3cd7868d0d42c066b8222472b741195c76ecad.tar.gz
otp-4e3cd7868d0d42c066b8222472b741195c76ecad.tar.bz2
otp-4e3cd7868d0d42c066b8222472b741195c76ecad.zip
Bugfix escript_SUITE:archive_script_file_access
Used internal function do_run/3 instead of run/3 for executing escript. This will always fail on windows.
Diffstat (limited to 'lib')
-rw-r--r--lib/stdlib/test/escript_SUITE.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/stdlib/test/escript_SUITE.erl b/lib/stdlib/test/escript_SUITE.erl
index e76d0972f3..38c085616d 100644
--- a/lib/stdlib/test/escript_SUITE.erl
+++ b/lib/stdlib/test/escript_SUITE.erl
@@ -557,8 +557,8 @@ archive_script_file_access(Config) when is_list(Config) ->
%% Change to script's directory and run it as "./<script_name>"
ok = file:set_cwd(PrivDir),
- do_run(PrivDir, "./" ++ ScriptName1 ++ " " ++ ScriptName1,
- [<<"ExitCode:0">>]),
+ run(PrivDir, "./" ++ ScriptName1 ++ " " ++ ScriptName1,
+ [<<"ExitCode:0">>]),
ok = file:set_cwd(TopDir),
@@ -591,16 +591,16 @@ archive_script_file_access(Config) when is_list(Config) ->
%% Change to script's directory and run it as "./<script_name>"
ok = file:set_cwd(PrivDir),
- do_run(PrivDir, "./" ++ ScriptName2 ++ " " ++ ScriptName2,
- [<<"ExitCode:0">>]),
+ run(PrivDir, "./" ++ ScriptName2 ++ " " ++ ScriptName2,
+ [<<"ExitCode:0">>]),
%% 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
{ok,_} ->
- do_run(PrivDir, "./" ++ SymlinkName2 ++ " " ++ ScriptName2,
- [<<"ExitCode:0">>]);
+ run(PrivDir, "./" ++ SymlinkName2 ++ " " ++ ScriptName2,
+ [<<"ExitCode:0">>]);
_ -> % not supported
ok
end,