From 7b4678c529dbf4bee5a388bc4cbd84cf84e872aa Mon Sep 17 00:00:00 2001 From: Jacob Rodal Date: Wed, 2 Oct 2024 19:51:17 -0700 Subject: [PATCH] fix broken xru3d tests Summary: This diff modifies my recently added `maybe_add_run_as_bundle_label` function to opt out of both default_run_as_bundle and the tpx.force_run_as_bundle instead of only opting out of default_run_as_bundle. Reviewed By: bricehalder Differential Revision: D63796604 fbshipit-source-id: e4c24f0511eb0a14bf0b9e81a297af3c678d24a5 --- tests/re_utils.bzl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/re_utils.bzl b/tests/re_utils.bzl index d3646f2a6..d5ef36611 100644 --- a/tests/re_utils.bzl +++ b/tests/re_utils.bzl @@ -42,9 +42,10 @@ def _get_re_arg(ctx: AnalysisContext) -> ReArg: return ReArg(re_props = None, default_run_as_bundle = False) def maybe_add_run_as_bundle_label(ctx: AnalysisContext, labels: list[str]) -> None: + if "re_ignore_force_run_as_bundle" in labels: + return re_arg = _get_re_arg(ctx) - run_as_bundle = re_arg.default_run_as_bundle and "re_ignore_default_run_as_bundle" not in ctx.attrs.labels - if run_as_bundle or read_config("tpx", "force_run_as_bundle") == "True": + if re_arg.default_run_as_bundle or read_config("tpx", "force_run_as_bundle") == "True": labels.extend(["run_as_bundle"]) def get_re_executors_from_props(ctx: AnalysisContext) -> ([CommandExecutorConfig, None], dict[str, CommandExecutorConfig]):