Fix more tests

Author: adincebic

test/apple_core_ml_library_package_test.sh

@@ -29,6 +29,7 @@ function tear_down() {
 # Creates common source, targets, and basic plist for macOS loadable bundles.
 function create_common_files() {
   cat > app/BUILD <<EOF
+load("@build_bazel_rules_apple//apple:apple_archive.bzl", "apple_archive")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application")
 load(
     "@build_bazel_rules_apple//apple:resources.bzl",
@@ -74,6 +75,11 @@ ios_application(
     minimum_os_version = "${MIN_OS_IOS}",
     deps = [":app_lib"],
 )
+
+apple_archive(
+    name = "ipa_app",
+    bundle = ":app",
+)
 EOF
 
   cat > app/main.m <<EOF
@@ -120,7 +126,7 @@ EOF
 function test_mlmodel_builds() {
   create_common_files
 
-  do_build ios //app:app || fail "Should build"
+  do_build ios //app:ipa_app || fail "Should build"
 
   assert_zip_contains "test-bin/app/app.ipa" "Payload/app.app/sample.mlmodelc/"
 }

test/apple_core_ml_resource_test.sh

@@ -29,6 +29,7 @@ function tear_down() {
 # Creates common source, targets, and basic plist for iOS applications.
 function create_common_files() {
   cat > app/BUILD <<EOF
+load("@build_bazel_rules_apple//apple:apple_archive.bzl", "apple_archive")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application")
 load(
     "@build_bazel_rules_apple//apple:resources.bzl",
@@ -58,6 +59,11 @@ ios_application(
     minimum_os_version = "${MIN_OS_IOS}",
     deps = [":app_lib"],
 )
+
+apple_archive(
+    name = "ipa_app",
+    bundle = ":app",
+)
 EOF
 
   cat > app/AppDelegate.swift <<EOF
@@ -84,7 +90,7 @@ EOF
 function test_mlmodel_resource_bundle_builds() {
   create_common_files
 
-  do_build ios //app:app || fail "Should build"
+  do_build ios //app:ipa_app || fail "Should build"
 
   assert_zip_contains "test-bin/app/app.ipa" "Payload/app.app/App_Resources.bundle/sample.mlmodelc/"
 }

test/apple_intent_library_test.sh

@@ -30,6 +30,7 @@ function tear_down() {
 # swift_intent_library in an iOS app.
 function create_common_files() {
   cat > app/BUILD <<EOF
+load("@build_bazel_rules_apple//apple:apple_archive.bzl", "apple_archive")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application")
 load("@build_bazel_rules_apple//apple:resources.bzl", "objc_intent_library", "swift_intent_library")
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
@@ -55,6 +56,11 @@ ios_application(
     deps = [":objc_lib"],
 )
 
+apple_archive(
+    name = "ipa_app_objc",
+    bundle = ":app_objc",
+)
+
 swift_intent_library(
     name = "SampleIntentSwift",
     src = "@build_bazel_rules_apple//test/testdata/resources:intent.intentdefinition",
@@ -74,6 +80,11 @@ ios_application(
     minimum_os_version = "${MIN_OS_IOS}",
     deps = [":swift_lib"],
 )
+
+apple_archive(
+    name = "ipa_app_swift",
+    bundle = ":app_swift",
+)
 EOF
 
   cat > app/objc_lib.m <<EOF
@@ -120,10 +131,10 @@ function test_intentdefinition_builds() {
   create_common_files
   pwd
 
-  do_build ios //app:app_objc || fail "Should build"
+  do_build ios //app:ipa_app_objc || fail "Should build"
   assert_zip_contains "test-bin/app/app_objc.ipa" "Payload/app_objc.app/intent.intentdefinition"
 
-  do_build ios //app:app_swift || fail "Should build"
+  do_build ios //app:ipa_app_swift || fail "Should build"
   assert_zip_contains "test-bin/app/app_swift.ipa" "Payload/app_swift.app/intent.intentdefinition"
 }
 

test/apple_metal_library_test.sh

@@ -29,6 +29,7 @@ function tear_down() {
 # Creates common source and targets for apple_metal_library in an iOS app.
 function create_common_files() {
   cat > app/BUILD <<EOF
+load("@build_bazel_rules_apple//apple:apple_archive.bzl", "apple_archive")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application")
 load("@build_bazel_rules_apple//apple:resources.bzl", "apple_metal_library")
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
@@ -56,6 +57,11 @@ ios_application(
     deps = [":objc_lib"],
 )
 
+apple_archive(
+    name = "ipa_app_objc",
+    bundle = ":app_objc",
+)
+
 swift_library(
     name = "swift_lib",
     srcs = ["swift_lib.swift"],
@@ -70,6 +76,11 @@ ios_application(
     minimum_os_version = "${MIN_OS_IOS}",
     deps = [":swift_lib"],
 )
+
+apple_archive(
+    name = "ipa_app_swift",
+    bundle = ":app_swift",
+)
 EOF
 
   cat > app/objc_lib.m <<EOF
@@ -115,10 +126,10 @@ function test_intentdefinition_builds() {
   create_common_files
   pwd
 
-  do_build ios //app:app_objc || fail "Should build"
+  do_build ios //app:ipa_app_objc || fail "Should build"
   assert_zip_contains "test-bin/app/app_objc.ipa" "Payload/app_objc.app/default.metallib"
 
-  do_build ios //app:app_swift || fail "Should build"
+  do_build ios //app:ipa_app_swift || fail "Should build"
   assert_zip_contains "test-bin/app/app_swift.ipa" "Payload/app_swift.app/default.metallib"
 }
 

test/ios_imessage_test.sh

@@ -113,6 +113,11 @@ ios_application(
     deps = [":lib"],
 )
 
+apple_archive(
+    name = "ipa_app",
+    bundle = ":app",
+)
+
 ios_sticker_pack_extension(
     name = "stickerpack",
     bundle_id = "my.bundle.id.extension",
@@ -147,6 +152,11 @@ ios_imessage_application(
     provisioning_profile = "@build_bazel_rules_apple//test/testdata/provisioning:integration_testing_ios.mobileprovision",
 )
 
+apple_archive(
+    name = "ipa_app",
+    bundle = ":app",
+)
+
 ios_sticker_pack_extension(
     name = "stickerpack",
     bundle_id = "my.bundle.id.extension",

test/smart_resource_deduplication_test.sh

@@ -61,6 +61,7 @@ I am referenced by a resource only objc_library;
 EOF
 
   cat > app/BUILD <<EOF
+load("@build_bazel_rules_apple//apple:apple_archive.bzl", "apple_archive")
 load("@build_bazel_rules_apple//apple:ios.bzl",
      "ios_application", "ios_framework")
 load("@rules_cc//cc:objc_library.bzl", "objc_library")
@@ -137,9 +138,14 @@ ios_application(
     strings = ["app.strings"],
     deps = [":app_lib"],
 )
+
+apple_archive(
+    name = "ipa_app",
+    bundle = ":app",
+)
 EOF
 
-  do_build ios //app:app || fail "Should build"
+  do_build ios //app:ipa_app || fail "Should build"
 
   # Verify framework has resources
   assert_assets_contains "test-bin/app/app.ipa" \
@@ -214,9 +220,14 @@ ios_application(
     strings = ["app.strings"],
     deps = [":app_lib_with_no_direct_resources"],
 )
+
+apple_archive(
+    name = "ipa_app",
+    bundle = ":app",
+)
 EOF
 
-  do_build ios //app:app || fail "Should build"
+  do_build ios //app:ipa_app || fail "Should build"
 
   # This is a tricky corner case, in which a resource only lib is depended by
   # dependency chains that contain no other resources. In this very specific
@@ -252,9 +263,14 @@ ios_application(
     minimum_os_version = "${MIN_OS_IOS}",
     deps = [":resource_only_lib", ":shared_lib", ":only_main_lib"],
 )
+
+apple_archive(
+    name = "ipa_app",
+    bundle = ":app",
+)
 EOF
 
-  do_build ios //app:app || fail "Should build"
+  do_build ios //app:ipa_app || fail "Should build"
 
   # Verify that the resource is in the framework.
   assert_zip_contains "test-bin/app/app.ipa" \

test/starlark_tests/targets_under_test/ios/BUILD

@@ -5790,6 +5790,10 @@ apple_archive(
     name = "ipa_with_app",
     bundle = ":app",
     tags = common.fixture_tags,
+    visibility = [
+        "//test/starlark_tests:__subpackages__",
+        "//tools/dossier_codesigningtool:__pkg__",
+    ],
 )
 
 apple_archive(

tools/dossier_codesigningtool/BUILD

@@ -65,7 +65,7 @@ py_test(
     srcs = ["dossier_codesigning_reader_test.py"],
     data = [
         ":watchos_dossier_zip",
-        "//test/starlark_tests/targets_under_test/ios:app",
+        "//test/starlark_tests/targets_under_test/ios:ipa_with_app",
         "//test/starlark_tests/targets_under_test/watchos:ipa_app_companion",
     ],
     python_version = "PY3",