diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-23 05:31:26 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-23 05:31:26 +0300 |
| commit | c2f6fa508a2a2c3cc0530319977ec1d37166c0da (patch) | |
| tree | cd925d392369c2fcf6a18d6fdfb57d492ed8b3b6 | |
| parent | c42bb8cbe034b53a7abe8eb0b28b84f6171776d6 (diff) | |
| download | ydb-c2f6fa508a2a2c3cc0530319977ec1d37166c0da.tar.gz | |
intermediate changes
ref:7ad50b9c568746e74aa064df7ff309c5798027fc
| -rw-r--r-- | build/plugins/ytest.py | 1 | ||||
| -rw-r--r-- | build/rules/go/vendor.policy | 1 | ||||
| -rw-r--r-- | contrib/libs/openssl/crypto/ya.make | 8 | ||||
| -rw-r--r-- | contrib/libs/openssl/ya.make | 8 | ||||
| -rw-r--r-- | library/python/filelock/__init__.py | 2 |
5 files changed, 11 insertions, 9 deletions
diff --git a/build/plugins/ytest.py b/build/plugins/ytest.py index 73be62fb6b..ba6d2b233a 100644 --- a/build/plugins/ytest.py +++ b/build/plugins/ytest.py @@ -861,6 +861,7 @@ def onjava_test(unit, *args): '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_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') if test_classpath_origins: diff --git a/build/rules/go/vendor.policy b/build/rules/go/vendor.policy index 858fe34eb7..2e97404a27 100644 --- a/build/rules/go/vendor.policy +++ b/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/compiler ALLOW infra/infractl/.* -> vendor/gopkg.in/yaml.v3 +ALLOW infra/infractl/.* -> vendor/github.com/ghodss/yaml # CONTRIB-2445 ALLOW psp -> vendor/github.com/zimmski/go-mutesting diff --git a/contrib/libs/openssl/crypto/ya.make b/contrib/libs/openssl/crypto/ya.make index 44d574c830..681e3dd0a0 100644 --- a/contrib/libs/openssl/crypto/ya.make +++ b/contrib/libs/openssl/crypto/ya.make @@ -1462,6 +1462,14 @@ IF (OS_ANDROID AND ARCH_ARM64) ) 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() END() diff --git a/contrib/libs/openssl/ya.make b/contrib/libs/openssl/ya.make index 95485364ed..ab5857fee1 100644 --- a/contrib/libs/openssl/ya.make +++ b/contrib/libs/openssl/ya.make @@ -357,14 +357,6 @@ IF (OS_ANDROID AND ARCH_ARM64) ) 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() END() diff --git a/library/python/filelock/__init__.py b/library/python/filelock/__init__.py index f81ff67f37..fae89713d3 100644 --- a/library/python/filelock/__init__.py +++ b/library/python/filelock/__init__.py @@ -75,7 +75,7 @@ class _WinFileLock(AbstractFileLock): super(_WinFileLock, self).__init__(path) self._lock = None try: - with file(path, 'w') as lock_file: + with open(path, 'w') as lock_file: lock_file.write(" " * self._LOCKED_BYTES_NUM) except IOError as e: if e.errno != errno.EACCES or not os.path.isfile(path): |