Repository: arrow Updated Branches: refs/heads/master a1c8b83b4 -> 6035d9bd4
ARROW-1233: [C++] Validate libs availability in conda toolchain Author: Max Risuhin <risuhin....@gmail.com> Closes #861 from MaxRis/ARROW-1233 and squashes the following commits: ddc96af1 [Max Risuhin] ARROW-1233: [C++] Validate libs availability in conda toolchain Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/6035d9bd Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/6035d9bd Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/6035d9bd Branch: refs/heads/master Commit: 6035d9bd481877154d66c13e4ba8eb2fd8954105 Parents: a1c8b83 Author: Max Risuhin <risuhin....@gmail.com> Authored: Mon Jul 17 22:35:17 2017 -0400 Committer: Wes McKinney <wes.mckin...@twosigma.com> Committed: Mon Jul 17 22:35:17 2017 -0400 ---------------------------------------------------------------------- ci/test-cmake-build-script.bat | 43 ++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/6035d9bd/ci/test-cmake-build-script.bat ---------------------------------------------------------------------- diff --git a/ci/test-cmake-build-script.bat b/ci/test-cmake-build-script.bat index e37a811..54d892f 100644 --- a/ci/test-cmake-build-script.bat +++ b/ci/test-cmake-build-script.bat @@ -18,13 +18,17 @@ @echo on conda update --yes --quiet conda -conda create -n arrow-cmake-script-tests -q -y -conda install -n arrow-cmake-script-tests -q -y -c conda-forge ^ + +@rem Validate cmake script behaviour on missed lib in toolchain +set CONDA_ENV=arrow-cmake-tests-libs +conda create -n %CONDA_ENV% -q -y +conda install -n %CONDA_ENV% -q -y -c conda-forge ^ cmake git boost-cpp -call activate arrow-cmake-script-tests +call activate %CONDA_ENV% -mkdir cpp\build-cmake-test -pushd cpp\build-cmake-test +set BUILD_DIR=cpp\build-cmake-test +mkdir %BUILD_DIR% +pushd %BUILD_DIR% echo Test cmake script errors out on flatbuffers missed set FLATBUFFERS_HOME=WrongPath @@ -111,3 +115,32 @@ FINDSTR /M /C:"Could NOT find ZSTD" error.txt || exit /B set ZSTD_HOME= popd +rmdir /S /Q %BUILD_DIR% +call deactivate + +@rem Validate libs availability in conda toolchain +mkdir %BUILD_DIR% +pushd %BUILD_DIR% + +set CONDA_ENV=arrow-cmake-tests-toolchain +conda create -n %CONDA_ENV% -q -y +conda install -n %CONDA_ENV% -q -y -c conda-forge ^ + flatbuffers rapidjson cmake git boost-cpp ^ + thrift-cpp snappy zlib brotli gflags lz4-c zstd +call activate %CONDA_ENV% + +set ARROW_BUILD_TOOLCHAIN=%CONDA_PREFIX%\Library +cmake -G "%GENERATOR%" ^ + -DARROW_BOOST_USE_SHARED=OFF ^ + -DCMAKE_BUILD_TYPE=%CONFIGURATION% ^ + -DARROW_CXXFLAGS="/MP" ^ + .. 2>output.txt + +set LIBRARY_FOUND_MSG=Added static library dependency +for %%x in (snappy gflags zlib brotli_enc brotli_dec brotli_common lz4_static zstd_static) do ( + echo Checking %%x library path + FINDSTR /C:"%LIBRARY_FOUND_MSG% %%x: %CONDA_PREFIX:\=/%" output.txt || exit /B +) + +popd +rmdir /S /Q %BUILD_DIR% \ No newline at end of file
