Repository: arrow Updated Branches: refs/heads/master 66f650cd3 -> 69cf69238
ARROW-556: [Integration] Configure C++ integration test executable with a single environment variable. Update README Author: Wes McKinney <[email protected]> Closes #340 from wesm/ARROW-556 and squashes the following commits: 521af12 [Wes McKinney] Configure C++ integration test executable with a single environment variable. Update README.md Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/69cf6923 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/69cf6923 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/69cf6923 Branch: refs/heads/master Commit: 69cf69238492e3872e729775bd833aa23e36bdc8 Parents: 66f650c Author: Wes McKinney <[email protected]> Authored: Mon Feb 13 21:27:24 2017 -0500 Committer: Wes McKinney <[email protected]> Committed: Mon Feb 13 21:27:24 2017 -0500 ---------------------------------------------------------------------- ci/travis_script_integration.sh | 4 +--- integration/README.md | 4 ++-- integration/integration_test.py | 16 ++++++---------- 3 files changed, 9 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/69cf6923/ci/travis_script_integration.sh ---------------------------------------------------------------------- diff --git a/ci/travis_script_integration.sh b/ci/travis_script_integration.sh index c019a4b..7bb1dc0 100755 --- a/ci/travis_script_integration.sh +++ b/ci/travis_script_integration.sh @@ -29,9 +29,7 @@ pushd $TRAVIS_BUILD_DIR/integration VERSION=0.1.1-SNAPSHOT export ARROW_JAVA_INTEGRATION_JAR=$JAVA_DIR/tools/target/arrow-tools-$VERSION-jar-with-dependencies.jar -export ARROW_CPP_TESTER=$CPP_BUILD_DIR/debug/json-integration-test -export ARROW_CPP_STREAM_TO_FILE=$CPP_BUILD_DIR/debug/stream-to-file -export ARROW_CPP_FILE_TO_STREAM=$CPP_BUILD_DIR/debug/file-to-stream +export ARROW_CPP_EXE_PATH=$CPP_BUILD_DIR/debug source $TRAVIS_BUILD_DIR/ci/travis_install_conda.sh export MINICONDA=$HOME/miniconda http://git-wip-us.apache.org/repos/asf/arrow/blob/69cf6923/integration/README.md ---------------------------------------------------------------------- diff --git a/integration/README.md b/integration/README.md index b1e4e3a..6005b62 100644 --- a/integration/README.md +++ b/integration/README.md @@ -34,7 +34,7 @@ mvn package ``` Now, the integration tests rely on two environment variables which point to the -Java `arrow-tool` JAR and the C++ `json-integration-test` executable: +Java `arrow-tool` JAR and the build path for the C++ executables: ```bash JAVA_DIR=$ARROW_HOME/java @@ -42,7 +42,7 @@ CPP_BUILD_DIR=$ARROW_HOME/cpp/test-build VERSION=0.1.1-SNAPSHOT export ARROW_JAVA_INTEGRATION_JAR=$JAVA_DIR/tools/target/arrow-tools-$VERSION-jar-with-dependencies.jar -export ARROW_CPP_TESTER=$CPP_BUILD_DIR/debug/json-integration-test +export ARROW_CPP_EXE_PATH=$CPP_BUILD_DIR/debug ``` Here `$ARROW_HOME` is the location of your Arrow git clone. The http://git-wip-us.apache.org/repos/asf/arrow/blob/69cf6923/integration/integration_test.py ---------------------------------------------------------------------- diff --git a/integration/integration_test.py b/integration/integration_test.py index 1d8dc29..d5a066b 100644 --- a/integration/integration_test.py +++ b/integration/integration_test.py @@ -684,17 +684,13 @@ class JavaTester(Tester): class CPPTester(Tester): - BUILD_PATH = os.path.join(ARROW_HOME, 'cpp/test-build/debug') - CPP_INTEGRATION_EXE = os.environ.get( - 'ARROW_CPP_TESTER', os.path.join(BUILD_PATH, 'json-integration-test')) + EXE_PATH = os.environ.get( + 'ARROW_CPP_EXE_PATH', + os.path.join(ARROW_HOME, 'cpp/test-build/debug')) - STREAM_TO_FILE = os.environ.get( - 'ARROW_CPP_STREAM_TO_FILE', - os.path.join(BUILD_PATH, 'stream-to-file')) - - FILE_TO_STREAM = os.environ.get( - 'ARROW_CPP_FILE_TO_STREAM', - os.path.join(BUILD_PATH, 'file-to-stream')) + CPP_INTEGRATION_EXE = os.path.join(EXE_PATH, 'json-integration-test') + STREAM_TO_FILE = os.path.join(EXE_PATH, 'stream-to-file') + FILE_TO_STREAM = os.path.join(EXE_PATH, 'file-to-stream') name = 'C++'
