Merge pull request #13401 from jtattermusch/windows_cmake_distrib_tests

Add windows cmake distrib test

6 files changed, 111 insertions, 8 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 921487e6f4..297301bb39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -235,6 +235,7 @@ if("${gRPC_SSL_PROVIDER}" STREQUAL "module")
 elseif("${gRPC_SSL_PROVIDER}" STREQUAL "package")
   find_package(OpenSSL REQUIRED)
   set(_gRPC_SSL_LIBRARIES ${OPENSSL_LIBRARIES})
+  include_directories(${OPENSSL_INCLUDE_DIR})
   set(_gRPC_FIND_SSL "if(NOT OPENSSL_FOUND)\n  find_package(OpenSSL)\nendif()")
 endif()
 
diff --git a/examples/cpp/helloworld/CMakeLists.txt b/examples/cpp/helloworld/CMakeLists.txt
index 71a8db4f24..49684a13b0 100644
--- a/examples/cpp/helloworld/CMakeLists.txt
+++ b/examples/cpp/helloworld/CMakeLists.txt
@@ -6,13 +6,29 @@ project(HelloWorld C CXX)
 

 if(NOT MSVC)

   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

+else()

+  add_definitions(-D_WIN32_WINNT=0x600)

 endif()

 

 # Protobuf

-set(protobuf_MODULE_COMPATIBLE TRUE)

-find_package(protobuf CONFIG REQUIRED)

+# NOTE: we cannot use "CONFIG" mode here because protobuf-config.cmake

+# is broken when used with CMAKE_INSTALL_PREFIX

+find_package(Protobuf REQUIRED)

 message(STATUS "Using protobuf ${protobuf_VERSION}")

 

+if(Protobuf_FOUND)

+  # Protobuf_FOUND is set for package type "CONFIG"

+  set(_PROTOBUF_LIBPROTOBUF protobuf::libprotobuf)

+  set(_PROTOBUF_PROTOC protobuf::protoc)

+elseif(PROTOBUF_FOUND)

+  # PROTOBUF_FOUND is set for package type "MODULE"

+  set(_PROTOBUF_LIBPROTOBUF ${PROTOBUF_LIBRARIES})

+  set(_PROTOBUF_PROTOC ${PROTOBUF_PROTOC_EXECUTABLE})

+  include_directories(${PROTOBUF_INCLUDE_DIRS})

+else()

+  message(WARNING "Failed to locate libprotobuf and protoc!")

+endif()

+

 # gRPC

 find_package(gRPC CONFIG REQUIRED)

 message(STATUS "Using gRPC ${gRPC_VERSION}")

@@ -31,7 +47,7 @@ set(hw_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.cc")
 set(hw_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.h")

 add_custom_command(

       OUTPUT "${hw_grpc_srcs}" "${hw_grpc_hdrs}"

-      COMMAND protobuf::protoc

+      COMMAND ${_PROTOBUF_PROTOC}

       ARGS --grpc_out "${CMAKE_CURRENT_BINARY_DIR}" -I "${hw_proto_path}"

         --plugin=protoc-gen-grpc="${gRPC_CPP_PLUGIN_EXECUTABLE}"

         "${hw_proto}"

@@ -48,6 +64,6 @@ foreach(_target
     ${hw_proto_srcs}

     ${hw_grpc_srcs})

   target_link_libraries(${_target}

-    protobuf::libprotobuf

+    ${_PROTOBUF_LIBPROTOBUF}

     gRPC::grpc++_unsecure)

 endforeach()

diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template
index 0be5d14cfe..f89371057f 100644
--- a/templates/CMakeLists.txt.template
+++ b/templates/CMakeLists.txt.template
@@ -280,6 +280,7 @@
   elseif("<%text>${gRPC_SSL_PROVIDER}</%text>" STREQUAL "package")
     find_package(OpenSSL REQUIRED)
     set(_gRPC_SSL_LIBRARIES <%text>${OPENSSL_LIBRARIES}</%text>)
+    include_directories(<%text>${OPENSSL_INCLUDE_DIR}</%text>)
     set(_gRPC_FIND_SSL "if(NOT OPENSSL_FOUND)\n  find_package(OpenSSL)\nendif()")
   endif()
 
diff --git a/test/distrib/cpp/run_distrib_test_cmake.bat b/test/distrib/cpp/run_distrib_test_cmake.bat
new file mode 100644
index 0000000000..047846b0f1
--- /dev/null
+++ b/test/distrib/cpp/run_distrib_test_cmake.bat
@@ -0,0 +1,75 @@
+@rem Copyright 2016 gRPC authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem     http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+
+@rem enter this directory
+cd /d %~dp0\..\..\..
+
+@rem TODO(jtattermusch): Kokoro has pre-installed protoc.exe in C:\Program Files\ProtoC and that directory
+@rem is on PATH. To avoid picking up the older version protoc.exe, we change the path to something non-existent.
+set PATH=%PATH:ProtoC=DontPickupProtoC%
+
+@rem Install into ./testinstall, but use absolute path and foward slashes
+set INSTALL_DIR=%cd:\=/%/testinstall
+
+@rem Download OpenSSL-Win32 originally installed from https://slproweb.com/products/Win32OpenSSL.html
+powershell -Command "(New-Object Net.WebClient).DownloadFile('https://storage.googleapis.com/grpc-testing.appspot.com/OpenSSL-Win32-1_1_0g.zip', 'OpenSSL-Win32.zip')"
+powershell -Command "Add-Type -Assembly 'System.IO.Compression.FileSystem'; [System.IO.Compression.ZipFile]::ExtractToDirectory('OpenSSL-Win32.zip', '.');"
+
+@rem set absolute path to OpenSSL with forward slashes
+set OPENSSL_DIR=%cd:\=/%/OpenSSL-Win32
+
+cd third_party/zlib
+mkdir cmake
+cd cmake
+cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% ..
+cmake --build . --config Release --target install || goto :error
+cd ../../..
+
+cd third_party/protobuf/cmake
+mkdir build
+cd build
+cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -Dprotobuf_MSVC_STATIC_RUNTIME=OFF -Dprotobuf_BUILD_TESTS=OFF ..
+cmake --build . --config Release --target install || goto :error
+cd ../../../..
+
+cd third_party/cares/cares
+mkdir cmake
+cd cmake
+cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% ..
+cmake --build . --config Release --target install || goto :error
+cd ../../../..
+
+@rem OpenSSL-Win32 and OpenSSL-Win64 can be downloaded from https://slproweb.com/products/Win32OpenSSL.html
+cd cmake
+mkdir build
+cd build
+cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DOPENSSL_ROOT_DIR=%OPENSSL_DIR% -DOPENSSL_INCLUDE_DIR=%OPENSSL_DIR%/include -DZLIB_LIBRARY=%INSTALL_DIR%/lib/zlibstatic.lib -DZLIB_INCLUDE_DIR=%INSTALL_DIR%/include -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DgRPC_PROTOBUF_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package -DgRPC_CARES_PROVIDER=package -DgRPC_SSL_PROVIDER=package -DCMAKE_BUILD_TYPE=Release ../.. || goto :error
+cmake --build . --config Release --target install || goto :error
+cd ../..
+
+# Build helloworld example using cmake
+cd examples/cpp/helloworld
+mkdir cmake
+cd cmake
+mkdir build
+cd build
+cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% ../.. || goto :error
+cmake --build . --config Release || goto :error
+cd ../../../../..
+
+goto :EOF
+
+:error
+echo Failed!
+exit /b %errorlevel%
diff --git a/test/distrib/cpp/run_distrib_test_cmake.sh b/test/distrib/cpp/run_distrib_test_cmake.sh
index ead8cc10bc..a9c081c2f5 100755
--- a/test/distrib/cpp/run_distrib_test_cmake.sh
+++ b/test/distrib/cpp/run_distrib_test_cmake.sh
@@ -19,7 +19,6 @@ cd $(dirname $0)/../../..
 
 echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
 apt-get update
-#apt-get install -t jessie-backports -y libc-ares-dev  # we need specifically version 1.12
 apt-get install -t jessie-backports -y libssl-dev
 
 # Install c-ares
diff --git a/tools/run_tests/artifacts/distribtest_targets.py b/tools/run_tests/artifacts/distribtest_targets.py
index 9959651b6c..7ba0e0ebc9 100644
--- a/tools/run_tests/artifacts/distribtest_targets.py
+++ b/tools/run_tests/artifacts/distribtest_targets.py
@@ -49,7 +49,8 @@ def create_docker_jobspec(name, dockerfile_dir, shell_command, environ={},
 
 def create_jobspec(name, cmdline, environ=None, shell=False,
                    flake_retries=0, timeout_retries=0,
-                   use_workspace=False):
+                   use_workspace=False,
+                   timeout_seconds=10*60):
   """Creates jobspec."""
   environ = environ.copy()
   if use_workspace:
@@ -60,7 +61,7 @@ def create_jobspec(name, cmdline, environ=None, shell=False,
           cmdline=cmdline,
           environ=environ,
           shortname='distribtest.%s' % (name),
-          timeout_seconds=10*60,
+          timeout_seconds=timeout_seconds,
           flake_retries=flake_retries,
           timeout_retries=timeout_retries,
           shell=shell)
@@ -214,7 +215,10 @@ class CppDistribTest(object):
   """Tests Cpp make intall by building examples."""
 
   def __init__(self, platform, arch, docker_suffix=None, testcase=None):
-    self.name = 'cpp_%s_%s_%s_%s' % (platform, arch, docker_suffix, testcase)
+    if platform == 'linux':
+      self.name = 'cpp_%s_%s_%s_%s' % (platform, arch, docker_suffix, testcase)
+    else:
+      self.name = 'cpp_%s_%s_%s' % (platform, arch, testcase)
     self.platform = platform
     self.arch = arch
     self.docker_suffix = docker_suffix
@@ -231,6 +235,12 @@ class CppDistribTest(object):
                                        self.docker_suffix,
                                        self.arch),
                                    'test/distrib/cpp/run_distrib_test_%s.sh' % self.testcase)
+    elif self.platform == 'windows':
+      return create_jobspec(self.name,
+                            ['test\\distrib\\cpp\\run_distrib_test_%s.bat' % self.testcase],
+                            environ={},
+                            timeout_seconds=30*60,
+                            use_workspace=True)
     else:
       raise Exception("Not supported yet.")
 
@@ -242,6 +252,7 @@ def targets():
   """Gets list of supported targets"""
   return [CppDistribTest('linux', 'x64', 'jessie', 'routeguide'),
           CppDistribTest('linux', 'x64', 'jessie', 'cmake'),
+          CppDistribTest('windows', 'x86', testcase='cmake'),
           CSharpDistribTest('linux', 'x64', 'wheezy'),
           CSharpDistribTest('linux', 'x64', 'jessie'),
           CSharpDistribTest('linux', 'x86', 'jessie'),