diff options
author | Lukas Larsson <[email protected]> | 2012-06-08 17:33:41 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2012-06-08 17:33:41 +0200 |
commit | 1fc1233587a00b318ce15fd520b057dee726a7fc (patch) | |
tree | 1a7c446ee60b922fb11c89c930f32f55719015f1 /lib/test_server/src/ts_make.erl | |
parent | d7554d5b53ef85861bb5593fba38f65c40faca33 (diff) | |
parent | 3341122a92e71ade3edc7ecaadab9f55da29e20d (diff) | |
download | otp-1fc1233587a00b318ce15fd520b057dee726a7fc.tar.gz otp-1fc1233587a00b318ce15fd520b057dee726a7fc.tar.bz2 otp-1fc1233587a00b318ce15fd520b057dee726a7fc.zip |
Merge branch 'maint'
* maint:
Update to work with space in include path
Update to work with whitespace in exec path
Diffstat (limited to 'lib/test_server/src/ts_make.erl')
-rw-r--r-- | lib/test_server/src/ts_make.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/test_server/src/ts_make.erl b/lib/test_server/src/ts_make.erl index f0db60013a..1d8ef230c7 100644 --- a/lib/test_server/src/ts_make.erl +++ b/lib/test_server/src/ts_make.erl @@ -85,7 +85,7 @@ run_make_script({win32, _}, Make, Dir, Makefile) -> {"run_make.bat", ".\\run_make", ["@echo off\r\n", - "cd ", filename:nativename(Dir), "\r\n", + "cd \"", filename:nativename(Dir), "\"\r\n", Make, " -f ", Makefile, " \r\n", "if errorlevel 1 echo *error*\r\n", "if not errorlevel 1 echo *ok*\r\n"]}; @@ -93,7 +93,7 @@ run_make_script({unix, _}, Make, Dir, Makefile) -> {"run_make", "/bin/sh ./run_make", ["#!/bin/sh\n", - "cd ", Dir, "\n", + "cd \"", Dir, "\"\n", Make, " -f ", Makefile, " 2>&1\n", "case $? in\n", " 0) echo '*ok*';;\n", |