From e7742fbc215e615d3609f6b09d80cd994aaede90 Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Thu, 2 May 2019 20:34:54 +0000 Subject: [PATCH] [gn] Update the clangd test lit site configuration This reflects changes made in r359763. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@359825 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../clang-tools-extra/clangd/test/BUILD.gn | 13 ++++++------- .../clangd/test/clangd_lit_site_cfg_files.gni | 4 ++++ utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn | 7 +++++++ 3 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 utils/gn/secondary/clang-tools-extra/clangd/test/clangd_lit_site_cfg_files.gni 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 4303477706e..56acafe03f5 100644 --- a/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn +++ b/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn @@ -1,10 +1,7 @@ import("//clang-tools-extra/clangd/xpc/enable.gni") import("//llvm/triples.gni") import("//llvm/utils/gn/build/write_cmake_config.gni") - -clangd_lit_site_cfg_file = "$root_gen_dir/clang-tools-extra/clangd/test/lit.cfg" -clangd_lit_unit_site_cfg_file = - "$root_gen_dir/clang-tools-extra/clangd/unittests/lit.cfg" +import("clangd_lit_site_cfg_files.gni") template("write_lit_config") { write_cmake_config(target_name) { @@ -20,7 +17,7 @@ template("write_lit_config") { write_lit_config("lit_site_cfg") { # Fully-qualified instead of relative for LIT_SITE_CFG_IN_HEADER. - input = "//clang-tools-extra/clangd/test/lit.cfg.in" + input = "//clang-tools-extra/clangd/test/lit.site.cfg.py.in" output = clangd_lit_site_cfg_file extra_values = [ @@ -46,12 +43,14 @@ write_lit_config("lit_site_cfg") { write_lit_config("lit_unit_site_cfg") { # Fully-qualified instead of relative for LIT_SITE_CFG_IN_HEADER. - input = "//clang-tools-extra/clangd/unittests/lit.cfg.in" + input = "//clang-tools-extra/clangd/unittests/lit.site.cfg.py.in" output = clangd_lit_unit_site_cfg_file extra_values = [ "CMAKE_CURRENT_BINARY_DIR=" + rebase_path(get_label_info("//clang-tools-extra/clangd/unittests", - "target_out_dir")) ] + "target_out_dir")), + "CMAKE_CURRENT_SOURCE_DIR=" + + rebase_path("//clang-tools-extra/clangd/unittest")] if (host_os == "win") { # See comment for Windows solink in llvm/utils/gn/build/toolchain/BUILD.gn extra_values += [ "SHLIBDIR=" + rebase_path("$root_out_dir/bin") ] diff --git a/utils/gn/secondary/clang-tools-extra/clangd/test/clangd_lit_site_cfg_files.gni b/utils/gn/secondary/clang-tools-extra/clangd/test/clangd_lit_site_cfg_files.gni new file mode 100644 index 00000000000..842b475f7be --- /dev/null +++ b/utils/gn/secondary/clang-tools-extra/clangd/test/clangd_lit_site_cfg_files.gni @@ -0,0 +1,4 @@ +clangd_lit_site_cfg_file = + "$root_gen_dir/clang-tools-extra/clangd/test/lit.site.cfg.py" +clangd_lit_unit_site_cfg_file = + "$root_gen_dir/clang-tools-extra/clangd/unittests/lit.site.cfg.py" diff --git a/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn b/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn index 53500508d3d..d1a2d97e9bc 100644 --- a/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn +++ b/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn @@ -1,4 +1,5 @@ import("//clang-tools-extra/test/clang_tools_extra_lit_site_cfg_files.gni") +import("//clang-tools-extra/clangd/test/clangd_lit_site_cfg_files.gni") import("//clang/test/clang_lit_site_cfg_files.gni") import("//lld/test/lld_lit_site_cfg_files.gni") import("//llvm/test/llvm_lit_site_cfg_files.gni") @@ -42,6 +43,12 @@ write_cmake_config("llvm-lit") { config_map += "map_config('" + rebase_path("//clang-tools-extra/test/Unit/lit.cfg.py") + "', '" + rebase_path(clang_tools_extra_lit_unit_site_cfg_file) + "')\n" + config_map += + "map_config('" + rebase_path("//clang-tools-extra/clangd/test/lit.cfg.py") + + "', '" + rebase_path(clangd_lit_site_cfg_file) + "')\n" + config_map += + "map_config('" + rebase_path("//clang-tools-extra/clang/unittests/lit.cfg.py") + + "', '" + rebase_path(clangd_lit_unit_site_cfg_file) + "')\n" config_map += "map_config('" + rebase_path("//clang/test/lit.cfg.py") + "', '" + rebase_path(clang_lit_site_cfg_file) + "')\n" config_map += "map_config('" + rebase_path("//clang/test/Unit/lit.cfg.py") + -- 2.40.0