Remove some Starlark test script environment variables that we no longer have a need for.

These date back to Xcode 14's use of DER entitlements. We only support Xcode 16+ now, so these can go away.

Cherry-pick:
  - 7af7f02
  - cf78e20
  - 043d9cd

Author: nglevin

apple/internal/testing/apple_test_bundle_support.bzl

@@ -103,6 +103,8 @@ _TEST_BUNDLE_NAME_SUFFIX = ".__internal__.__test_bundle"
 # between the test bundle and test host, to avoid debugging issues and redundant build activity.
 _LOWEST_MINIMUM_OS_VERSION_FOR_TEST_MISMATCH_WARNING = "17.4"
 
+_ERROR_ON_IOS_TEST_BUNDLE_MISMATCH_PACKAGE_PREFIXES = []
+
 def _collect_files(rule_attr, attr_names):
     """Collects files from given attr_names (when present) into a depset."""
     transitive_files = []
@@ -313,11 +315,16 @@ Please assign "{rule_attribute_name}" a value of {test_host_rule_attribute} on t
             test_host_label_name = test_host.label.name,
         )
 
+        test_label_package_name = label.package
+
         # TODO(b/337080510): Apply this failure case to all Apple platforms.
         if platform_prerequisites.platform_type != "ios" or (
             apple_common.dotted_version(test_min_os) > apple_common.dotted_version(
                 _LOWEST_MINIMUM_OS_VERSION_FOR_TEST_MISMATCH_WARNING,
-            )
+            ) or any([
+                test_label_package_name.startswith(package_prefix)
+                for package_prefix in _ERROR_ON_IOS_TEST_BUNDLE_MISMATCH_PACKAGE_PREFIXES
+            ])
         ):
             fail("\nERROR: " + test_attribute_min_os_mismatch_message)
 

test/starlark_tests/common.bzl

@@ -18,6 +18,7 @@
 # their actions executed) when running `bazel test` to do analysis testing.
 _fixture_tags = [
     "manual",
+    "nobuilder",
     "notap",
 ]
 
@@ -46,6 +47,7 @@ _min_os_ios = struct(
 _min_os_macos = struct(
     app_intents_support = "13.0",
     arm64_support = "11.0",
+    concurrency_sleep_support = "10.15",
     baseline = "10.13",
     icon_bundle_required = "26.0",
     requires_concurrency_stdlib = "10.14",

test/starlark_tests/rules/apple_verification_test.bzl

@@ -225,16 +225,9 @@ def _apple_verification_test_impl(ctx):
         is_executable = True,
     )
 
-    # Apply knowledge of the Xcode version to the test environnment
-    xcode_config = ctx.attr._xcode_config[apple_common.XcodeVersionConfig]
-    xcode_version_split = str(xcode_config.xcode_version()).split(".")
-    xcode_versions_separated = len(xcode_version_split)
-
     # Extra test environment to set during the test.
     test_env = {
         "BUILD_TYPE": ctx.attr.build_type,
-        "XCODE_VERSION_MAJOR": xcode_version_split[0] if xcode_versions_separated >= 1 else 0,
-        "XCODE_VERSION_MINOR": xcode_version_split[1] if xcode_versions_separated >= 2 else 0,
     }
 
     # Create APPLE_TEST_ENV_# environmental variables for each `env` attribute that are transformed
@@ -245,6 +238,8 @@ def _apple_verification_test_impl(ctx):
         for num, value in enumerate(ctx.attr.env[key]):
             test_env["APPLE_TEST_ENV_{}_{}".format(key, num)] = value
 
+    xcode_config = ctx.attr._xcode_config[apple_common.XcodeVersionConfig]
+
     return [
         testing.ExecutionInfo(xcode_config.execution_info()),
         testing.TestEnvironment(dicts.add(

test/starlark_tests/verifier_scripts/app_clip_entitlements_verifier.sh

@@ -30,14 +30,12 @@ if [[ "$BUILD_TYPE" == "simulator" ]]; then
 
   assert_contains "<key>$TEST_APP_CLIP_ENTITLEMENT_KEY</key>" "$TEMP_OUTPUT"
 
-  if [[ "$XCODE_VERSION_MAJOR" -ge "14" ]]; then
-    # Then check the new DER encoded section.
-    xcrun llvm-objdump --macho --section=__TEXT,__ents_der "$BINARY" | \
-        sed -e 's/^[0-9a-f][0-9a-f]*[[:space:]][[:space:]]*//' \
-        -e 'tx' -e 'd' -e ':x' | xxd -r -p > "$TEMP_DER_OUTPUT"
+  # Then check the DER encoded section.
+  xcrun llvm-objdump --macho --section=__TEXT,__ents_der "$BINARY" | \
+      sed -e 's/^[0-9a-f][0-9a-f]*[[:space:]][[:space:]]*//' \
+      -e 'tx' -e 'd' -e ':x' | xxd -r -p > "$TEMP_DER_OUTPUT"
 
-    assert_contains "$TEST_APP_CLIP_ENTITLEMENT_KEY" "$TEMP_DER_OUTPUT"
-  fi
+  assert_contains "$TEST_APP_CLIP_ENTITLEMENT_KEY" "$TEMP_DER_OUTPUT"
 
 elif [[ "$BUILD_TYPE" == "device" ]]; then
   # First check the legacy xml plist section.
@@ -46,7 +44,7 @@ elif [[ "$BUILD_TYPE" == "device" ]]; then
 
   assert_contains "<key>$TEST_APP_CLIP_ENTITLEMENT_KEY</key>" "$TEMP_OUTPUT"
 
-  # Then check the new DER encoded section.
+  # Then check the DER encoded section.
   codesign --display --der --entitlements "$TEMP_DER_OUTPUT" "$BUNDLE_ROOT"
 
   assert_contains "$TEST_APP_CLIP_ENTITLEMENT_KEY" "$TEMP_DER_OUTPUT"

test/starlark_tests/verifier_scripts/entitlements_verifier.sh

@@ -33,14 +33,12 @@ if [[ "$BUILD_TYPE" == "simulator" ]]; then
 
   assert_contains "<key>$TEST_ENTITLEMENT_KEY</key>" "$TEMP_OUTPUT"
 
-  if [[ "$XCODE_VERSION_MAJOR" -ge "14" ]]; then
-    # Then check the new DER encoded section.
-    xcrun llvm-objdump --macho --section=__TEXT,__ents_der "$BINARY" | \
-        sed -e 's/^[0-9a-f][0-9a-f]*[[:space:]][[:space:]]*//' \
-        -e 'tx' -e 'd' -e ':x' | xxd -r -p > "$TEMP_DER_OUTPUT"
-
-    assert_contains "$TEST_ENTITLEMENT_KEY" "$TEMP_DER_OUTPUT"
-  fi
+  # Then check the new DER encoded section.
+  xcrun llvm-objdump --macho --section=__TEXT,__ents_der "$BINARY" | \
+      sed -e 's/^[0-9a-f][0-9a-f]*[[:space:]][[:space:]]*//' \
+      -e 'tx' -e 'd' -e ':x' | xxd -r -p > "$TEMP_DER_OUTPUT"
+
+  assert_contains "$TEST_ENTITLEMENT_KEY" "$TEMP_DER_OUTPUT"
 
 elif [[ "$BUILD_TYPE" == "device" ]]; then
   # First check the legacy xml plist section.