[thrift] branch master updated: THRIFT-4282: Disabled StressTestNonBlocking on Windows

[dcelasun]

This is an automated email from the ASF dual-hosted git repository.

dcelasun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git


The following commit(s) were added to refs/heads/master by this push:
     new 8027936  THRIFT-4282: Disabled StressTestNonBlocking on Windows
8027936 is described below

commit 802793638b3e06d8b9031ae4d0b765735165c598
Author: Mario Emmenlauer <memmenla...@biodataanalysis.de>
AuthorDate: Fri Apr 24 08:51:37 2020 +0200

    THRIFT-4282: Disabled StressTestNonBlocking on Windows
---
 appveyor.yml            |  6 ++----
 test/cpp/CMakeLists.txt | 16 ++++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 233a056..96fe30c 100755
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -45,7 +45,6 @@ environment:
      PYTHON_VERSION: 3.6
      QT_VERSION: 5.10
      ZLIB_VERSION: 1.2.11
-     DISABLED_TESTS: (StressTestNonBlocking)
 
    - PROFILE: MSVC2015
      PLATFORM: x86
@@ -56,18 +55,17 @@ environment:
      PYTHON_VERSION: 3.5
      QT_VERSION: 5.8
      ZLIB_VERSION: 1.2.8
-     DISABLED_TESTS: (StressTestNonBlocking)
      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
    - PROFILE: MINGW
      PLATFORM: x64
      CONFIGURATION: RelWithDebInfo
-     DISABLED_TESTS: (StalenessCheckTest|StressTestNonBlocking)
+     DISABLED_TESTS: (StalenessCheckTest)
 
    - PROFILE: CYGWIN
      PLATFORM: x64
      CONFIGURATION: RelWithDebInfo
-     DISABLED_TESTS: 
(ZlibTest|OpenSSLManualInitTest|TNonblockingServerTest|StressTestNonBlocking)
+     DISABLED_TESTS: (ZlibTest|OpenSSLManualInitTest|TNonblockingServerTest)
 
 install:
   - cd %APPVEYOR_BUILD_FOLDER%
diff --git a/test/cpp/CMakeLists.txt b/test/cpp/CMakeLists.txt
index a136a48..367b6de 100755
--- a/test/cpp/CMakeLists.txt
+++ b/test/cpp/CMakeLists.txt
@@ -75,12 +75,16 @@ LINK_AGAINST_THRIFT_LIBRARY(StressTest thriftnb)
 add_test(NAME StressTest COMMAND StressTest)
 add_test(NAME StressTestConcurrent COMMAND StressTest --client-type=concurrent)
 
-add_executable(StressTestNonBlocking src/StressTestNonBlocking.cpp)
-target_link_libraries(StressTestNonBlocking crossstressgencpp 
${Boost_LIBRARIES} ${LIBEVENT_LIB})
-LINK_AGAINST_THRIFT_LIBRARY(StressTestNonBlocking thrift)
-LINK_AGAINST_THRIFT_LIBRARY(StressTestNonBlocking thriftnb)
-LINK_AGAINST_THRIFT_LIBRARY(StressTestNonBlocking thriftz)
-add_test(NAME StressTestNonBlocking COMMAND StressTestNonBlocking)
+# As of https://jira.apache.org/jira/browse/THRIFT-4282, StressTestNonBlocking
+# is broken on Windows. Contributions welcome.
+if (NOT WIN32 AND NOT CYGWIN)
+    add_executable(StressTestNonBlocking src/StressTestNonBlocking.cpp)
+    target_link_libraries(StressTestNonBlocking crossstressgencpp 
${Boost_LIBRARIES} ${LIBEVENT_LIB})
+    LINK_AGAINST_THRIFT_LIBRARY(StressTestNonBlocking thrift)
+    LINK_AGAINST_THRIFT_LIBRARY(StressTestNonBlocking thriftnb)
+    LINK_AGAINST_THRIFT_LIBRARY(StressTestNonBlocking thriftz)
+    add_test(NAME StressTestNonBlocking COMMAND StressTestNonBlocking)
+endif()
 
 #
 # Common thrift code generation rules