Add support for additional buck parameters for nested bxl run.

Summary:
This diff adds ability to provide additional custom buck arguments to BXL buck run when checking dependencies. This is useful to have a better control over environment in which dependencies are calculated.

By default we already try to guess/inherit the flags from "parent" buck process. But as described in D71528333, sometimes results for `buck cquery` and running `check_dependencies_test` differ due to complicated setup of native targets.

Reviewed By: IanChilds

Differential Revision: D71528332

fbshipit-source-id: ea621bcb53e0fba9b5e1f179b525fbef7e5a0d7f

Author: Ievgenii Nazaruk

tests/check_dependencies_test.bzl

@@ -6,6 +6,8 @@
 # of this source tree.
 
 load("@fbcode//buck2/tests:buck_e2e.bzl", "buck2_e2e_test")
+load("@fbcode_macros//build_defs:native_rules.bzl", "buck_genrule")
+load("@fbsource//tools/build_defs/windows:powershell.bzl", "powershell_cmd_exe")
 
 # This is meant to be Open-source friendly. In our e2e tests, we invoke a variant from
 # tools/build_defs/check_dependencies_test.bzl that passes additional arguments for meta specific allowlist.
@@ -49,6 +51,7 @@ def check_dependencies_test(
         expect_failure_msg = None,
         env = None,
         deps = None,
+        extra_buck_args = [],
         **kwargs):
     """
     Creates a test target from a buck2 bxl script. BXL script must use "test" as entry
@@ -97,6 +100,17 @@ def check_dependencies_test(
     if mode not in ("allowlist", "blocklist"):
         fail("mode must be one of: allowlist, blocklist")
 
+    extra_buck_args_target = "%s_extra_buck_args" % (name)
+    buck_args_str = " ".join(extra_buck_args)
+    buck_genrule(
+        name = extra_buck_args_target,
+        out = "extra_buck_args",
+        bash = "echo %s > $OUT" % (buck_args_str),
+        cmd_exe = powershell_cmd_exe([
+            "Set-Content $OUT '%s'" % (buck_args_str),
+        ]),
+    )
+
     _check_dependencies_test(
         contacts = contacts,
         name = name,
@@ -106,6 +120,7 @@ def check_dependencies_test(
             "BLOCKLIST": blocklist_patterns,
             "BXL_MAIN": bxl_main,
             "EXPECT_FAILURE_MSG": expect_failure_msg or "",
+            "EXTRA_BUCK_ARGS_FILE": "@$(location :%s)" % (extra_buck_args_target),
             "FLAVOR": "check_dependencies_test",
             "TARGET": target,
             "VERIFICATION_MODE": mode,

tests/e2e_util/test_bxl_check_dependencies_template.py

@@ -41,9 +41,15 @@ async def test_check_dependencies_bxl(buck) -> None:
         else:
             mode_argfile = get_mode_from_platform()
 
+        additional_argfile = os.environ.get("EXTRA_BUCK_ARGS_FILE", None)
+        additional_args = []
+        if additional_argfile:
+            additional_args.append(additional_argfile)
+
         bxl_call = buck.bxl(
             os.environ["BXL_MAIN"],
             mode_argfile,
+            *additional_args,
             "--",
             "--target",
             os.environ["TARGET"],