summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-01-04 22:38:40 +0000
committerJon Turney <jon.turney@dronecode.org.uk>2018-01-04 22:51:57 +0000
commitfd683a2b81ae6398674b21f2047f7db340a1e556 (patch)
tree71b00d6dfc4d211347f391746a460f1592a9b4a0 /ci
parent1a948b2e67bad0babed6b5a41d10c9e9f4236552 (diff)
downloadmeson-fd683a2b81ae6398674b21f2047f7db340a1e556.tar.gz
CI: Run boost test for Cygwin
Also, use '^' to escape newlines in appveyor-install.bat to avoid an absurdly long line, remove some unnecessary quotation, and alphabetically sort packages Also, define the _XOPEN_SOURCE feature test macro in the boost test to avoid 'not declared in this scope' warnings for pthread_rwlock_init(), etc.
Diffstat (limited to 'ci')
-rwxr-xr-x[-rw-r--r--]ci/appveyor-install.bat12
1 files changed, 10 insertions, 2 deletions
diff --git a/ci/appveyor-install.bat b/ci/appveyor-install.bat
index becc80a1f..2d4a8cb53 100644..100755
--- a/ci/appveyor-install.bat
+++ b/ci/appveyor-install.bat
@@ -1,5 +1,5 @@
set CACHE=C:\cache
-set CYGWIN_MIRROR="http://cygwin.mirror.constant.com"
+set CYGWIN_MIRROR=http://cygwin.mirror.constant.com
if _%arch%_ == _x64_ set SETUP=setup-x86_64.exe && set CYGWIN_ROOT=C:\cygwin64
if _%arch%_ == _x86_ set SETUP=setup-x86.exe && set CYGWIN_ROOT=C:\cygwin
@@ -7,5 +7,13 @@ if _%arch%_ == _x86_ set SETUP=setup-x86.exe && set CYGWIN_ROOT=C:\cygwin
if not exist %CACHE% mkdir %CACHE%
echo Updating Cygwin and installing ninja and test prerequisites
-%CYGWIN_ROOT%\%SETUP% -qnNdO -R "%CYGWIN_ROOT%" -s "%CYGWIN_MIRROR%" -l "%CACHE%" -g -P "ninja,gcc-objc,gcc-objc++,libglib2.0-devel,zlib-devel,python3-pip"
+%CYGWIN_ROOT%\%SETUP% -qnNdO -R "%CYGWIN_ROOT%" -s "%CYGWIN_MIRROR%" -l "%CACHE%" -g -P ^
+gcc-objc++,^
+gcc-objc,^
+libboost-devel,^
+libglib2.0-devel,^
+ninja,^
+python3-pip,^
+zlib-devel
+
echo Install done