aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-10-06 14:13:56 +0200
committerSiri Hansen <[email protected]>2014-10-06 14:13:56 +0200
commitaeb2316c8ee83a1a39a4b179f8b844cb02bf918a (patch)
tree3bc96cd9986c2c7d3803acfa3480711d86f3a703
parentf2d08e107a735529e5ec8815d3cac530d77ba8c6 (diff)
downloadotp-aeb2316c8ee83a1a39a4b179f8b844cb02bf918a.tar.gz
otp-aeb2316c8ee83a1a39a4b179f8b844cb02bf918a.tar.bz2
otp-aeb2316c8ee83a1a39a4b179f8b844cb02bf918a.zip
Specify tar-file as basename in upgrade_SUITE
Earlier, the tar-file containing the to-release was specified with absolut path. The correct way to do this is instead to copy the file to the $ROOT/releases directory and only specify the basename of the file in the call to release_handler:unpack_release/1.
-rw-r--r--erts/test/upgrade_SUITE.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/test/upgrade_SUITE.erl b/erts/test/upgrade_SUITE.erl
index d5a920e03d..7b3bc1b063 100644
--- a/erts/test/upgrade_SUITE.erl
+++ b/erts/test/upgrade_SUITE.erl
@@ -237,7 +237,10 @@ do_upgrade(FromVsn,FromApps,ToRel,ToApps,InstallDir) ->
[{"OTP upgrade test",FromVsn,_,permanent}] =
rpc:call(Node,release_handler,which_releases,[]),
- {ok,ToVsn} = rpc:call(Node,release_handler,unpack_release,[ToRel]),
+ ToRelName = filename:basename(ToRel),
+ copy_file(ToRel++".tar.gz",
+ filename:join([InstallDir,releases,ToRelName++".tar.gz"])),
+ {ok,ToVsn} = rpc:call(Node,release_handler,unpack_release,[ToRelName]),
[{"OTP upgrade test",ToVsn,_,unpacked},
{"OTP upgrade test",FromVsn,_,permanent}] =
rpc:call(Node,release_handler,which_releases,[]),