Skip to content

Commit

Permalink
ARROW-5407: [C++] Allow building only integration test targets
Browse files Browse the repository at this point in the history
Author: Antoine Pitrou <[email protected]>

Closes #4458 from pitrou/ARROW-5407-build-integration-cpp and squashes the following commits:

a35c7345b <Antoine Pitrou> ARROW-5407:  Allow building only integration test targets
  • Loading branch information
pitrou authored and wesm committed Jun 11, 2019
1 parent 7b62c07 commit 2ec4583
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 14 deletions.
14 changes: 9 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -233,19 +233,23 @@ matrix:
env:
- ARROW_TRAVIS_USE_TOOLCHAIN=1
- ARROW_TRAVIS_FLIGHT=1
- ARROW_TRAVIS_PLASMA=1
- ARROW_TRAVIS_PLASMA_JAVA_CLIENT=1
- ARROW_TRAVIS_USE_TOOLCHAIN=1
- ARROW_TRAVIS_INTEGRATION=1
# TODO(ARROW-4764): Using system java and plasma built with conda doesn't work
#- ARROW_TRAVIS_PLASMA=1
#- ARROW_TRAVIS_PLASMA_JAVA_CLIENT=1
before_script:
- if [ $ARROW_CI_INTEGRATION_AFFECTED != "1" ]; then exit; fi
- $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
- $TRAVIS_BUILD_DIR/ci/travis_install_linux.sh
# C++: Only build integration targets
- export ARROW_CPP_BUILD_TARGETS=arrow-integration
- export ARROW_TRAVIS_OPTIONAL_INSTALL=1
- $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh
# Javascript
- nvm install 11.12
- $TRAVIS_BUILD_DIR/ci/travis_before_script_js.sh
- $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh
script:
- $TRAVIS_BUILD_DIR/ci/travis_script_integration.sh
# TODO(ARROW-4764): Using system java and plasma built with conda doesn't work
# - $TRAVIS_BUILD_DIR/ci/travis_script_plasma_java_client.sh
- name: "NodeJS"
language: node_js
Expand Down
21 changes: 12 additions & 9 deletions ci/travis_before_script_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ pushd $ARROW_CPP_BUILD_DIR
CMAKE_COMMON_FLAGS="\
-DCMAKE_INSTALL_PREFIX=$ARROW_CPP_INSTALL \
-DARROW_NO_DEPRECATED_API=ON \
-DARROW_INSTALL_NAME_RPATH=OFF \
-DARROW_EXTRA_ERROR_CONTEXT=ON"
CMAKE_LINUX_FLAGS=""
CMAKE_OSX_FLAGS="\
Expand All @@ -63,17 +64,15 @@ fi

if [ $only_library_mode == "yes" ]; then
CMAKE_COMMON_FLAGS="\
$CMAKE_COMMON_FLAGS \
-DARROW_BUILD_UTILITIES=OFF \
-DARROW_INSTALL_NAME_RPATH=OFF"
$CMAKE_COMMON_FLAGS \
-DARROW_BUILD_UTILITIES=OFF"
else
CMAKE_COMMON_FLAGS="\
$CMAKE_COMMON_FLAGS \
-DARROW_BUILD_BENCHMARKS=ON \
-DARROW_BUILD_TESTS=ON \
-DARROW_BUILD_EXAMPLES=ON \
-DARROW_BUILD_UTILITIES=ON \
-DARROW_INSTALL_NAME_RPATH=OFF"
$CMAKE_COMMON_FLAGS \
-DARROW_BUILD_BENCHMARKS=ON \
-DARROW_BUILD_TESTS=ON \
-DARROW_BUILD_EXAMPLES=ON \
-DARROW_BUILD_UTILITIES=ON"
fi

ARROW_CXXFLAGS=""
Expand All @@ -91,6 +90,10 @@ if [ "$ARROW_TRAVIS_FLIGHT" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_FLIGHT=ON"
fi

if [ "$ARROW_TRAVIS_INTEGRATION" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_BUILD_INTEGRATION=ON"
fi

if [ "$ARROW_TRAVIS_PLASMA" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_PLASMA=ON"
fi
Expand Down

0 comments on commit 2ec4583

Please sign in to comment.