Skip to content

Fix junit parse[Do not merge] #20659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 22 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion .github/scripts/tests/transform_ya_junit.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,10 @@ def transform(fp, mute_check: YaMuteCheck, ya_out_dir, save_inplace, log_url_pre

for case in suite.findall("testcase"):
test_name = case.get("name")
test_classname = case.get("classname") + '.' + test_name
case.set("name", test_classname)
case.set("classname", suite_name)
test_name = test_classname

is_fail = is_faulty_testcase(case)
has_fail_tests |= is_fail
Expand Down Expand Up @@ -269,6 +272,5 @@ def main():
test_stuff_prefix,
)


if __name__ == "__main__":
main()
6 changes: 5 additions & 1 deletion build/export_generators/cmake/dir_targets.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@
{%- set args = list_of_dict|selectattr(macro_field, 'eq', macro)|map(attribute=args_field)|sum -%}
{%- if args|length %}
{{ macro }}({{ target_name }}{{ macro_suffix }}
{%- for arg in args %}
{%- for arg in args -%}
{%- if ('"' in arg) and (arg[0] != '"') %}
[=[{{ arg }}]=]
{%- else %}
{{ arg }}
{%- endif -%}
{%- endfor %}
)
{% endif %}
Expand Down
6 changes: 6 additions & 0 deletions build/external_resources/go_tools/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ TOOLCHAIN(go)
IF(GOSTD_VERSION == 1.23)
VERSION(1.23)
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(GO_TOOLS go1.23.json)
ELSEIF(GOSTD_VERSION == 1.24)
VERSION(1.24)
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(GO_TOOLS go1.24.json)
ELSEIF(GOSTD_VERSION == 1.25)
VERSION(1.25)
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(GO_TOOLS go1.25.json)
ELSE()
MESSAGE(FATAL_ERROR Unsupported version [${GOSTD_VERSION}] of Go Standard Library)
ENDIF()
Expand Down
2 changes: 2 additions & 0 deletions build/mapping.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,7 @@
"8944928850": "{registry_endpoint}/8944928850",
"8980584272": "{registry_endpoint}/8980584272",
"9029509511": "{registry_endpoint}/9029509511",
"9059000402": "{registry_endpoint}/9059000402",
"5486731632": "{registry_endpoint}/5486731632",
"5514350352": "{registry_endpoint}/5514350352",
"5514360398": "{registry_endpoint}/5514360398",
Expand Down Expand Up @@ -2072,6 +2073,7 @@
"8944928850": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
"8980584272": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
"9029509511": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
"9059000402": "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",
Expand Down
10 changes: 5 additions & 5 deletions build/platform/test_tool/host.ya.make.inc
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029515707)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9059043122)
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029513855)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9059040296)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029519042)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9059050710)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029512688)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9059037599)
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029517384)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9059047042)

ENDIF()
10 changes: 5 additions & 5 deletions build/platform/test_tool/host_os.ya.make.inc
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029506769)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9058995494)
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029504959)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9058993203)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029509511)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9059000402)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029503739)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9058991328)
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029508202)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9058997687)

ENDIF()
14 changes: 10 additions & 4 deletions contrib/libs/icu/.yandex_meta/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,23 @@
from devtools.yamaker.project import NixProject


def _get_major_version(version: str) -> str:
return version.split('.')[0]


def post_build(self):
# copying icudt.dat file from original repository
icu_dat_path = f"{self.srcdir}/data/in/icudt76l.dat"
rodata_path = f"{self.dstdir}/icudt76_dat.rodata"
major_version = _get_major_version(self.version)
icu_dat_path = f"{self.srcdir}/data/in/icudt{major_version}l.dat"
rodata_path = f"{self.dstdir}/icudt{major_version}_dat.rodata"
shutil.copy(icu_dat_path, rodata_path)


def post_install(self):
result_target = self.yamakes["."]

result_target.SRCS.add("icudt76_dat.rodata")
major_version = _get_major_version(self.version)
result_target.SRCS.add(f"icudt{major_version}_dat.rodata")

result_target.CFLAGS = [
"-DU_COMMON_IMPLEMENTATION",
Expand Down Expand Up @@ -84,7 +90,7 @@ def post_install(self):
"g:cpp-contrib",
],
arcdir="contrib/libs/icu",
nixattr="icu74",
nixattr="icu",
put_with={
"icuio": [
"icuuc",
Expand Down
28 changes: 14 additions & 14 deletions contrib/libs/icu/.yandex_meta/devtools.copyrights.report
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,17 @@ BELONGS ya.make
Files with this license:
readme.html [7:10]

KEEP COPYRIGHT_SERVICE_LABEL 15a10786a52ce6e33763c52348c47981
BELONGS ya.make
License text:
Copyright © 2016-2025 Unicode, Inc.
Scancode info:
Original SPDX id: COPYRIGHT_SERVICE_LABEL
Score : 100.00
Match type : COPYRIGHT
Files with this license:
LICENSE [5:5]

KEEP COPYRIGHT_SERVICE_LABEL 15d83207399227b14a1044b1cba00a64
BELONGS ya.make
License text:
Expand Down Expand Up @@ -761,17 +772,6 @@ BELONGS ya.make
include/unicode/selfmt.h [4:6]
include/unicode/umsg.h [4:6]

KEEP COPYRIGHT_SERVICE_LABEL 2a4e27e8d5d46fb305aaa9ee946c9903
BELONGS ya.make
License text:
Copyright © 2016-2024 Unicode, Inc.
Scancode info:
Original SPDX id: COPYRIGHT_SERVICE_LABEL
Score : 100.00
Match type : COPYRIGHT
Files with this license:
LICENSE [5:5]

KEEP COPYRIGHT_SERVICE_LABEL 2b694c7444010b1b84ed2710400fe3ef
BELONGS ya.make
Note: matched license text is too long. Read it in the source files.
Expand Down Expand Up @@ -3450,7 +3450,7 @@ BELONGS ya.make
Score : 100.00
Match type : COPYRIGHT
Files with this license:
i18n/messageformat2.cpp [523:525]
i18n/messageformat2.cpp [505:507]

KEEP COPYRIGHT_SERVICE_LABEL a021d3bd6d6cbb97cbccc0ab1586c491
BELONGS ya.make
Expand Down Expand Up @@ -3840,7 +3840,7 @@ BELONGS ya.make
Score : 100.00
Match type : COPYRIGHT
Files with this license:
APIChangeReport.html [1173:1175]
APIChangeReport.html [566:568]

KEEP COPYRIGHT_SERVICE_LABEL c1b7297fc443f46a1d1de36f8b788822
BELONGS ya.make
Expand Down Expand Up @@ -4354,7 +4354,7 @@ BELONGS ya.make
Score : 100.00
Match type : COPYRIGHT
Files with this license:
i18n/messageformat2.cpp [581:591]
i18n/messageformat2.cpp [563:573]

KEEP COPYRIGHT_SERVICE_LABEL eed7e8b3d80757822970ac3a50dd6716
BELONGS ya.make
Expand Down
6 changes: 3 additions & 3 deletions contrib/libs/icu/.yandex_meta/devtools.licenses.report
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
# FILE_IGNORE - ignore file (do nothing)
# FILE_INCLUDE - include all file data into licenses text file
# =======================
IGNORE_FILES icudt76_dat.rodata
IGNORE_FILES icudt77_dat.rodata

KEEP Unicode 0285f1da3a441f34fd441c30fe7aa87e
BELONGS ya.make
Expand Down Expand Up @@ -111,7 +111,7 @@ BELONGS ya.make
Match type : INTRO
Links : https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/free-unknown.LICENSE
Files with this license:
i18n/messageformat2_parser.cpp [338:338]
i18n/messageformat2_parser.cpp [585:585]

KEEP MIT 399584035c417b91040964779555dfac
BELONGS ya.make
Expand Down Expand Up @@ -1217,7 +1217,7 @@ BELONGS ya.make
Match type : REFERENCE
Links : http://unicode.org/, http://unicode.org/copyright.html, https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/unicode.LICENSE
Files with this license:
APIChangeReport.html [1175:1175]
APIChangeReport.html [568:568]

KEEP BSD-3-Clause 8324f1990c82a65667a0b4767115a5fa
BELONGS ya.make
Expand Down
6 changes: 3 additions & 3 deletions contrib/libs/icu/.yandex_meta/licenses.list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// 5iii(c)(a). Assert that `key` is a literal.
// (Not needed)
// 5iii(c)(b). Let `ks` be the resolved value of `key`.
UnicodeString ks = key.asLiteral().unquoted();
UnicodeString ks = normalizeNFC(key.asLiteral().unquoted());
// 5iii(c)(c) Let matchpref be the integer position of ks in `matches`.
matchpref = vectorFind(matches, ks);
U_ASSERT(matchpref >= 0);
Expand Down Expand Up @@ -1355,7 +1355,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


====================COPYRIGHT====================
<i><font size="-1">Contents generated by StableAPI tool on Mon Sep 30 11:33:51 PDT 2024<br>
<i><font size="-1">Contents generated by StableAPI tool on Wed Feb 19 16:09:53 PST 2025<br>
Copyright &copy; 2017 and later: Unicode, Inc. and others.<br>
License &amp; terms of use: http://www.unicode.org/copyright.html

Expand Down Expand Up @@ -1383,7 +1383,7 @@ Copyright © 2012-2015 Dan Nicholson <[email protected]>


====================COPYRIGHT====================
Copyright © 2016-2024 Unicode, Inc.
Copyright © 2016-2025 Unicode, Inc.


====================Custom-punycode====================
Expand Down
4 changes: 2 additions & 2 deletions contrib/libs/icu/.yandex_meta/override.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
self: super: with self; rec {
version = "76.1";
version = "77.1";
version_dash = "${lib.replaceStrings [ "." ] [ "-" ] version}";
version_us = "${lib.replaceStrings [ "." ] [ "_" ] version}";

src = fetchurl {
url = "https://github.com/unicode-org/icu/releases/download/release-${version_dash}/icu4c-${version_us}-src.tgz";
hash = "sha256-36y0a/5HR0EEcs4+EUS/KKEC/uqk44dbrJtMbPMPTz4=";
hash = "sha256-WI5DH3cyfDkDH/u4hDwOO8EiwhE3RIX6h9xfP6/yQGE=";
};

sourceRoot = "icu/source";
Expand Down
Loading
Loading