diff options
Diffstat (limited to 'infrastructure/travis-build.sh')
| -rwxr-xr-x | infrastructure/travis-build.sh | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/infrastructure/travis-build.sh b/infrastructure/travis-build.sh index aa9f62c2..72a187b3 100755 --- a/infrastructure/travis-build.sh +++ b/infrastructure/travis-build.sh @@ -5,17 +5,25 @@ set -x ccache -s -cd `dirname $0`/.. -./bootstrap -./configure CC="ccache $CC" CXX="ccache $CXX" "$@" -grep CXX config.status -make V=1 -./runtest.pl ALL $TEST_TARGET -# When making a release build, also check that we can build the default -# target and "parcels" (which is the same thing): -if [ "$TEST_TARGET" = "release" ]; then - make - make parcels +if [ "$BUILD" = 'cmake' ]; then + cd `dirname $0` + mkdir -p cmake/build + cd cmake/build + cmake --version + cmake -DCMAKE_BUILD_TYPE:STRING=$TEST_TARGET .. + make install + [ "$TEST" = "n" ] || ctest -C $TEST_TARGET -V +else + cd `dirname $0`/.. + ./bootstrap + ./configure CC="ccache $CC" CXX="ccache $CXX" "$@" + grep CXX config.status + make V=1 + ./runtest.pl ALL $TEST_TARGET + if [ "$TEST_TARGET" = "release" ]; then + make + make parcels + fi fi ccache -s |