diff options
| author | Siri Hansen <[email protected]> | 2014-06-18 09:59:01 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-06-18 09:59:01 +0200 |
| commit | 430b85d9b6c4b3afbcca771304941679c2c89513 (patch) | |
| tree | 37fa87662281bfe791bafbe8f781a38f6abcc1d9 /lib | |
| parent | e08762b65f13fa4e5eeb030eaf56be73433aa5f4 (diff) | |
| parent | 8f9a3727005a75ab958317af983d15c7a9b667ba (diff) | |
| download | otp-430b85d9b6c4b3afbcca771304941679c2c89513.tar.gz otp-430b85d9b6c4b3afbcca771304941679c2c89513.tar.bz2 otp-430b85d9b6c4b3afbcca771304941679c2c89513.zip | |
Merge branch 'siri/cuddle-with-tests' into maint
* siri/cuddle-with-tests:
[reltool] Back out adaption to better quoting on windows
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/reltool/test/reltool_server_SUITE.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl index b3b7afd1a9..347e80ed7c 100644 --- a/lib/reltool/test/reltool_server_SUITE.erl +++ b/lib/reltool/test/reltool_server_SUITE.erl @@ -1205,9 +1205,14 @@ create_slim(Config) -> RootDir = code:root_dir(), Erl = filename:join([RootDir, "bin", "erl"]), + EscapedQuote = + case os:type() of + {win32,_} -> "\\\""; + _ -> "\"" + end, Args = ["-boot_var", "RELTOOL_EXT_LIB", TargetLibDir, "-boot", filename:join(TargetRelVsnDir,RelName), - "-sasl", "releases_dir", "\""++TargetRelDir++"\""], + "-sasl", "releases_dir", EscapedQuote++TargetRelDir++EscapedQuote], {ok, Node} = ?msym({ok, _}, start_node(?NODE_NAME, Erl, Args)), ?msym(RootDir, rpc:call(Node, code, root_dir, [])), wait_for_app(Node,sasl,50), |