diff options
| author | Lukas Larsson <[email protected]> | 2012-06-08 17:33:12 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-06-08 17:33:12 +0200 |
| commit | 3341122a92e71ade3edc7ecaadab9f55da29e20d (patch) | |
| tree | 3f8fab1fc3681a0c5b0fda11ed34cf4631f81adf /lib/test_server/src/test_server_node.erl | |
| parent | b4b4c6299d3926e55b042ea45f55adaeec41cb6f (diff) | |
| parent | a977c40ac2c290623e20e9df32315eb6a1bdf55d (diff) | |
| download | otp-3341122a92e71ade3edc7ecaadab9f55da29e20d.tar.gz otp-3341122a92e71ade3edc7ecaadab9f55da29e20d.tar.bz2 otp-3341122a92e71ade3edc7ecaadab9f55da29e20d.zip | |
Merge branch 'lukas/otp/install_with_whitespace/OTP-10107' into maint
* lukas/otp/install_with_whitespace/OTP-10107:
Update to work with space in include path
Update to work with whitespace in exec path
Diffstat (limited to 'lib/test_server/src/test_server_node.erl')
| -rw-r--r-- | lib/test_server/src/test_server_node.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/test_server/src/test_server_node.erl b/lib/test_server/src/test_server_node.erl index e8498a43f2..6358efa764 100644 --- a/lib/test_server/src/test_server_node.erl +++ b/lib/test_server/src/test_server_node.erl @@ -407,7 +407,7 @@ start_node_peer(SlaveName, OptList, From, TI) -> % Support for erl_crash_dump files.. CrashFile = filename:join([TI#target_info.test_server_dir, "erl_crash_dump."++cast_to_list(SlaveName)]), - CrashArgs = lists:concat([" -env ERL_CRASH_DUMP ",CrashFile," "]), + CrashArgs = lists:concat([" -env ERL_CRASH_DUMP \"",CrashFile,"\" "]), FailOnError = start_node_get_option_value(fail_on_error, OptList, true), Pa = TI#target_info.test_server_dir, Prog0 = start_node_get_option_value(erl, OptList, default), @@ -420,7 +420,7 @@ start_node_peer(SlaveName, OptList, From, TI) -> Cmd = lists:concat([Prog, " -detached ", TI#target_info.naming, " ", SlaveName, - " -pa ", Pa, + " -pa \"", Pa,"\"", NodeStarted, CrashArgs, " ", Args]), @@ -472,9 +472,9 @@ start_node_slave(SlaveName, OptList, From, TI) -> CrashFile = filename:join([TI#target_info.test_server_dir, "erl_crash_dump."++cast_to_list(SlaveName)]), - CrashArgs = lists:concat([" -env ERL_CRASH_DUMP ",CrashFile," "]), + CrashArgs = lists:concat([" -env ERL_CRASH_DUMP \"",CrashFile,"\" "]), Pa = TI#target_info.test_server_dir, - Args = lists:concat([" -pa ", Pa, " ", SuppliedArgs, CrashArgs]), + Args = lists:concat([" -pa \"", Pa, "\" ", SuppliedArgs, CrashArgs]), Prog0 = start_node_get_option_value(erl, OptList, default), Prog = pick_erl_program(Prog0), |