diff options
| author | Siri Hansen <[email protected]> | 2013-02-13 20:53:45 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-05-14 17:01:54 +0200 |
| commit | 44b76ccb2f2640e27214f3286acb5d798920babc (patch) | |
| tree | c227fd82bb90e7fd271fcf2c3a0b8e5a3715a0a5 /lib/sasl/test/installer.erl | |
| parent | 6a093c47d87707480d1710fc6790b57f1520cef7 (diff) | |
| download | otp-44b76ccb2f2640e27214f3286acb5d798920babc.tar.gz otp-44b76ccb2f2640e27214f3286acb5d798920babc.tar.bz2 otp-44b76ccb2f2640e27214f3286acb5d798920babc.zip | |
[sasl] Update tests to run under unicode path
In order to test that unicode paths can be used in release handling,
the release_handler_SUITE will use a priv_dir with unicode characters
if the file name translation mode is utf8 (not on windows).
Diffstat (limited to 'lib/sasl/test/installer.erl')
| -rw-r--r-- | lib/sasl/test/installer.erl | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/sasl/test/installer.erl b/lib/sasl/test/installer.erl index 709269a73c..fa404c8b7b 100644 --- a/lib/sasl/test/installer.erl +++ b/lib/sasl/test/installer.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2011-2012. All Rights Reserved. +%% Copyright Ericsson AB 2011-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 @@ -54,8 +54,12 @@ -export([reg_proc/1]). -export([registered_loop/1]). --define(print(List), {rh_print, TestNode} ! {print, {?MODULE, ?LINE}, List}). --define(print_line(Line,List), {rh_print, TestNode} ! {print, {?MODULE, Line}, List}). +-define(print(List), + io:format(user,"(~w:~w) ~tp~n",[?MODULE,?LINE,List]), + {rh_print, TestNode} ! {print, {?MODULE, ?LINE}, List}). +-define(print_line(Line,List), + io:format(user,"(~w:~w) ~tp~n",[?MODULE,Line,List]), + {rh_print, TestNode} ! {print, {?MODULE, Line}, List}). -define(fail(Term), exit({?MODULE, ?LINE, Term})). -define(fail_line(Line,Term), exit({?MODULE, Line, Term})). @@ -905,10 +909,9 @@ start_client(TestNode,Client,Sname) -> start_client_unix(TestNode,Sname,Node) -> Start = filename:join(["clients", "type1", Node, "bin", "start"]), - Cmd = lists:concat(["env NODENAME=",Sname," ", - filename:join(code:root_dir(), Start)]), + Cmd = filename:join(code:root_dir(), Start), ?print([{start_client,Sname},Cmd]), - Res = os:cmd(Cmd), + Res = rh_test_lib:cmd(Cmd,[],[{"NODENAME",atom_to_list(Sname)}]), ?print([{start_client,result},Res]). start_client_win32(TestNode,Client,ClientSname) -> |