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/05/30 19:02:01 UTC
incubator-quickstep git commit: CI w/ gRPC. [Forced Update!]
Repository: incubator-quickstep
Updated Branches:
refs/heads/travis-grpc 54193f333 -> b69b6da20 (forced update)
CI w/ gRPC.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/b69b6da2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/b69b6da2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/b69b6da2
Branch: refs/heads/travis-grpc
Commit: b69b6da2013d9d88a5929f41b24c86cc74e1c017
Parents: 492ffa1
Author: Zuyu Zhang <zz...@pivotal.io>
Authored: Mon May 30 11:57:22 2016 -0700
Committer: Zuyu Zhang <zz...@pivotal.io>
Committed: Mon May 30 12:02:03 2016 -0700
----------------------------------------------------------------------
.travis.yml | 18 ++++++++++++++----
CMakeLists.txt | 8 ++++++++
2 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b69b6da2/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 483a02b..a186a67 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,6 +38,15 @@ install:
- export DEBUG_FLAGS="-g0";
- export RELEASE_FLAGS="-O0 -DNDEBUG";
- export LINKER_FLAGS="-s"
+ # Protobuf 3 beta.
+ - wget https://github.com/google/protobuf/releases/download/v3.0.0-beta-3/protobuf-cpp-3.0.0-beta-3.tar.gz
+ - tar -xzvf protobuf-cpp-3.0.0-beta-3.tar.gz
+ - pushd protobuf-3.0.0-beta-3 && ./configure --prefix=/usr && make && sudo make install && popd
+ - rm -rf protobuf*
+ # gRPC.
+ - git clone https://github.com/grpc/grpc.git
+ - pushd grpc && git checkout release-0_14_1 && git submodule update --init && make && sudo make install && popd
+ - rm -rf grpc
before_script:
- $CC --version
@@ -54,14 +63,15 @@ before_script:
-D CMAKE_CXX_COMPILER=$CXX
-D CMAKE_LINKER=$CLINKER
-D USE_TCMALLOC=0
- -D VECTOR_COPY_ELISION_LEVEL=$VECTOR_COPY_ELISION_LEVEL ..)
+ -D VECTOR_COPY_ELISION_LEVEL=$VECTOR_COPY_ELISION_LEVEL
+ -D ENABLE_DISTRIBUTED=ON ..)
script:
- ./third_party/cpplint/lint_everything.py
- ./validate_cmakelists.py
- ./cyclic_dependency.py
- (cd build && make -j$MAKE_JOBS)
- - (cd build && ctest --output-on-failure -j$TEST_JOBS)
+ - (cd build && ctest -E native_net_client_message_bus_unittest --output-on-failure -j$TEST_JOBS)
after_failure:
- df -h
@@ -83,8 +93,8 @@ addons:
- g++-5
- clang-3.7
- binutils-gold
- - libprotobuf-dev
- - protobuf-compiler
+ # libprotobuf-dev
+ # protobuf-compiler
- libgtest-dev
- python-networkx
- libnuma-dev
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b69b6da2/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0fd975..4a521f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -249,6 +249,14 @@ else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
endif()
+ # Clang reports such warning when using Protoc 3.0 beta.
+ if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
+ CHECK_CXX_COMPILER_FLAG("-Wno-extended-offsetof" COMPILER_HAS_WNO_EXTENDED_OFFSETOF)
+ if (COMPILER_HAS_WNO_EXTENDED_OFFSETOF)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-extended-offsetof")
+ endif()
+ endif()
+
# One of the protobuf headers includes a nested anonymous union within
# another anonymous type. Ordinarily we work around this by compiling the
# protobuf libraries themselves with "-Wno-nested-anon-types" and including