Skip to content

ARROW-556: [Integration] Configure C++ integration test executable with a single environment variable. Update README #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wesm wants to merge 1 commit into from
Closed

ARROW-556: [Integration] Configure C++ integration test executable with a single environment variable. Update README #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ci/travis_script_integration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions integration/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ 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
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
Expand Down
16 changes: 6 additions & 10 deletions integration/integration_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,17 +684,13 @@ def file_to_stream(self, file_path, stream_path):

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++'

Expand Down