You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jk...@apache.org on 2018/03/13 02:30:27 UTC
[5/5] thrift git commit: THRIFT-4508: remove cygwin64 build in favor
of MSVC2013
THRIFT-4508: remove cygwin64 build in favor of MSVC2013
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/8d55c476
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/8d55c476
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/8d55c476
Branch: refs/heads/master
Commit: 8d55c47610b765b2bcdfaebb7ee8d22930e0bd0d
Parents: 2bf0327
Author: James E. King III <jk...@apache.org>
Authored: Mon Mar 12 14:29:55 2018 -0400
Committer: James E. King III <jk...@apache.org>
Committed: Mon Mar 12 22:28:52 2018 -0400
----------------------------------------------------------------------
appveyor.yml | 21 ++++++++++++++++-----
lib/cpp/test/TNonblockingServerTest.cpp | 2 +-
2 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/8d55c476/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
index 2db28f6..26bfcfb 100755
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -43,21 +43,32 @@ environment:
ZLIB_VERSION: 1.2.11
DISABLED_TESTS: StressTestNonBlocking
- - PROFILE: MINGW
- PLATFORM: x64
- CONFIGURATION: RelWithDebInfo
+ - PROFILE: MSVC2013
+ PLATFORM: x86
+ CONFIGURATION: Release
+ BOOST_VERSION: 1.58.0
+ LIBEVENT_VERSION: 2.0.22
+ PYTHON_VERSION: 3.5
+ QT_VERSION: 5.8
+ ZLIB_VERSION: 1.2.8
DISABLED_TESTS: StressTestNonBlocking
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- - PROFILE: CYGWIN
+ - PROFILE: MINGW
PLATFORM: x64
CONFIGURATION: RelWithDebInfo
- DISABLED_TESTS: (ZlibTest|OpenSSLManualInitTest|TNonblockingServerTest|StressTestNonBlocking)
+ DISABLED_TESTS: StressTestNonBlocking
- PROFILE: CYGWIN
PLATFORM: x86
CONFIGURATION: RelWithDebInfo
DISABLED_TESTS: (ZlibTest|OpenSSLManualInitTest|TNonblockingServerTest|StressTestNonBlocking)
+# - PROFILE: CYGWIN
+# PLATFORM: x64
+# CONFIGURATION: RelWithDebInfo
+# DISABLED_TESTS: (ZlibTest|OpenSSLManualInitTest|TNonblockingServerTest|StressTestNonBlocking)
+
install:
- cd %APPVEYOR_BUILD_FOLDER%
- call build\appveyor\%PROFILE:~0,4%-appveyor-install.bat
http://git-wip-us.apache.org/repos/asf/thrift/blob/8d55c476/lib/cpp/test/TNonblockingServerTest.cpp
----------------------------------------------------------------------
diff --git a/lib/cpp/test/TNonblockingServerTest.cpp b/lib/cpp/test/TNonblockingServerTest.cpp
index 74ffd1d..63d8a04 100644
--- a/lib/cpp/test/TNonblockingServerTest.cpp
+++ b/lib/cpp/test/TNonblockingServerTest.cpp
@@ -178,7 +178,7 @@ private:
protected:
shared_ptr<server::TNonblockingServer> server;
private:
- shared_ptr<concurrency::Thread> thread;
+ shared_ptr<apache::thrift::concurrency::Thread> thread;
};