From 1bb53718bf2f831585f87483c359ac039f1d1f84 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Sat, 4 Feb 2017 15:39:27 -0800 Subject: Disable writes_per_rpc on Windows --- CMakeLists.txt | 4 + build.yaml | 4 + tools/run_tests/generated/tests.json | 6 +- .../writes_per_rpc_test.vcxproj | 207 --------------------- .../writes_per_rpc_test.vcxproj.filters | 21 --- 5 files changed, 10 insertions(+), 232 deletions(-) delete mode 100644 vsprojects/vcxproj/test/writes_per_rpc_test/writes_per_rpc_test.vcxproj delete mode 100644 vsprojects/vcxproj/test/writes_per_rpc_test/writes_per_rpc_test.vcxproj.filters diff --git a/CMakeLists.txt b/CMakeLists.txt index a3876b25fc..1572b546f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -640,7 +640,9 @@ endif() add_dependencies(buildtests_cxx stress_test) add_dependencies(buildtests_cxx thread_manager_test) add_dependencies(buildtests_cxx thread_stress_test) +if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_cxx writes_per_rpc_test) +endif() add_custom_target(buildtests DEPENDS buildtests_c buildtests_cxx) @@ -9241,6 +9243,7 @@ target_link_libraries(thread_stress_test endif (gRPC_BUILD_TESTS) if (gRPC_BUILD_TESTS) +if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(writes_per_rpc_test test/cpp/performance/writes_per_rpc_test.cc @@ -9274,6 +9277,7 @@ target_link_libraries(writes_per_rpc_test ${_gRPC_GFLAGS_LIBRARIES} ) +endif() endif (gRPC_BUILD_TESTS) if (gRPC_BUILD_TESTS) diff --git a/build.yaml b/build.yaml index 7fcad65d85..4a5abc31c6 100644 --- a/build.yaml +++ b/build.yaml @@ -3753,6 +3753,10 @@ targets: - grpc - gpr_test_util - gpr + platforms: + - mac + - linux + - posix - name: public_headers_must_be_c89 build: test language: c89 diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index d60a501fe4..2374350385 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -3236,8 +3236,7 @@ "ci_platforms": [ "linux", "mac", - "posix", - "windows" + "posix" ], "cpu_cost": 0.5, "exclude_configs": [], @@ -3249,8 +3248,7 @@ "platforms": [ "linux", "mac", - "posix", - "windows" + "posix" ] }, { diff --git a/vsprojects/vcxproj/test/writes_per_rpc_test/writes_per_rpc_test.vcxproj b/vsprojects/vcxproj/test/writes_per_rpc_test/writes_per_rpc_test.vcxproj deleted file mode 100644 index 0c600e7c6a..0000000000 --- a/vsprojects/vcxproj/test/writes_per_rpc_test/writes_per_rpc_test.vcxproj +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {810755B2-5DCE-BFAC-4FEF-31EC03F85755} - true - $(SolutionDir)IntDir\$(MSBuildProjectName)\ - - - - v100 - - - v110 - - - v120 - - - v140 - - - Application - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - writes_per_rpc_test - static - Debug - static - Debug - - - writes_per_rpc_test - static - Release - static - Release - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - true - None - false - - - Console - true - false - - - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - true - None - false - - - Console - true - false - - - - - - NotUsing - Level3 - MaxSpeed - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - true - true - MultiThreaded - true - None - false - - - Console - true - false - true - true - - - - - - NotUsing - Level3 - MaxSpeed - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - true - true - MultiThreaded - true - None - false - - - Console - true - false - true - true - - - - - - - - - - {0BE77741-552A-929B-A497-4EF7ECE17A64} - - - {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} - - - {C187A093-A0FE-489D-A40A-6E33DE0F9FEB} - - - {29D16885-7228-4C31-81ED-5F9187C7F2A9} - - - {EAB0A629-17A9-44DB-B5FF-E91A721FE037} - - - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - diff --git a/vsprojects/vcxproj/test/writes_per_rpc_test/writes_per_rpc_test.vcxproj.filters b/vsprojects/vcxproj/test/writes_per_rpc_test/writes_per_rpc_test.vcxproj.filters deleted file mode 100644 index 0c6681c8a0..0000000000 --- a/vsprojects/vcxproj/test/writes_per_rpc_test/writes_per_rpc_test.vcxproj.filters +++ /dev/null @@ -1,21 +0,0 @@ - - - - - test\cpp\performance - - - - - - {e8f01540-7323-b353-da4e-1d9756443c15} - - - {00499d28-d12f-1639-e2e6-4a1223dcf398} - - - {625ff239-46ea-66d5-5528-15a877771997} - - - - -- cgit v1.2.3