Browse Source

Add windows test fix

 - Server app should wait till Client finishes
Tatyana Borisova 5 years ago
parent
commit
634789302f
2 changed files with 4 additions and 3 deletions
  1. 1 1
      cmake/QtProtobufTest.cmake
  2. 3 2
      tests/test_grpc/test_driver.bat.in

+ 1 - 1
cmake/QtProtobufTest.cmake

@@ -16,7 +16,7 @@ function(add_test_target)
         cmake_policy(SET CMP0071 NEW)
     endif()
 
-    set(GENERATED_SOURCES_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated)
+    set(GENERATED_SOURCES_DIR ${CMAKE_CURRENT_BINARY_DIR}/${add_test_target_TARGET}_generated)
 
     if(DEFINED add_test_target_PROTO_FILES)
         file(GLOB PROTO_FILES ABSOLUTE ${add_test_target_PROTO_FILES})

+ 3 - 2
tests/test_grpc/test_driver.bat.in

@@ -1,8 +1,9 @@
 START "Server" %2
 
-START "Client test" %1 /WAIT
+START "Client test" /WAIT %1
 
 ; kill background server process
 taskkill /im %4
 
-TIMEOUT /T 2
+TIMEOUT /T 2
+