From 2a9a635c741fe1633d33ffa4ab8e6daeee565fcc Mon Sep 17 00:00:00 2001
From: helly25 <6420169+helly25@users.noreply.github.com>
Date: Sat, 31 Oct 2026 18:06:27 +0000
Subject: [PATCH] Upgrade bashtest to 0.7.1 and remove launcher workaround

---
 MODULE.bazel                                     |  8 +-------
 bazelmod/BUILD.bazel                             |  1 -
 bazelmod/bashtest-launcher-exec-properties.patch | 13 -------------
 3 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 bazelmod/bashtest-launcher-exec-properties.patch

diff --git a/MODULE.bazel b/MODULE.bazel
index 546b0fb85e5..a9bc32df16f 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -81,10 +81,4 @@ git_override(
     remote = "https://github.com/mboworks/mbo.git",
 )
 bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.2")
-bazel_dep(name = "mboworks_bashtest", version = "0.7.0")
-# Keep test execution properties on the outer test, not its binary launchers.
-single_version_override(
-    module_name = "mboworks_bashtest",
-    patch_strip = 1,
-    patches = ["//bazelmod:bashtest-launcher-exec-properties.patch"],
-)
+bazel_dep(name = "mboworks_bashtest", version = "0.7.1")
diff --git a/bazelmod/BUILD.bazel b/bazelmod/BUILD.bazel
index 93bb5b8ff2c..48281b3fab8 100644
--- a/bazelmod/BUILD.bazel
+++ b/bazelmod/BUILD.bazel
@@ -17,7 +17,6 @@ package(default_visibility = ["//visibility:private"])
 
 exports_files([
     "abseil-lazy-corefoundation.patch",
-    "bashtest-launcher-exec-properties.patch",
     "dev.MODULE.bazel",
     "expat-build.patch",
     "libarchive-xar.patch",
diff --git a/bazelmod/bashtest-launcher-exec-properties.patch b/bazelmod/bashtest-launcher-exec-properties.patch
deleted file mode 100644
index 026686b6f9b..00000000000
--- a/bazelmod/bashtest-launcher-exec-properties.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/bashtest/bashtest.bzl
-+++ b/bashtest/bashtest.bzl
-@@ -110,6 +110,10 @@
-     launcher_kwargs = dict(kwargs)
-     for attribute in ["args", "env_inherit", "size", "timeout", "flaky", "shard_count", "local", "exec_group_compatible_with"]:
-         launcher_kwargs.pop(attribute, None)
-+    # Execution properties belong to the outer test, including its test exec group.
-+    # Generated binary launchers have no test group and must not inherit them.
-+    # outer_kwargs below retains the original properties unchanged.
-+    launcher_kwargs.pop("exec_properties", None)
-     launcher_kwargs["testonly"] = True
-     compatibility = kwargs.get("target_compatible_with", [])
-     launcher_kwargs["target_compatible_with"] = compatibility + select({