Add --test_env for build

This way we don't thrash the analysis cache when changing from build to
test

Author: keith

.bazelrc

@@ -6,7 +6,7 @@ common --incompatible_allow_tags_propagation
 
 # Add the PATH to the test environment so that common macOS tools can be found
 # during a test run.
-test --test_env=PATH
+build --test_env=PATH
 
 # `bazel test` tries to build everything also by default, so skip that so the
 # *_library targets in examples/... aren't built (and fail since they are

apple/internal/apple_xcframework_import.bzl

@@ -183,20 +183,23 @@ def _get_xcframework_library_from_paths(*, target_triplet, xcframework):
     if not library_identifier:
         return None
 
+    def _matches_library(file):
+        return library_identifier in file.short_path.split("/")
+
     files = xcframework.files_by_category
-    binaries = [f for f in files.binary_imports if library_identifier in f.short_path]
-    framework_imports = [f for f in files.bundling_imports if library_identifier in f.short_path]
-    headers = [f for f in files.header_imports if library_identifier in f.short_path]
-    module_maps = [f for f in files.module_map_imports if library_identifier in f.short_path]
+    binaries = [f for f in files.binary_imports if _matches_library(f)]
+    framework_imports = [f for f in files.bundling_imports if _matches_library(f)]
+    headers = [f for f in files.header_imports if _matches_library(f)]
+    module_maps = [f for f in files.module_map_imports if _matches_library(f)]
     swiftmodules = [
         f
         for f in files.swift_module_imports
-        if library_identifier in f.short_path and
+        if _matches_library(f) and
            f.basename.startswith(target_triplet.architecture)
     ]
 
     framework_dirs = [f.dirname for f in binaries]
-    framework_files = [f for f in xcframework.files if library_identifier in f.short_path]
+    framework_files = [f for f in xcframework.files if _matches_library(f)]
 
     includes = []
     framework_includes = []