You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by zu...@apache.org on 2016/06/09 03:26:32 UTC
[1/2] incubator-quickstep git commit: Disabled Clang Temporarily.
[Forced Update!]
Repository: incubator-quickstep
Updated Branches:
refs/heads/travis_llvm_fix a95c49163 -> 2d39b8ecd (forced update)
Disabled Clang Temporarily.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/eab1c9a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/eab1c9a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/eab1c9a4
Branch: refs/heads/travis_llvm_fix
Commit: eab1c9a4f80553d500afdf8cb385822b03aaad0d
Parents: fd75e17
Author: Zuyu Zhang <zz...@pivotal.io>
Authored: Wed Jun 8 18:45:37 2016 -0700
Committer: Zuyu Zhang <zz...@pivotal.io>
Committed: Wed Jun 8 20:23:45 2016 -0700
----------------------------------------------------------------------
.travis.yml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/eab1c9a4/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 483a02b..08d6f38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ cache: ccache
compiler:
- gcc
- - clang
+ # clang
env:
- BUILD_TYPE=Debug VECTOR_COPY_ELISION_LEVEL=joinwithbinaryexpressions
@@ -21,7 +21,7 @@ env:
- BUILD_TYPE=Release VECTOR_COPY_ELISION_LEVEL=none
install:
- - if [ "$VECTOR_COPY_ELISION_LEVEL" = "joinwithbinaryexpressions" ] && [ "$CC" = "gcc" ] && [ "$BUILD_TYPE" = "Debug" ]; then
+ - if [ "$VECTOR_COPY_ELISION_LEVEL" = "joinwithbinaryexpressions" ] && [ "$CC" = "gcc" ]; then
export MAKE_JOBS=1;
else
export MAKE_JOBS=2;
@@ -77,11 +77,9 @@ addons:
apt:
sources:
- ubuntu-toolchain-r-test
- - llvm-toolchain-precise-3.7
packages:
- gcc-5
- g++-5
- - clang-3.7
- binutils-gold
- libprotobuf-dev
- protobuf-compiler
[2/2] incubator-quickstep git commit: Fix Clang problems in Travis.
Posted by zu...@apache.org.
Fix Clang problems in Travis.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/2d39b8ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/2d39b8ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/2d39b8ec
Branch: refs/heads/travis_llvm_fix
Commit: 2d39b8ecd8b1ca3fb42ff2505a664a94b67ab9e3
Parents: eab1c9a
Author: Navneet Potti <na...@gmail.com>
Authored: Wed Jun 8 18:15:38 2016 -0500
Committer: Zuyu Zhang <zz...@pivotal.io>
Committed: Wed Jun 8 20:27:44 2016 -0700
----------------------------------------------------------------------
.travis.yml | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/2d39b8ec/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 08d6f38..df39fb0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ cache: ccache
compiler:
- gcc
- # clang
+ - clang
env:
- BUILD_TYPE=Debug VECTOR_COPY_ELISION_LEVEL=joinwithbinaryexpressions
@@ -20,6 +20,19 @@ env:
- BUILD_TYPE=Debug VECTOR_COPY_ELISION_LEVEL=none
- BUILD_TYPE=Release VECTOR_COPY_ELISION_LEVEL=none
+before_install:
+ - LLVM_VERSION=3.7.1
+ - LLVM_ARCHIVE_PATH=$HOME/clang+llvm.tar.xz
+ - if [[ $CC = "clang" ]]; then
+ wget http://llvm.org/releases/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-x86_64-linux-gnu-ubuntu-14.04.tar.xz -O $LLVM_ARCHIVE_PATH;
+ mkdir -p $HOME/clang-$LLVM_VERSION;
+ tar xf $LLVM_ARCHIVE_PATH -C $HOME/clang-$LLVM_VERSION --strip-components 1;
+ ln -sf $HOME/clang-$LLVM_VERSION/bin/clang++ $HOME/clang-$LLVM_VERSION/bin/clang++-3.7;
+ export PATH=$HOME/clang-$LLVM_VERSION/bin:$PATH;
+ export CPPFLAGS="-I $HOME/clang-$LLVM_VERSION/include/c++/v1";
+ echo "Using clang at " `which $CC-3.7` " and $CXX at " `which $CXX-3.7`;
+ fi
+
install:
- if [ "$VECTOR_COPY_ELISION_LEVEL" = "joinwithbinaryexpressions" ] && [ "$CC" = "gcc" ]; then
export MAKE_JOBS=1;