This is an automated email from the ASF dual-hosted git repository.
kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new f2a2505 ARROW-4982: [GLib][CI] Run tests on AppVeyor
f2a2505 is described below
commit f2a2505a5a48951400f06ce03c4508e310d24faf
Author: Kouhei Sutou <[email protected]>
AuthorDate: Thu Mar 21 14:33:57 2019 +0100
ARROW-4982: [GLib][CI] Run tests on AppVeyor
Author: Kouhei Sutou <[email protected]>
Closes #3999 from kou/glib-appveyor-test and squashes the following commits:
ee27f29b <Kouhei Sutou> Run tests on AppVeyor
---
c_glib/test/run-test.rb | 4 ++++
ci/appveyor-cpp-build-mingw.bat | 4 ++++
ci/appveyor-cpp-setup-mingw.bat | 9 +++++++++
3 files changed, 17 insertions(+)
diff --git a/c_glib/test/run-test.rb b/c_glib/test/run-test.rb
index 99d72f4..16104a6 100755
--- a/c_glib/test/run-test.rb
+++ b/c_glib/test/run-test.rb
@@ -20,6 +20,10 @@
require "pathname"
require "test-unit"
+(ENV["ARROW_DLL_PATH"] || "").split(File::PATH_SEPARATOR).each do |path|
+ RubyInstaller::Runtime.add_dll_directory(path)
+end
+
base_dir = Pathname(__dir__).parent
test_dir = base_dir + "test"
diff --git a/ci/appveyor-cpp-build-mingw.bat b/ci/appveyor-cpp-build-mingw.bat
index 87698a0..cca9877 100644
--- a/ci/appveyor-cpp-build-mingw.bat
+++ b/ci/appveyor-cpp-build-mingw.bat
@@ -23,6 +23,9 @@ set MESON_BUILD_TYPE=release
set INSTALL_DIR=%HOMEDRIVE%%HOMEPATH%\install
set PATH=%INSTALL_DIR%\bin;%PATH%
set PKG_CONFIG_PATH=%INSTALL_DIR%\lib\pkgconfig
+set GI_TYPELIB_PATH=%INSTALL_DIR%\lib\girepository-1.0
+set ARROW_DLL_PATH=%MINGW_PREFIX%\bin
+set ARROW_DLL_PATH=%INSTALL_DIR%\bin;%ARROW_DLL_PATH%
for /f "usebackq" %%v in (`python3 -c "import sys; print('.'.join(map(str,
sys.version_info[0:2])))"`) do (
set PYTHON_VERSION=%%v
@@ -70,3 +73,4 @@ meson ^
sed -i'' -s 's/\r//g' %C_GLIB_BUILD_DIR%/arrow-glib/version.h || exit /B
ninja -C %C_GLIB_BUILD_DIR% || exit /B
ninja -C %C_GLIB_BUILD_DIR% install || exit /B
+ruby c_glib\test\run-test.rb || exit /B
diff --git a/ci/appveyor-cpp-setup-mingw.bat b/ci/appveyor-cpp-setup-mingw.bat
index b6eb986..c0c44ff 100644
--- a/ci/appveyor-cpp-setup-mingw.bat
+++ b/ci/appveyor-cpp-setup-mingw.bat
@@ -17,6 +17,11 @@
@echo on
+if "%MSYSTEM%" == "MINGW32" (
+ set "PATH=c:\Ruby26\bin;%PATH%"
+) else (
+ set "PATH=c:\Ruby26-x64\bin;%PATH%"
+)
set PATH=%MINGW_PREFIX%\bin;C:\msys64\usr\bin;%PATH%
pacman -S --noconfirm ^
@@ -37,3 +42,7 @@ pacman -S --noconfirm ^
"%MINGW_PACKAGE_PREFIX%-snappy" ^
"%MINGW_PACKAGE_PREFIX%-zlib" ^
"%MINGW_PACKAGE_PREFIX%-zstd" || exit /B
+
+pushd c_glib
+ruby -S bundle install || exit /B
+popd
