diff options
author | Richard Levitte <levitte@openssl.org> | 2016-08-04 11:50:39 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-08-04 16:49:36 +0200 |
commit | 262ee9a2c205515b9a3afcde126bea866aa55d6a (patch) | |
tree | 829340aea7aac23039e7874fcc314a9f9521698d /.travis.yml | |
parent | 81dd99902869c666932ece1e5a39d3b18f2f4b04 (diff) | |
download | openssl-262ee9a2c205515b9a3afcde126bea866aa55d6a.tar.gz |
Travis: When testing installation, build in separate dir, otherwise in checkout
The rationale is that installation from a tarball is a common task
that everyone performs. For all other builds, we do specialised
tests, and might as well build them directly in the checkout, which
also gives us fuzz corpora.
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index a278cb2c9f..aee34cf8f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,26 +59,38 @@ matrix: compiler: gcc before_script: - - sh .travis-create-release.sh $TRAVIS_OS_NAME - - tar -xvzf _srcdist.tar.gz - - mkdir _build; - - cd _build; + - if [ -n "$DESTDIR" ]; then + sh .travis-create-release.sh $TRAVIS_OS_NAME; + tar -xvzf _srcdist.tar.gz; + mkdir _build; + cd _build; + srcdir=../_srcdist; + top=..; + else + srcdir=.; + top=.; + fi - if [ "$CC" == i686-w64-mingw32-gcc ]; then export CROSS_COMPILE=${CC%%gcc}; unset CC; - ../_srcdist/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; + $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then export CROSS_COMPILE=${CC%%gcc}; unset CC; - ../_srcdist/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; + $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; else if which ccache >/dev/null && [ "$CC" != clang-3.6 ]; then CC="ccache $CC"; fi; - ../_srcdist/config $CONFIG_OPTS; + $srcdir/config $CONFIG_OPTS; fi - - cd .. + - cd $top script: - - cd _build; + - if [ -n "$DESTDIR" ]; then + cd _build; + top=..; + else + top=.; + fi - make update - make - if [ -z "$BUILDONLY" ]; then @@ -93,7 +105,7 @@ script: mkdir "../$DESTDIR"; make install install_docs DESTDIR="../$DESTDIR"; fi - - cd .. + - cd $top notifications: email: |