diff options
| author | Dan Gudmundsson <[email protected]> | 2013-06-04 12:38:31 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-06-04 12:38:31 +0200 |
| commit | e83fd8f94aba352b6cc055d2b4cfff007911b6d4 (patch) | |
| tree | 66b22e7e79813d9ec2b0f5a9817a3908682a22ee /erts/test/nt_SUITE.erl | |
| parent | e00d6bbbabd7b76c050665fc417e81554a83e341 (diff) | |
| parent | ee23d4b549618044d4a4f800db839483b359cb9f (diff) | |
| download | otp-e83fd8f94aba352b6cc055d2b4cfff007911b6d4.tar.gz otp-e83fd8f94aba352b6cc055d2b4cfff007911b6d4.tar.bz2 otp-e83fd8f94aba352b6cc055d2b4cfff007911b6d4.zip | |
Merge branch 'dgud/win32_unicode'
* dgud/win32_unicode:
erts: Windows, convert erlsrv to use widestring
erts: Window start_erl now uses widechars/unicode
Quote windows paths with spaces
Handle space in paths in test Makefiles
erts: Fix windows widestring args and paths in tools
erts: Windows, use widechars for all paths during startup
OTP-11135
Diffstat (limited to 'erts/test/nt_SUITE.erl')
| -rw-r--r-- | erts/test/nt_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/test/nt_SUITE.erl b/erts/test/nt_SUITE.erl index 7580a7b364..2e4184e7f1 100644 --- a/erts/test/nt_SUITE.erl +++ b/erts/test/nt_SUITE.erl @@ -74,7 +74,7 @@ end_per_testcase(_Func, Config) -> ok. erlsrv() -> - os:find_executable(erlsrv). + "\"" ++ os:find_executable(erlsrv) ++ "\"". recv_prog_output(Port) -> @@ -542,7 +542,7 @@ get_current_procs(Config) -> ?line erl_parse:parse_term(Tok). nt_info(Config) when is_list(Config) -> - ?line filename:join(?config(data_dir, Config), "nt_info"). + ?line "\"" ++ filename:join(?config(data_dir, Config), "nt_info") ++ "\"". logdir(Config) -> |