Browse Source

intermediate changes
ref:7ad50b9c568746e74aa064df7ff309c5798027fc

arcadia-devtools 3 years ago
parent
commit
c2f6fa508a

+ 1 - 0
build/plugins/ytest.py

@@ -861,6 +861,7 @@ def onjava_test(unit, *args):
         'NO_JBUILD': 'yes' if ymake_java_test else 'no',
         'NO_JBUILD': 'yes' if ymake_java_test else 'no',
         'JDK_RESOURCE': 'JDK' + (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION') or '_DEFAULT'),
         'JDK_RESOURCE': 'JDK' + (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION') or '_DEFAULT'),
         'JDK_FOR_TESTS': 'JDK' + (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION') or '_DEFAULT') + '_FOR_TESTS',
         'JDK_FOR_TESTS': 'JDK' + (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION') or '_DEFAULT') + '_FOR_TESTS',
+        'YT-SPEC': serialize_list(get_unit_list_variable(unit, 'TEST_YT_SPEC_VALUE')),
     }
     }
     test_classpath_origins = unit.get('TEST_CLASSPATH_VALUE')
     test_classpath_origins = unit.get('TEST_CLASSPATH_VALUE')
     if test_classpath_origins:
     if test_classpath_origins:

+ 1 - 0
build/rules/go/vendor.policy

@@ -1030,6 +1030,7 @@ ALLOW cloud/compute/go-common/pkg/validation -> vendor/github.com/go-playground/
 ALLOW infra/infractl/.* -> vendor/github.com/google/gnostic/openapiv3
 ALLOW infra/infractl/.* -> vendor/github.com/google/gnostic/openapiv3
 ALLOW infra/infractl/.* -> vendor/github.com/google/gnostic/compiler
 ALLOW infra/infractl/.* -> vendor/github.com/google/gnostic/compiler
 ALLOW infra/infractl/.* -> vendor/gopkg.in/yaml.v3
 ALLOW infra/infractl/.* -> vendor/gopkg.in/yaml.v3
+ALLOW infra/infractl/.* -> vendor/github.com/ghodss/yaml
 
 
 # CONTRIB-2445
 # CONTRIB-2445
 ALLOW psp -> vendor/github.com/zimmski/go-mutesting
 ALLOW psp -> vendor/github.com/zimmski/go-mutesting

+ 8 - 0
contrib/libs/openssl/crypto/ya.make

@@ -1462,6 +1462,14 @@ IF (OS_ANDROID AND ARCH_ARM64)
     )
     )
 ENDIF()
 ENDIF()
 
 
+# mitigate SIGILL on some armv7 platforms
+# https://github.com/openssl/openssl/issues/17009
+IF (ARCADIA_OPENSSL_DISABLE_ARMV7_TICK)
+    CFLAGS(
+        -DARCADIA_OPENSSL_DISABLE_ARMV7_TICK        
+    )
+ENDIF()
+
 ENDIF()
 ENDIF()
 
 
 END()
 END()

+ 0 - 8
contrib/libs/openssl/ya.make

@@ -357,14 +357,6 @@ IF (OS_ANDROID AND ARCH_ARM64)
     )
     )
 ENDIF()
 ENDIF()
 
 
-# mitigate SIGILL on some armv7 platforms
-# https://github.com/openssl/openssl/issues/17009
-IF (ARCADIA_OPENSSL_DISABLE_ARMV7_TICK)
-    CFLAGS(
-        -DARCADIA_OPENSSL_DISABLE_ARMV7_TICK
-    )
-ENDIF()
-
 ENDIF()
 ENDIF()
 
 
 END()
 END()

+ 1 - 1
library/python/filelock/__init__.py

@@ -75,7 +75,7 @@ class _WinFileLock(AbstractFileLock):
         super(_WinFileLock, self).__init__(path)
         super(_WinFileLock, self).__init__(path)
         self._lock = None
         self._lock = None
         try:
         try:
-            with file(path, 'w') as lock_file:
+            with open(path, 'w') as lock_file:
                 lock_file.write(" " * self._LOCKED_BYTES_NUM)
                 lock_file.write(" " * self._LOCKED_BYTES_NUM)
         except IOError as e:
         except IOError as e:
             if e.errno != errno.EACCES or not os.path.isfile(path):
             if e.errno != errno.EACCES or not os.path.isfile(path):