From ff6e1301ada90658e72780249c68164324db6032 Mon Sep 17 00:00:00 2001 From: aignas <240938+aignas@users.noreply.github.com> Date: Thu, 1 Aug 2024 11:54:16 +0300 Subject: [PATCH 1/3] test(toolchain): use flag_values in test platform defs Comment on #2095 --- tests/toolchains/defs.bzl | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/toolchains/defs.bzl b/tests/toolchains/defs.bzl index 076e6b42eb..fbb70820c9 100644 --- a/tests/toolchains/defs.bzl +++ b/tests/toolchains/defs.bzl @@ -26,6 +26,7 @@ def define_toolchain_tests(name): for platform_key, platform_info in PLATFORMS.items(): native.config_setting( name = "_is_{}".format(platform_key), + flag_values = platform_info.flag_values, constraint_values = platform_info.compatible_with, ) From f617ffa77fb9317eb2aef6459b4cb18bb13f2779 Mon Sep 17 00:00:00 2001 From: aignas <240938+aignas@users.noreply.github.com> Date: Thu, 1 Aug 2024 14:01:56 +0300 Subject: [PATCH 2/3] fix: allow collecting coverage when running toolchain tests --- python/private/python.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/private/python.bzl b/python/private/python.bzl index ce00a7bb74..dc5b78c99c 100644 --- a/python/private/python.bzl +++ b/python/private/python.bzl @@ -267,7 +267,7 @@ def _create_toolchain_attr_structs(mod): break if register_all: arg_structs.extend([ - _create_toolchain_attrs_struct(python_version = v) + _create_toolchain_attrs_struct(tag = struct(python_version = v, configure_coverage_tool = True, is_default = False)) for v in TOOL_VERSIONS.keys() if v not in seen_versions ]) From a256baafb65d37b5caafd197f361c48d9d9a87e7 Mon Sep 17 00:00:00 2001 From: Ignas Anikevicius <240938+aignas@users.noreply.github.com> Date: Fri, 2 Aug 2024 11:28:20 +0300 Subject: [PATCH 3/3] Update python/private/python.bzl --- python/private/python.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/private/python.bzl b/python/private/python.bzl index dc5b78c99c..ce00a7bb74 100644 --- a/python/private/python.bzl +++ b/python/private/python.bzl @@ -267,7 +267,7 @@ def _create_toolchain_attr_structs(mod): break if register_all: arg_structs.extend([ - _create_toolchain_attrs_struct(tag = struct(python_version = v, configure_coverage_tool = True, is_default = False)) + _create_toolchain_attrs_struct(python_version = v) for v in TOOL_VERSIONS.keys() if v not in seen_versions ])