diff --git a/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn b/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn index 22a76a826f6..4dc4c278ebc 100644 --- a/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn +++ b/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn @@ -21,8 +21,9 @@ write_lit_config("lit_site_cfg") { output = clangd_lit_site_cfg_file extra_values = [ - "CMAKE_CURRENT_BINARY_DIR=" + rebase_path( - get_label_info("//clang-tools-extra/clangd/test", "target_out_dir")), + "CMAKE_CURRENT_BINARY_DIR=" + + rebase_path(get_label_info("//clang-tools-extra/clangd/test", + "target_out_dir")), "CMAKE_CURRENT_SOURCE_DIR=" + rebase_path("//clang-tools-extra/clangd/test"), @@ -91,6 +92,10 @@ action("check-clangd") { } args = [ "-sv", + + # clangd doesn't put unittest configs in test/unit like every other project. + # Because of that, this needs to pass two folders here, while every other + # project only needs to pass CMAKE_CURRENT_BINARY_DIR. rebase_path(get_path_info(clangd_lit_site_cfg_file, "dir"), root_out_dir), rebase_path(get_path_info(clangd_lit_unit_site_cfg_file, "dir"), root_out_dir), diff --git a/utils/gn/secondary/clang-tools-extra/test/BUILD.gn b/utils/gn/secondary/clang-tools-extra/test/BUILD.gn index 6646ef11275..97715cf8d9c 100644 --- a/utils/gn/secondary/clang-tools-extra/test/BUILD.gn +++ b/utils/gn/secondary/clang-tools-extra/test/BUILD.gn @@ -90,12 +90,6 @@ action("check-clang-tools") { } args = [ "-sv", - "--param", - "clang_site_config=" + - rebase_path(clang_tools_extra_lit_site_cfg_file, root_out_dir), - "--param", - "clang_unit_site_config=" + - rebase_path(clang_tools_extra_lit_unit_site_cfg_file, root_out_dir), rebase_path(".", root_out_dir), ] outputs = [ "$target_gen_dir/run-lit" ] # Non-existing, so that ninja runs it diff --git a/utils/gn/secondary/clang/test/BUILD.gn b/utils/gn/secondary/clang/test/BUILD.gn index 84ac2e893cd..f215c35d6ae 100644 --- a/utils/gn/secondary/clang/test/BUILD.gn +++ b/utils/gn/secondary/clang/test/BUILD.gn @@ -189,11 +189,6 @@ action("check-clang") { } args = [ "-sv", - "--param", - "clang_site_config=" + rebase_path(clang_lit_site_cfg_file, root_out_dir), - "--param", - "clang_unit_site_config=" + - rebase_path(clang_lit_unit_site_cfg_file, root_out_dir), rebase_path(".", root_out_dir), ] outputs = [ "$target_gen_dir/run-lit" ] # Non-existing, so that ninja runs it diff --git a/utils/gn/secondary/lld/test/BUILD.gn b/utils/gn/secondary/lld/test/BUILD.gn index 5408ea8b6b2..b0ccb7ea003 100644 --- a/utils/gn/secondary/lld/test/BUILD.gn +++ b/utils/gn/secondary/lld/test/BUILD.gn @@ -110,11 +110,6 @@ action("check-lld") { } args = [ "-sv", - "--param", - "lld_site_config=" + rebase_path(lld_lit_site_cfg_file, root_out_dir), - "--param", - "lld_unit_site_config=" + - rebase_path(lld_lit_unit_site_cfg_file, root_out_dir), rebase_path(".", root_out_dir), ] outputs = [ "$target_gen_dir/run-lit" ] # Non-existing, so that ninja runs it diff --git a/utils/gn/secondary/llvm/test/BUILD.gn b/utils/gn/secondary/llvm/test/BUILD.gn index c7740ac4cc9..427b2c06788 100644 --- a/utils/gn/secondary/llvm/test/BUILD.gn +++ b/utils/gn/secondary/llvm/test/BUILD.gn @@ -289,11 +289,6 @@ action("check-llvm") { } args = [ "-sv", - "--param", - "llvm_site_config=" + rebase_path(llvm_lit_site_cfg_file, root_out_dir), - "--param", - "llvm_unit_site_config=" + - rebase_path(llvm_lit_unit_site_cfg_file, root_out_dir), rebase_path(".", root_out_dir), ] outputs = [ "$target_gen_dir/run-lit" ] # Non-existing, so that ninja runs it