THRIFT-3692 (Re)enable Appveyor C++ and Python build

This closes #908

1 files changed, 17 insertions, 10 deletions

diff --git a/appveyor.yml b/appveyor.yml
index f36c7f06e..8afb0abfa 100755
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -27,14 +27,15 @@ os:
 - Visual Studio 2015
 
 environment:
-  BOOST_ROOT: c:\Libraries\boost
-  BOOST_LIBRARYDIR: c:\Libraries\boost\stage\lib
+  BOOST_ROOT: C:\Libraries\boost_1_59_0
+  BOOST_LIBRARYDIR: C:\Libraries\boost_1_59_0\lib64-msvc-14.0
 
 install:
 - '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64'
+- cd \
   # Zlib
 - appveyor DownloadFile https://github.com/madler/zlib/archive/v1.2.8.tar.gz
-- 7z x v1.2.8.tar.gz -so | 7z x -si -ttar
+- 7z x v1.2.8.tar.gz -so | 7z x -si -ttar > nul
 - cd zlib-1.2.8
 - cmake -G "Visual Studio 14 2015 Win64" .
 - cmake --build . --config release
@@ -44,7 +45,7 @@ install:
 - ps: Start-Process Win64OpenSSL-1_0_2f.exe -ArgumentList "/silent /verysilent /sp- /suppressmsgboxes" -Wait
   # Libevent
 - appveyor DownloadFile https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz
-- 7z x libevent-2.0.22-stable.tar.gz -so | 7z x -si -ttar
+- 7z x libevent-2.0.22-stable.tar.gz -so | 7z x -si -ttar > nul
 - cd libevent-2.0.22-stable
 - nmake -f Makefile.nmake
 - mkdir lib
@@ -53,10 +54,8 @@ install:
 - move *.h include\
 - cd ..
 - cinst winflexbison
-# - cinst ant -ignoreDependencies
-- cd \
 - appveyor DownloadFile http://www.us.apache.org/dist//ant/binaries/apache-ant-1.9.6-bin.zip
-- 7z x apache-ant-1.9.6-bin.zip
+- 7z x apache-ant-1.9.6-bin.zip > nul
 - cd %APPVEYOR_BUILD_FOLDER%
 # TODO: Enable Haskell build
 # - cinst HaskellPlatform -version 2014.2.0.0
@@ -68,17 +67,25 @@ build_script:
 - set PATH=%JAVA_HOME%\bin;%PATH%
 # - set PATH=%PATH%;C:\Program Files (x86)\Haskell Platform\2014.2.0.0\bin
 # - set PATH=%PATH%;C:\Program Files (x86)\Haskell Platform\2014.2.0.0\lib\extralibs\bin
-- set PATH=C:\Python27-x64;%PATH%
+- set PATH=C:\Python27-x64\scripts;C:\Python27-x64;%PATH%
 - mkdir cmake-build
 - cd cmake-build
-- cmake -G "Visual Studio 14 2015 Win64" -DWITH_JAVA=ON -DWITH_SHARED_LIB=OFF -DLIBEVENT_ROOT=%APPVEYOR_BUILD_FOLDER%\libevent-2.0.22-stable -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.8 -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.8\release\zlibstatic.lib -DBOOST_ROOT="%BOOST_ROOT% -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR% ..
+- cmake -G "Visual Studio 14 2015 Win64" -DWITH_SHARED_LIB=OFF -DLIBEVENT_ROOT=C:\libevent-2.0.22-stable -DZLIB_INCLUDE_DIR=C:\zlib-1.2.8 -DZLIB_LIBRARY=C:\zlib-1.2.8\release\zlibstatic.lib -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%" ..
 - findstr /b /e BUILD_COMPILER:BOOL=ON CMakeCache.txt
+- findstr /b /e BUILD_CPP:BOOL=ON CMakeCache.txt
 - findstr /b /e BUILD_JAVA:BOOL=ON CMakeCache.txt
+- findstr /b /e BUILD_PYTHON:BOOL=ON CMakeCache.txt
+# - findstr /b /e BUILD_C_GLIB:BOOL=ON CMakeCache.txt
+# - findstr /b /e BUILD_HASKELL:BOOL=ON CMakeCache.txt
 - findstr /b /e BUILD_TESTING:BOOL=ON CMakeCache.txt
 # - cmake --build .
 - cmake --build . --config Release
 # TODO: Fix cpack
 # - cpack
-- ctest -C Release -VV -E "(concurrency_test|processor_test|python_test$|^Python|^Java)"
+# TODO: Run more tests
+# CTest fails to invoke ant seemingly due to "ant.bat" v.s. "ant" (shell script) conflict.
+# Currently, everything that involves OpenSSL seems to hang forever on our Appveyor setup.
+# Also a few C++ tests hang (on Appveyor or on Windows in general).
+- ctest -C Release --timeout 600 -VV -E "(concurrency_test|processor_test|TInterruptTest|StressTestNonBlocking|OpenSSLManualInitTest|SecurityTest|PythonTestSSLSocket|python_test$|^Java)"
 
 #TODO make it perfect ;-r