From 8f9a3727005a75ab958317af983d15c7a9b667ba Mon Sep 17 00:00:00 2001 From: Siri Hansen Date: Wed, 18 Jun 2014 09:57:59 +0200 Subject: [reltool] Back out adaption to better quoting on windows This commit only changes the test. It reverts commit 710a1fa ([reltool] Adapt tests to better quoting of paths on windows) because the commit that actually changed the quoting behaviour on windows was moved from the maint branch to master (9633e0e win32: Fix quoting of paths). --- lib/reltool/test/reltool_server_SUITE.erl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib') 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), -- cgit v1.2.3