Browse Source

intermediate changes
ref:4f39bce3f2ec20f800ddb9f8fb36315e0d942369

arcadia-devtools 3 years ago
parent
commit
97b4fd5e68
2 changed files with 11 additions and 11 deletions
  1. 10 10
      build/platform/test_tool/host.ya.make.inc
  2. 1 1
      build/scripts/run_msvc_wine.py

+ 10 - 10
build/platform/test_tool/host.ya.make.inc

@@ -1,16 +1,16 @@
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2885499122)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2885429195)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2896500790)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2896463250)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2885497988)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2885427941)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2896499974)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2896462300)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_PPC64LE)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_PPC64LE)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2885498371)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2885428392)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2896500466)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2896462720)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2885499564)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2885429533)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2896501019)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2896463658)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2885497290)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2885427800)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2896499654)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2896461674)
 ENDIF()
 ENDIF()

+ 1 - 1
build/scripts/run_msvc_wine.py

@@ -45,7 +45,7 @@ def run_subprocess_with_timeout(timeout, args):
             if p is not None:
             if p is not None:
                 try:
                 try:
                     p.kill()
                     p.kill()
-                    p.communicate()
+                    p.wait(timeout=1)
                 except Exception:
                 except Exception:
                     pass
                     pass
             attempts_remaining -= 1
             attempts_remaining -= 1