From 07a15465bb45d99833e1e7381a8b4835378f939f Mon Sep 17 00:00:00 2001
From: Brentley Jones <github@brentleyjones.com>
Date: Wed, 18 Oct 2023 10:54:23 -0500
Subject: [PATCH] Allow Bzlmod with shell tests (#2304)

Signed-off-by: Brentley Jones <github@brentleyjones.com>
---
 test/apple_shell_testutils.sh |  2 --
 test/bazel_testrunner.sh      | 37 ++++++++++++++++++++++++++++++++---
 test/ios_coverage_test.sh     |  9 ++++++++-
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/test/apple_shell_testutils.sh b/test/apple_shell_testutils.sh
index 104ab58637..9c8ef71697 100755
--- a/test/apple_shell_testutils.sh
+++ b/test/apple_shell_testutils.sh
@@ -464,8 +464,6 @@ function do_action() {
 
   local -a bazel_options=(
       "--announce_rc"
-      # TODO: Remove once our tests work with Bzlmod
-      "--noenable_bzlmod"
       "--symlink_prefix=test-"
       "--verbose_failures"
       # Used so that if there's a single configuration transition, its output
diff --git a/test/bazel_testrunner.sh b/test/bazel_testrunner.sh
index 13150fbe0f..9841d1d797 100755
--- a/test/bazel_testrunner.sh
+++ b/test/bazel_testrunner.sh
@@ -75,6 +75,37 @@ function create_new_workspace() {
   # copy and we should reference it from the original location.
   cp -rf "$EXTERNAL_DIR" ../external
 
+  apple_support_path=$(resolve_external_repository build_bazel_apple_support)
+  rules_apple_path=$(resolve_external_repository build_bazel_rules_apple)
+  rules_swift_path=$(resolve_external_repository build_bazel_rules_swift)
+
+  touch MODULE.bazel
+  cat > MODULE.bazel <<EOF
+module(name = "build_bazel_rules_apple_integration_tests", version = "0")
+
+bazel_dep(name = "apple_support", version = "0", repo_name = "build_bazel_apple_support")
+bazel_dep(name = "rules_swift", version = "0", repo_name = "build_bazel_rules_swift")
+bazel_dep(name = "rules_apple", version = "0", repo_name = "build_bazel_rules_apple")
+
+xcode_configure = use_extension("@bazel_tools//tools/osx:xcode_configure.bzl", "xcode_configure_extension")
+use_repo(xcode_configure, "local_config_xcode")
+
+local_path_override(
+    module_name = "apple_support",
+    path = "$apple_support_path",
+)
+local_path_override(
+    module_name = "rules_swift",
+    path = "$rules_swift_path",
+)
+local_path_override(
+    module_name = "rules_apple",
+    path = "$rules_apple_path",
+)
+EOF
+
+  touch WORKSPACE.bzlmod
+
   touch WORKSPACE
   cat > WORKSPACE <<EOF
 workspace(name = 'build_bazel_rules_apple_integration_tests')
@@ -91,17 +122,17 @@ new_local_repository(
 
 local_repository(
     name = 'build_bazel_rules_apple',
-    path = '$(resolve_external_repository build_bazel_rules_apple)',
+    path = '$rules_apple_path',
 )
 
 local_repository(
     name = 'build_bazel_rules_swift',
-    path = '$(resolve_external_repository build_bazel_rules_swift)',
+    path = '$rules_swift_path',
 )
 
 local_repository(
     name = 'build_bazel_apple_support',
-    path = '$(resolve_external_repository build_bazel_apple_support)',
+    path = '$apple_support_path',
 )
 
 local_repository(
diff --git a/test/ios_coverage_test.sh b/test/ios_coverage_test.sh
index b3c547f2e9..dc4327a70a 100755
--- a/test/ios_coverage_test.sh
+++ b/test/ios_coverage_test.sh
@@ -290,9 +290,16 @@ function test_hosted_unit_test_coverage() {
   # Validate coverage for the hosting binary is included
   assert_contains "FN:3,foo" "test-testlogs/app/hosted_test/coverage.dat"
 
+  if [ -d "test-bin/app/hosted_test.runfiles/_main" ]; then
+    # Bzlmod always uses '_main' for current repository
+    path="test-bin/app/hosted_test.runfiles/_main/app/hosted_test.zip"
+  else
+    path="test-bin/app/hosted_test.runfiles/build_bazel_rules_apple_integration_tests/app/hosted_test.zip"
+  fi
+
   # Validate that the symbol called from the hosted binary exists and is undefined
   unzip_single_file \
-    "test-bin/app/hosted_test.runfiles/build_bazel_rules_apple_integration_tests/app/hosted_test.zip" \
+    "$path" \
     "hosted_test.xctest/hosted_test" \
     nm -u - | grep foo || fail "Undefined 'foo' symbol not found"
 }