aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-10-24 11:18:43 +0200
committerSiri Hansen <[email protected]>2014-10-24 11:18:43 +0200
commit9c6a5be013be2d88935a4c74e8dff92376821a0d (patch)
tree04682963e2ad49e0a803e2f93c124859e20e52df /erts
parent4dd483c187317ace77d052eec43cc34efb9b00a3 (diff)
parentc5589decd09020c66c4451585a6c5f76c3b21edd (diff)
downloadotp-9c6a5be013be2d88935a4c74e8dff92376821a0d.tar.gz
otp-9c6a5be013be2d88935a4c74e8dff92376821a0d.tar.bz2
otp-9c6a5be013be2d88935a4c74e8dff92376821a0d.zip
Merge branch 'siri/test-upgrade'
* siri/test-upgrade: Add upgrade test in stdlib_SUITE [ct] Add ct_release_tests.erl Specify tar-file as basename in upgrade_SUITE
Diffstat (limited to 'erts')
-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,[]),