diff options
| author | Siri Hansen <[email protected]> | 2011-11-30 10:53:43 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2011-11-30 10:53:43 +0100 |
| commit | ca03aa3d8a97e5d63c1055c19d2bd5a037acc28f (patch) | |
| tree | 947f444bb0978e3f627f6ccd0459eff40c5224b5 /lib/sasl/test/release_handler_SUITE.erl | |
| parent | f7c881208154dcae6d0b753a160eb771710bd47a (diff) | |
| parent | 09c280951476aa6c30fd3aa54d99ddc6ced64ccf (diff) | |
| download | otp-ca03aa3d8a97e5d63c1055c19d2bd5a037acc28f.tar.gz otp-ca03aa3d8a97e5d63c1055c19d2bd5a037acc28f.tar.bz2 otp-ca03aa3d8a97e5d63c1055c19d2bd5a037acc28f.zip | |
Merge branch 'siri/sasl/duplicate-rel-file/OTP-9746'
* siri/sasl/duplicate-rel-file/OTP-9746:
Add copy of rel file in releases/<vsn> in release tar file
Diffstat (limited to 'lib/sasl/test/release_handler_SUITE.erl')
| -rw-r--r-- | lib/sasl/test/release_handler_SUITE.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl index 454fe26323..4e5742a5d4 100644 --- a/lib/sasl/test/release_handler_SUITE.erl +++ b/lib/sasl/test/release_handler_SUITE.erl @@ -1395,6 +1395,7 @@ target_system(Conf) when is_list(Conf) -> KernelVsn = vsn(kernel,current), StdlibVsn = vsn(stdlib,current), SaslVsn = vsn(sasl,current), + RelFileBasename = filename:basename(RelFile), true = filelib:is_dir(filename:join(LibDir,"kernel-"++KernelVsn)), true = filelib:is_dir(filename:join(LibDir,"stdlib-"++StdlibVsn)), true = filelib:is_dir(filename:join(LibDir,"sasl-"++SaslVsn)), @@ -1402,10 +1403,10 @@ target_system(Conf) when is_list(Conf) -> RelDir = filename:join(TargetInstallDir,releases), true = filelib:is_regular(filename:join(RelDir,"RELEASES")), true = filelib:is_regular(filename:join(RelDir,"start_erl.data")), - true = filelib:is_regular(filename:join(RelDir, - filename:basename(RelFile))), + true = filelib:is_regular(filename:join(RelDir,RelFileBasename)), true = filelib:is_dir(filename:join(RelDir,RelVsn)), true = filelib:is_regular(filename:join([RelDir,RelVsn,"start.boot"])), + true = filelib:is_regular(filename:join([RelDir,RelVsn,RelFileBasename])), BinDir = filename:join(TargetInstallDir,bin), true = filelib:is_regular(filename:join(BinDir,"start.boot")), true = filelib:is_regular(filename:join(BinDir,erl)), |