From 0aa641176a5fc7ebbef7ac76b8722ec729e92975 Mon Sep 17 00:00:00 2001 From: Bryan Cutler Date: Mon, 13 Feb 2017 11:39:00 -0800 Subject: [PATCH] ARROW-556: [Integration] Extract cpp build path from ARROW_CPP_TESTER env var, if set --- integration/integration_test.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/integration/integration_test.py b/integration/integration_test.py index 1d8dc29a9f5..6ce857f8921 100644 --- a/integration/integration_test.py +++ b/integration/integration_test.py @@ -684,9 +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')) + arrow_cpp_tester = 'ARROW_CPP_TESTER' + if arrow_cpp_tester in os.environ: + CPP_INTEGRATION_EXE = os.environ.get(arrow_cpp_tester) + BUILD_PATH = os.path.dirname(CPP_INTEGRATION_EXE) + else: + BUILD_PATH = os.path.join(ARROW_HOME, 'cpp/test-build/debug') + CPP_INTEGRATION_EXE = os.path.join(BUILD_PATH, 'json-integration-test') STREAM_TO_FILE = os.environ.get( 'ARROW_CPP_STREAM_TO_FILE',