Browse Source

Merge branch 'rightlib' into mergelibs-240905-0836

Alexander Smirnov 6 months ago
parent
commit
bb0647a7d9

+ 1 - 2
build/conf/settings.conf

@@ -15,7 +15,7 @@ ENABLE_RERESOLVE_FOR_GENERATED_FILES=yes
 REPORT_ALL_DUPSRC=yes
 DEPS_CACHE_CONTROL_UIDS_CACHE=yes
 INCLUDE_BLACKLIST_TO_CONF_HASH=no
-INCLUDE_ISOLATED_PROJECTS_TO_CONF_HASH=yes
+INCLUDE_ISOLATED_PROJECTS_TO_CONF_HASH=no
 USE_GRAND_BYPASS=no
 USE_GLOBAL_CMD=yes
 YMAKE_USE_NEW_UIDS=yes
@@ -129,4 +129,3 @@ _FOLDABLE_VARS=\
 
 ARCADIA_TEST_ROOT=../arcadia_tests_data/
 DEFAULT_REQUIREMENTS=network:restricted cpu:1 ram:32
-

+ 2 - 0
build/export_generators/ide-gradle/build.gradle.kts.jinja

@@ -44,11 +44,13 @@ plugins {
 {%- endif %}
 }
 {# language level #}
+{%- if target.required_jdk != "" %}
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of("{{ target.required_jdk }}")
     }
 }
+{%  endif -%}
 {%- if target.with_kotlinc_plugin_allopen %}
 
 allOpen {

+ 4 - 0
build/mapping.conf.json

@@ -381,6 +381,8 @@
         "6892348074": "https://devtools-registry.s3.yandex.net/6892348074",
         "6924868447": "https://devtools-registry.s3.yandex.net/6924868447",
         "6924868767": "https://devtools-registry.s3.yandex.net/6924868767",
+        "7000556602": "https://devtools-registry.s3.yandex.net/7000556602",
+        "7000559763": "https://devtools-registry.s3.yandex.net/7000559763",
         "5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
         "5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
         "5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -1216,6 +1218,8 @@
         "6892348074": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "6924868447": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "6924868767": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
+        "7000556602": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
+        "7000559763": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
         "5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
         "5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",

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

@@ -1,12 +1,12 @@
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924866298)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000557899)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924865372)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000557002)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924868767)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000559763)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924864489)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000556408)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924867240)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000558863)
 
 ENDIF()

+ 5 - 5
build/platform/test_tool/host_os.ya.make.inc

@@ -1,12 +1,12 @@
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924866817)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000555716)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924866115)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000555346)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924868447)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000556602)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924865342)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000554860)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924867637)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000556186)
 
 ENDIF()

+ 2 - 0
build/plugins/lib/test_const/__init__.py

@@ -209,6 +209,8 @@ XCODE_TOOLS_RESOURCE = 'XCODE_TOOLS_ROOT_RESOURCE_GLOBAL'
 WINE_TOOL = 'WINE_TOOL_RESOURCE_GLOBAL'
 WINE32_TOOL = 'WINE32_TOOL_RESOURCE_GLOBAL'
 
+DEFAULT_CRASHED_STATUS_COMMENT = "Test crashed"
+
 
 class Enum(object):
     @classmethod

+ 8 - 0
build/sysincl/libc-to-nothing.yml

@@ -108,10 +108,12 @@
   - sys/mtio.h
   - sys/param.h
   - sys/personality.h
+  - sys/platform/ppc.h
   - sys/poll.h
   - sys/prctl.h
   - sys/procfs.h
   - sys/ptrace.h
+  - sys/queue.h
   - sys/quota.h
   - sys/reboot.h
   - sys/resource.h
@@ -122,12 +124,14 @@
   - sys/signalfd.h
   - sys/signal.h
   - sys/socket.h
+  - sys/socketvar.h
   - sys/soundcard.h
   - sys/statfs.h
   - sys/stat.h
   - sys/statvfs.h
   - sys/stropts.h
   - sys/syscall.h
+  - sys/sysctl.h
   - sys/sysinfo.h
   - sys/syslog.h
   - sys/sysmacros.h
@@ -142,6 +146,7 @@
   - sys/ucontext.h
   - sys/uio.h
   - sys/un.h
+  - sys/unistd.h
   - sys/user.h
   - sys/utsname.h
   - sys/vfs.h
@@ -149,9 +154,11 @@
   - sys/wait.h
   - sys/xattr.h
   - tar.h
+  - termio.h
   - termios.h
   - threads.h
   - time.h
+  - ttyent.h
   - uchar.h
   - ucontext.h
   - ulimit.h
@@ -162,3 +169,4 @@
   - values.h
   - wait.h
   - wordexp.h
+  - xlocale.h

+ 0 - 10
build/sysincl/linux.yml

@@ -40,13 +40,3 @@
   - sgtty.h
   - sys/bitypes.h
   - sys/cdefs.h
-  - sys/memfd.h
-  - sys/queue.h
-  - sys/platform/ppc.h
-  - sys/socketvar.h
-  - sys/sysctl.h
-  - sys/unistd.h
-  - termio.h
-  - ttyent.h
-  - ustat.h
-  - xlocale.h

+ 1 - 1
build/ymake.core.conf

@@ -5651,7 +5651,7 @@ TEST_TOOL_HOST_LOCAL=
 TEST_TOOL_TARGET_LOCAL=
 
 when ($MOST_USED_CUDA) {
-    CUDA11=yes
+    CUDA12=yes
 }
 
 CUDA_VERSION=0

+ 2 - 2
build/ymake_conf.py

@@ -2451,7 +2451,7 @@ class Cuda(object):
 
         if self.cuda_version.value in ('11.4', '11.8', '12.1', '12.2'):
             return True
-        elif self.cuda_version.value in ('10.2',) and target.is_linux_armv8:
+        elif self.cuda_version.value in ('10.2', '11.4.19') and target.is_linux_armv8:
             return True
         else:
             raise ConfigureError('CUDA version {} is not supported in Arcadia'.format(self.cuda_version.value))
@@ -2465,7 +2465,7 @@ class Cuda(object):
 
     def auto_cuda_version(self):
         if self.use_arcadia_cuda.value:
-            return '11.4'
+            return '12.2'
 
         if not self.have_cuda.value:
             return None

Some files were not shown because too many files changed in this diff