fix analysis tests

Author: rickeylev

tests/cc/current_py_cc_headers/current_py_cc_headers_tests.bzl

@@ -22,25 +22,7 @@ load("//tests/support:support.bzl", "CC_TOOLCHAIN")
 
 _tests = []
 
-def _test_current_toolchain_headers(name):
-    analysis_test(
-        name = name,
-        impl = _test_current_toolchain_headers_impl,
-        target = "//python/cc:current_py_cc_headers",
-        config_settings = {
-            "//command_line_option:extra_toolchains": [CC_TOOLCHAIN],
-        },
-        attrs = {
-            "header_files": attr.label_list(
-                default = [
-                    "//tests/support/cc_toolchains:py_header_files",
-                ],
-                allow_files = True,
-            ),
-        },
-    )
-
-def _test_current_toolchain_headers_impl(env, target):
+def _verify_headers_target(env, target):
     # Check that the forwarded CcInfo looks vaguely correct.
     compilation_context = env.expect.that_target(target).provider(
         CcInfo,
@@ -70,6 +52,27 @@ def _test_current_toolchain_headers_impl(env, target):
         matching.str_matches("*/cc_toolchains/data.txt"),
     )
 
+def _test_current_toolchain_headers(name):
+    analysis_test(
+        name = name,
+        impl = _test_current_toolchain_headers_impl,
+        target = "//python/cc:current_py_cc_headers",
+        config_settings = {
+            "//command_line_option:extra_toolchains": [CC_TOOLCHAIN],
+        },
+        attrs = {
+            "header_files": attr.label_list(
+                default = [
+                    "//tests/support/cc_toolchains:py_headers_files",
+                ],
+                allow_files = True,
+            ),
+        },
+    )
+
+def _test_current_toolchain_headers_impl(env, target):
+    _verify_headers_target(env, target)
+
 _tests.append(_test_current_toolchain_headers)
 
 def _test_toolchain_is_registered_by_default(name):
@@ -87,19 +90,24 @@ _tests.append(_test_toolchain_is_registered_by_default)
 def _test_current_toolchain_headers_abi3(name):
     analysis_test(
         name = name,
-        impl = _test_current_toolchain_headers_impl,
+        impl = _test_current_toolchain_headers_abi3_impl,
         target = "//python/cc:current_py_cc_headers_abi3",
         config_settings = {
             "//command_line_option:extra_toolchains": [CC_TOOLCHAIN],
         },
         attrs = {
-            "header": attr.label(
-                default = "//tests/support/cc_toolchains:fake_header.h",
-                allow_single_file = True,
+            "header_files": attr.label_list(
+                default = [
+                    "//tests/support/cc_toolchains:py_headers_abi3_files",
+                ],
+                allow_files = True,
             ),
         },
     )
 
+def _test_current_toolchain_headers_abi3_impl(env, target):
+    _verify_headers_target(env, target)
+
 _tests.append(_test_current_toolchain_headers_abi3)
 
 def current_py_cc_headers_test_suite(name):

tests/cc/py_cc_toolchain/py_cc_toolchain_tests.bzl

@@ -28,8 +28,12 @@ def _test_py_cc_toolchain(name):
         impl = _test_py_cc_toolchain_impl,
         target = "//tests/support/cc_toolchains:fake_py_cc_toolchain_impl",
         attrs = {
+            "header_abi3_files": attr.label_list(
+                default = ["//tests/support/cc_toolchains:py_headers_abi3_files"],
+                allow_files = True,
+            ),
             "header_files": attr.label_list(
-                default = ["//tests/support/cc_toolchains:py_header_files"],
+                default = ["//tests/support/cc_toolchains:py_headers_files"],
                 allow_files = True,
             ),
         },
@@ -76,17 +80,17 @@ def _test_py_cc_toolchain_impl(env, target):
     cc_info = headers_abi3_providers.get("CcInfo", factory = cc_info_subject)
 
     compilation_context = cc_info.compilation_context()
-    compilation_context.direct_headers().contains_exactly([
-        env.ctx.file.header,
-    ])
-    compilation_context.direct_public_headers().contains_exactly([
-        env.ctx.file.header,
-    ])
+    compilation_context.direct_headers().contains_exactly(
+        env.ctx.files.header_abi3_files,
+    )
+    compilation_context.direct_public_headers().contains_exactly(
+        env.ctx.files.header_abi3_files,
+    )
 
     # NOTE: The include dir gets added twice, once for the source path,
     # and once for the config-specific path, but we don't care about that.
     compilation_context.system_includes().contains_at_least_predicates([
-        matching.str_matches("*/fake_include"),
+        matching.str_matches("*/py_include"),
     ])
 
     default_info = headers_abi3_providers.get("DefaultInfo", factory = subjects.default_info)

tests/support/cc_toolchains/BUILD.bazel

@@ -23,9 +23,18 @@ package(default_visibility = ["//:__subpackages__"])
 
 # Factored out for testing
 filegroup(
-    name = "py_header_files",
+    name = "py_headers_files",
     srcs = [
         "py_header.h",
+        ":py_headers_abi3_files",
+    ],
+)
+
+# Factored out for testing
+filegroup(
+    name = "py_headers_abi3_files",
+    srcs = [
+        "py_abi3_header.h",
         "py_include/py_include.h",
     ],
 )
@@ -46,20 +55,27 @@ toolchain(
 py_cc_toolchain(
     name = "fake_py_cc_toolchain_impl",
     headers = ":py_headers",
-    headers_abi3 = ":py_headers",
+    headers_abi3 = ":py_headers_abi3",
     libs = ":fake_libs",
     python_version = "3.999",
     tags = PREVENT_IMPLICIT_BUILDING_TAGS,
 )
 
 cc_library(
-    name = "py_headers",
-    hdrs = [":py_header_files"],
+    name = "py_headers_abi3",
+    hdrs = [":py_headers_abi3_files"],
     data = ["data.txt"],
     includes = ["py_include"],
     tags = PREVENT_IMPLICIT_BUILDING_TAGS,
 )
 
+cc_library(
+    name = "py_headers",
+    hdrs = [":py_headers_files"],
+    tags = PREVENT_IMPLICIT_BUILDING_TAGS,
+    deps = [":py_headers_abi3"],
+)
+
 cc_library(
     name = "fake_libs",
     srcs = ["libpython3.so"],