[openssl] master update
Richard Levitte
levitte at openssl.org
Wed Mar 4 11:57:14 UTC 2020
The branch master has been updated
via 6caf63ec4871a578f6f99c668b67e495ccc2bbf6 (commit)
from a8055c70fa0828636b99fe613a642a2066c0aa8b (commit)
- Log -----------------------------------------------------------------
commit 6caf63ec4871a578f6f99c668b67e495ccc2bbf6
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Feb 26 14:57:39 2020 +0100
.travis.yml: where it matters, have build and source nesting levels differ
Where we build out of source, the source directory was _srcdist and
the build directory was _build. That gives the same nesting level for
both, which doesn't quite exercise all aspects of relative back
references from build to source tree.
Changing the build tree to be in _build/tree will challenge back
references a bit more, and ensure a bit more that we got it right.
Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
(Merged from https://github.com/openssl/openssl/pull/11186)
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a015eb4053..f77f8c7586 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -170,10 +170,10 @@ before_script:
- if [ -n "$DESTDIR" ]; then
sh .travis-create-release.sh $TRAVIS_OS_NAME;
tar -xzf _srcdist.tar.gz;
- mkdir _build;
- cd _build;
- srcdir=../_srcdist;
- top=..;
+ mkdir -p _build/tree;
+ cd _build/tree;
+ srcdir=../../_srcdist;
+ top=../..;
else
srcdir=.;
top=.;
@@ -210,7 +210,7 @@ script:
fi
- top=${PWD}
- if [ -n "$DESTDIR" ]; then
- cd _build;
+ cd _build/tree;
fi
- if ! $make update; then
echo -e '\052\052 FAILED -- MAKE UPDATE';
More information about the openssl-commits
mailing list