diff options
| author | Siri Hansen <[email protected]> | 2014-04-22 12:10:51 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-04-22 12:10:51 +0200 |
| commit | 5ce2b6588eb2a237e757265a83de28d997a13c3d (patch) | |
| tree | 0402898c0e421634af657322bf1e6f4e5f576724 /lib/reltool/test/reltool_server_SUITE.erl | |
| parent | ed1c35ea483db86d208335f43565026b12c426d6 (diff) | |
| parent | 710a1fa0c47eb7bfd1047bb6f8538c8a0fd20e62 (diff) | |
| download | otp-5ce2b6588eb2a237e757265a83de28d997a13c3d.tar.gz otp-5ce2b6588eb2a237e757265a83de28d997a13c3d.tar.bz2 otp-5ce2b6588eb2a237e757265a83de28d997a13c3d.zip | |
Merge branch 'siri/cuddle-with-tests' into maint
* siri/cuddle-with-tests:
[reltool] Adapt tests to better quoting of paths on windows
[reltool] Increase timetrap timeout to handle slow test machines
Skip test when needed applications are missing
Don't allow slave nodes to survive their test case
Diffstat (limited to 'lib/reltool/test/reltool_server_SUITE.erl')
| -rw-r--r-- | lib/reltool/test/reltool_server_SUITE.erl | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl index bfe5d39d53..b3b7afd1a9 100644 --- a/lib/reltool/test/reltool_server_SUITE.erl +++ b/lib/reltool/test/reltool_server_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2009-2013. All Rights Reserved. +%% Copyright Ericsson AB 2009-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -1205,14 +1205,9 @@ 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", EscapedQuote++TargetRelDir++EscapedQuote], + "-sasl", "releases_dir", "\""++TargetRelDir++"\""], {ok, Node} = ?msym({ok, _}, start_node(?NODE_NAME, Erl, Args)), ?msym(RootDir, rpc:call(Node, code, root_dir, [])), wait_for_app(Node,sasl,50), |