diff --git a/.travis.yml b/.travis.yml index cd04032..175b072 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,4 +58,5 @@ - libevent-dev script: + - deactivate # deactivate host compiler - ./travis-ci.sh diff --git a/test/ddox.sh b/test/ddox.sh index 44f836e..9675ed8 100755 --- a/test/ddox.sh +++ b/test/ddox.sh @@ -2,6 +2,12 @@ . $(dirname "${BASH_SOURCE[0]}")/common.sh +# gdc 4.8.5 not working with ddox due to missing +# std.experimental.allocator.mallocator for libdparse +if [ ${DC} = gdc ]; then + exit 0 +fi + (cd $CURR_DIR/ddox/default && $DUB build -b ddox) grep -qF ddox_project $CURR_DIR/ddox/default/docs/index.html diff --git a/travis-ci.sh b/travis-ci.sh index 8cf47b3..9046bf3 100755 --- a/travis-ci.sh +++ b/travis-ci.sh @@ -2,6 +2,8 @@ set -v -e -o pipefail +source ~/dlang/*/activate # activate host compiler + if [ -z "$FRONTEND" -o "$FRONTEND" \> 2.067.z ]; then vibe_ver=$(jq -r '.versions | .["vibe-d"]' < dub.selections.json) dub fetch vibe-d --version=$vibe_ver # get optional dependency @@ -12,10 +14,21 @@ # library-nonet fails to build with coverage (Issue 13742) dub test --compiler=${DC} -b unittest-cov ./build.sh -cov + + # run tests with different compilers + DUB=`pwd`/bin/dub DC=${DC} test/run-unittest.sh + deactivate + git clean -dxf -- test + source $(~/dlang/install.sh ldc --activate) + DUB=`pwd`/bin/dub DC=${DC} test/run-unittest.sh + deactivate + git clean -dxf -- test + source $(~/dlang/install.sh gdc --activate) + DUB=`pwd`/bin/dub DC=${DC} test/run-unittest.sh else ./build.sh + DUB=`pwd`/bin/dub DC=${DC} test/run-unittest.sh fi -DUB=`pwd`/bin/dub DC=${DC} test/run-unittest.sh if [ "$COVERAGE" = true ]; then wget https://codecov.io/bash -O codecov.sh