[llvm] r359527 - [clangd] Fix GN build

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Mon Apr 29 18:35:42 2019
New Revision: 359527

URL: http://llvm.org/viewvc/llvm-project?rev=359527&view=rev
Log:
[clangd] Fix GN build

Added:
    llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/unittests/
    llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/unittests/BUILD.gn
    llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/
    llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn
Removed:
    llvm/trunk/utils/gn/secondary/clang-tools-extra/unittests/clangd/
Modified:
    llvm/trunk/utils/gn/secondary/clang-tools-extra/test/BUILD.gn
    llvm/trunk/utils/gn/secondary/clang-tools-extra/unittests/BUILD.gn

Added: llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/unittests/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/unittests/BUILD.gn?rev=359527&view=auto
==============================================================================
--- llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/unittests/BUILD.gn (added)
+++ llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/unittests/BUILD.gn Mon Apr 29 18:35:42 2019
@@ -0,0 +1,74 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("ClangdTests") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang-tools-extra/clang-tidy",
+    "//clang-tools-extra/clangd",
+    "//clang-tools-extra/clangd:features",
+    "//clang-tools-extra/clangd/refactor/tweaks",
+    "//clang/lib/AST",
+    "//clang/lib/Basic",
+    "//clang/lib/Format",
+    "//clang/lib/Frontend",
+    "//clang/lib/Index",
+    "//clang/lib/Lex",
+    "//clang/lib/Sema",
+    "//clang/lib/Serialization",
+    "//clang/lib/Tooling",
+    "//clang/lib/Tooling/Core",
+    "//clang/lib/Tooling/Inclusions",
+    "//llvm/lib/Support",
+    "//llvm/lib/Testing/Support",
+  ]
+  include_dirs = [
+    "//clang-tools-extra/clangd",
+
+    # To pick up the generated inc files.
+    "$target_gen_dir/../../clangd/tool",
+  ]
+  sources = [
+    "Annotations.cpp",
+    "BackgroundIndexTests.cpp",
+    "CancellationTests.cpp",
+    "ClangdTests.cpp",
+    "ClangdUnitTests.cpp",
+    "CodeCompleteTests.cpp",
+    "CodeCompletionStringsTests.cpp",
+    "ContextTests.cpp",
+    "DexTests.cpp",
+    "DiagnosticsTests.cpp",
+    "DraftStoreTests.cpp",
+    "ExpectedTypeTest.cpp",
+    "FSTests.cpp",
+    "FileDistanceTests.cpp",
+    "FileIndexTests.cpp",
+    "FindSymbolsTests.cpp",
+    "FunctionTests.cpp",
+    "FuzzyMatchTests.cpp",
+    "GlobalCompilationDatabaseTests.cpp",
+    "HeadersTests.cpp",
+    "IndexActionTests.cpp",
+    "IndexTests.cpp",
+    "JSONTransportTests.cpp",
+    "PrintASTTests.cpp",
+    "QualityTests.cpp",
+    "RIFFTests.cpp",
+    "SelectionTests.cpp",
+    "SerializationTests.cpp",
+    "SourceCodeTests.cpp",
+    "SymbolCollectorTests.cpp",
+    "SymbolInfoTests.cpp",
+    "SyncAPI.cpp",
+    "TUSchedulerTests.cpp",
+    "TestFS.cpp",
+    "TestIndex.cpp",
+    "TestTU.cpp",
+    "ThreadingTests.cpp",
+    "TraceTests.cpp",
+    "TweakTests.cpp",
+    "TypeHierarchyTests.cpp",
+    "URITests.cpp",
+    "XRefsTests.cpp",
+  ]
+}

Added: llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn?rev=359527&view=auto
==============================================================================
--- llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn (added)
+++ llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn Mon Apr 29 18:35:42 2019
@@ -0,0 +1,15 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("ClangdXpcTests") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang-tools-extra/clangd",
+    "//clang-tools-extra/clangd/xpc:conversions",
+    "//llvm/lib/Support",
+    "//llvm/lib/Testing/Support",
+  ]
+  include_dirs = [ "//clang-tools-extra/clangd" ]
+  sources = [
+    "ConversionTests.cpp",
+  ]
+}

Modified: llvm/trunk/utils/gn/secondary/clang-tools-extra/test/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/clang-tools-extra/test/BUILD.gn?rev=359527&r1=359526&r2=359527&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/clang-tools-extra/test/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/clang-tools-extra/test/BUILD.gn Mon Apr 29 18:35:42 2019
@@ -38,12 +38,6 @@ write_lit_config("lit_site_cfg") {
     "PYTHON_EXECUTABLE=$python_path",
   ]
 
-  if (clangd_build_xpc) {
-    extra_values += [ "CLANGD_BUILD_XPC=1" ]
-  } else {
-    extra_values += [ "CLANGD_BUILD_XPC=0" ]
-  }
-
   if (clang_enable_static_analyzer) {
     extra_values += [ "CLANG_ENABLE_STATIC_ANALYZER=1" ]
   } else {

Modified: llvm/trunk/utils/gn/secondary/clang-tools-extra/unittests/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/clang-tools-extra/unittests/BUILD.gn?rev=359527&r1=359526&r2=359527&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/clang-tools-extra/unittests/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/clang-tools-extra/unittests/BUILD.gn Mon Apr 29 18:35:42 2019
@@ -10,7 +10,7 @@ group("unittests") {
     "clang-move:ClangMoveTests",
     "clang-query:ClangQueryTests",
     "clang-tidy:ClangTidyTests",
-    "clangd:ClangdTests",
+    "//clang-tools-extra/clangd/unittests:ClangdTests",
   ]
   if (clangd_build_xpc) {
     deps += [ "clangd/xpc:ClangdXpcTests" ]