summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarol Herbst <kherbst@redhat.com>2018-04-10 23:38:45 +0200
committerAlexey Sotkin <alexey.sotkin@intel.com>2018-04-16 18:47:33 +0300
commit4d2a651dff80cb1bf593606ad628d22c58cee12a (patch)
treeec7d8bd320e2cea0678ac6ba4aa1641b5d90027a
parent7b8cc990eff226d1e8085ba88fd0f4ae9e62c6b0 (diff)
travis: make it build again
v2: add -j2 to make
-rw-r--r--.travis.yml75
1 files changed, 62 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index ad5d948..549dd36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,78 @@
-# Linux Build Configuration for Travis
-
language: cpp
os:
- linux
# Use Ubuntu 14.04 LTS (Trusty) as the Linux testing environment.
-sudo: required
dist: trusty
+sudo: false
-env:
- # Each line is a set of environment variables set before a build.
- # Thus each line represents a different build configuration.
- - BUILD_TYPE=Release
- - BUILD_TYPE=Debug
+git:
+ depth: 1
+
+addons:
+ apt:
+ sources:
+ # adds deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty main
+ - llvm-toolchain-trusty
+ - ubuntu-toolchain-r-test
+ packages:
+ - llvm-7-tools
+ - llvm-7-dev
compiler:
- gcc
- clang
-# To avoid Go bindings related issues in LIT tests, hide Go binaries from CMake
-install:
- - rm -f `which go`
+env:
+ global:
+ - MAKEFLAGS="-j2"
+ matrix:
+ - BUILD_TYPE=Release BUILD_EXTERNAL=1 MAKE_TARGETS="" MAKE_TEST_TARGET="test"
+ - BUILD_TYPE=Debug BUILD_EXTERNAL=1 MAKE_TARGETS="" MAKE_TEST_TARGET="test"
+ - BUILD_TYPE=Release BUILD_EXTERNAL=0 MAKE_TARGETS="llvm-spirv" MAKE_TEST_TARGET="check-llvm-spirv"
+ - BUILD_TYPE=Debug BUILD_EXTERNAL=0 MAKE_TARGETS="llvm-spirv" MAKE_TEST_TARGET="check-llvm-spirv"
+ # some bug inside clang-5.0.0, works with 5.0.1
+
+matrix:
+ include:
+ - os: osx
+ env: BUILD_TYPE=Release BUILD_EXTERNAL=0 MAKE_TARGETS="llvm-spirv" MAKE_TEST_TARGET="check-llvm-spirv"
+ osx_image: xcode9.3
+
+ - os: osx
+ env: BUILD_TYPE=Debug BUILD_EXTERNAL=0 MAKE_TARGETS="llvm-spirv" MAKE_TEST_TARGET="check-llvm-spirv"
+ osx_image: xcode9.3
+ allow_failures:
+ - compiler: clang
+ - os: osx
+ fast_finish: true
script:
+ - |
+ if [ $BUILD_EXTERNAL == "0" ]; then
+ mkdir llvm-spirv
+ mv * llvm-spirv
+ git clone https://git.llvm.org/git/llvm.git/ --depth 1
+ mv llvm-spirv llvm/tools/llvm-spirv
+ fi
- mkdir build && cd build
- - cmake -D CMAKE_VERBOSE_MAKEFILE:BOOL=OFF -D CMAKE_COLOR_MAKEFILE:BOOL=ON -D LLVM_INCLUDE_EXAMPLES:BOOL=OFF -D LLVM_INCLUDE_TESTS:BOOL=ON -D LLVM_BUILD_TESTS:BOOL=ON -D LLVM_TARGETS_TO_BUILD="X86" -D LLVM_LIT_ARGS:STRING="-sv --no-progress-bar" -G "Unix Makefiles" -D CMAKE_BUILD_TYPE:STRING=${BUILD_TYPE} ..
- - make check-llvm -j 2
+ - |
+ if [ $BUILD_EXTERNAL == "1" ]; then
+ cmake .. \
+ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
+ -DLLVM_BUILD_TOOLS=ON \
+ -DLLVM_EXTERNAL_LIT="/usr/lib/llvm-7/build/utils/lit/lit.py" \
+ -DLLVM_INCLUDE_TESTS=ON \
+ -DCMAKE_INSTALL_PREFIX=../install/ \
+ -G "Unix Makefiles"
+ else
+ cmake ../llvm/ \
+ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
+ -DLLVM_BUILD_TOOLS=ON \
+ -DLLVM_BUILD_TESTS=ON \
+ -DLLVM_INCLUDE_TESTS=ON \
+ -DLLVM_LIT_ARGS="-sv --no-progress-bar" \
+ -G "Unix Makefiles"
+ fi
+ - make $MAKE_TARGETS && make $MAKE_TEST_TARGET && if [ $BUILD_EXTERNAL == "1" ]; then make install; fi