[llvm] ce2474f - [gn build] port a11cd0d94ed3 (gtest llvm/utils/unittest -> third-party/unittest)
Nico Weber via llvm-commits
llvm-commits at lists.llvm.org
Wed Nov 9 16:59:25 PST 2022
Author: Nico Weber
Date: 2022-11-09T19:58:28-05:00
New Revision: ce2474ff60c9ca0a9a5747e6e401abb284d8378f
URL: https://github.com/llvm/llvm-project/commit/ce2474ff60c9ca0a9a5747e6e401abb284d8378f
DIFF: https://github.com/llvm/llvm-project/commit/ce2474ff60c9ca0a9a5747e6e401abb284d8378f.diff
LOG: [gn build] port a11cd0d94ed3 (gtest llvm/utils/unittest -> third-party/unittest)
Added:
llvm/utils/gn/secondary/third-party/unittest/BUILD.gn
llvm/utils/gn/secondary/third-party/unittest/UnitTestMain/BUILD.gn
llvm/utils/gn/secondary/third-party/unittest/unittest.gni
Modified:
llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/BUILD.gn
llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn
llvm/utils/gn/secondary/clang-tools-extra/pseudo/unittests/BUILD.gn
llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-apply-replacements/BUILD.gn
llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-change-namespace/BUILD.gn
llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-doc/BUILD.gn
llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/BUILD.gn
llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/BUILD.gn
llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-move/BUILD.gn
llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-query/BUILD.gn
llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-tidy/BUILD.gn
llvm/utils/gn/secondary/clang/lib/Testing/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/AST/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/ASTMatchers/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/ASTMatchers/Dynamic/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/Analysis/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/Analysis/FlowSensitive/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/Basic/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/CodeGen/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/CrossTU/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/Driver/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/Format/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/Frontend/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/Index/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/Interpreter/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/Interpreter/ExceptionTests/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/Introspection/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/Lex/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/Rename/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/Rewrite/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/Sema/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/Serialization/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/StaticAnalyzer/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/Support/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/Tooling/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/Tooling/Syntax/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/libclang/BUILD.gn
llvm/utils/gn/secondary/clang/unittests/libclang/CrashTests/BUILD.gn
llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/tests/BUILD.gn
llvm/utils/gn/secondary/llvm/lib/Testing/Support/BUILD.gn
llvm/utils/gn/secondary/llvm/test/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/ADT/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/AsmParser/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/BinaryFormat/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Bitcode/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Bitstream/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/CodeGen/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/CodeGen/GlobalISel/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/DebugInfo/CodeView/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/DebugInfo/DWARF/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/DebugInfo/GSYM/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/DebugInfo/LogicalView/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/DebugInfo/MSF/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/DebugInfo/PDB/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/DebugInfo/Symbolizer/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Debuginfod/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Demangle/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/Orc/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/FileCheck/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Frontend/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/FuzzMutate/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/IR/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/InterfaceStub/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/LineEditor/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Linker/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/MC/AMDGPU/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/MC/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/MC/SystemZ/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/MC/X86/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/MI/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/MIR/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/ObjCopy/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Object/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Option/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Passes/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/ProfileData/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Remarks/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Support/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Support/DynamicLibrary/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/TableGen/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Target/AArch64/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Target/ARM/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Target/DirectX/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Target/PowerPC/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Target/WebAssembly/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Testing/ADT/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Testing/Support/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/TextAPI/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Transforms/IPO/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Transforms/Scalar/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Transforms/Utils/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/Transforms/Vectorize/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/XRay/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/AArch64/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/ARM/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/Mips/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/PowerPC/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/X86/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/X86/BUILD.gn
llvm/utils/gn/secondary/llvm/unittests/tools/llvm-profgen/BUILD.gn
Removed:
llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn
llvm/utils/gn/secondary/llvm/utils/unittest/UnitTestMain/BUILD.gn
llvm/utils/gn/secondary/llvm/utils/unittest/unittest.gni
################################################################################
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/BUILD.gn
index df95629d5a9cd..b65db84bd38b2 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/BUILD.gn
@@ -1,5 +1,5 @@
import("//clang-tools-extra/clangd/quality/gen_decision_forest.gni")
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
gen_decision_forest("DecisionForestRuntimeTest") {
model = "decision_forest_model"
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn
index d87d3d2648712..9d12a5c80f5cc 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ClangdXpcTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/pseudo/unittests/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/pseudo/unittests/BUILD.gn
index 01848f95f3835..a466bb5076260 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/pseudo/unittests/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/pseudo/unittests/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ClangPseudoTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-apply-replacements/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-apply-replacements/BUILD.gn
index cdd30c9f7782d..ff55251ede9fe 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-apply-replacements/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-apply-replacements/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ClangApplyReplacementsTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-change-namespace/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-change-namespace/BUILD.gn
index 1e1161bc85c0c..058d93135f490 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-change-namespace/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-change-namespace/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ClangChangeNamespaceTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-doc/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-doc/BUILD.gn
index 9a6415ce2479d..17ee6c3dee677 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-doc/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-doc/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ClangDocTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/BUILD.gn
index ad0732d61f3dc..201f027b2f8e1 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ClangIncludeFixerTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/BUILD.gn
index 87bfaa9c6f362..1c64b55dc45c4 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("FindAllSymbolsTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-move/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-move/BUILD.gn
index 5fa983f5b7d3a..16638293038ac 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-move/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-move/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ClangMoveTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-query/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-query/BUILD.gn
index 7c5d774d010f3..af9301afe92e4 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-query/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-query/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ClangQueryTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-tidy/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-tidy/BUILD.gn
index 6ae3d632a2897..97f1bec0b66dc 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-tidy/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-tidy/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ClangTidyTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/lib/Testing/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Testing/BUILD.gn
index 00cb4645a4c0a..78b4bac576024 100644
--- a/llvm/utils/gn/secondary/clang/lib/Testing/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Testing/BUILD.gn
@@ -5,7 +5,7 @@ static_library("Testing") {
deps = [
"//clang/lib/Basic",
"//llvm/lib/Support",
- "//llvm/utils/unittest:gtest",
+ "//third-party/unittest:gtest",
]
sources = [
"CommandLineArgs.cpp",
diff --git a/llvm/utils/gn/secondary/clang/unittests/AST/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/AST/BUILD.gn
index aa4f15a33230a..b3749159d3e08 100644
--- a/llvm/utils/gn/secondary/clang/unittests/AST/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/AST/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ASTTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/ASTMatchers/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/ASTMatchers/BUILD.gn
index fb0511dbbec53..5d6e484119e14 100644
--- a/llvm/utils/gn/secondary/clang/unittests/ASTMatchers/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/ASTMatchers/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ASTMatchersTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/ASTMatchers/Dynamic/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/ASTMatchers/Dynamic/BUILD.gn
index 025f16e1fca65..f4197489e1fca 100644
--- a/llvm/utils/gn/secondary/clang/unittests/ASTMatchers/Dynamic/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/ASTMatchers/Dynamic/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("DynamicASTMatchersTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Analysis/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Analysis/BUILD.gn
index 5e104ed2522ea..b1c376afdb235 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Analysis/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Analysis/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ClangAnalysisTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Analysis/FlowSensitive/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Analysis/FlowSensitive/BUILD.gn
index 12662f7a4b81b..9b07b8d5b2ae0 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Analysis/FlowSensitive/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Analysis/FlowSensitive/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ClangAnalysisFlowSensitiveTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Basic/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Basic/BUILD.gn
index bd803693f27f1..46cea0cb2943d 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Basic/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Basic/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("BasicTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/CodeGen/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/CodeGen/BUILD.gn
index 54a0600f6db55..4e96aaef46c76 100644
--- a/llvm/utils/gn/secondary/clang/unittests/CodeGen/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/CodeGen/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ClangCodeGenTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/CrossTU/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/CrossTU/BUILD.gn
index 4f87006e0c2b0..158b90fb83cfd 100644
--- a/llvm/utils/gn/secondary/clang/unittests/CrossTU/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/CrossTU/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("CrossTUTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Driver/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Driver/BUILD.gn
index 2443a616e3029..346fac1ffcf2a 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Driver/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Driver/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ClangDriverTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Format/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Format/BUILD.gn
index ef77e7e02b9f0..bc6ffca7f9eeb 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Format/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Format/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("FormatTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Frontend/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Frontend/BUILD.gn
index 6d69aac513570..32cd6e41fd6d1 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Frontend/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Frontend/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("FrontendTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Index/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Index/BUILD.gn
index 60f211ffb88bd..0bccffff7d997 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Index/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Index/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("IndexTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Interpreter/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Interpreter/BUILD.gn
index 26d2e2cb8cc05..83bbef5277ba9 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Interpreter/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Interpreter/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ClangReplInterpreterTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Interpreter/ExceptionTests/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Interpreter/ExceptionTests/BUILD.gn
index ea52221b73dd8..a269e01f0743d 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Interpreter/ExceptionTests/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Interpreter/ExceptionTests/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ClangReplInterpreterExceptionTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Introspection/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Introspection/BUILD.gn
index cac9b01dbf96c..687ac2b812658 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Introspection/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Introspection/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("IntrospectionTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Lex/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Lex/BUILD.gn
index 1493bff6b16b1..635ed39fc467e 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Lex/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Lex/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("LexTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Rename/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Rename/BUILD.gn
index 54c0dba085957..10c922424186f 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Rename/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Rename/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ClangRenameTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Rewrite/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Rewrite/BUILD.gn
index daf250886db94..52003f8a8db0f 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Rewrite/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Rewrite/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("RewriteTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Sema/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Sema/BUILD.gn
index f75566b8bedf4..817f4803d6c9f 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Sema/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Sema/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("SemaTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Serialization/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Serialization/BUILD.gn
index ba912a1eb6e63..dc65bf669276d 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Serialization/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Serialization/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("SerializationTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/StaticAnalyzer/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/StaticAnalyzer/BUILD.gn
index 6a06d46e6c1b0..d374114c9eef2 100644
--- a/llvm/utils/gn/secondary/clang/unittests/StaticAnalyzer/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/StaticAnalyzer/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("StaticAnalysisTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Support/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Support/BUILD.gn
index fe6262e832e15..ff68e1537c55d 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Support/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Support/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ClangSupportTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Tooling/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Tooling/BUILD.gn
index 37e45e00d87ac..ab65370589759 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Tooling/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Tooling/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ToolingTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Tooling/Syntax/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Tooling/Syntax/BUILD.gn
index a7342b14a419f..0f35297e9cbd8 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Tooling/Syntax/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Tooling/Syntax/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("SyntaxTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/libclang/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/libclang/BUILD.gn
index 4f6681aba4299..a1c84d095c357 100644
--- a/llvm/utils/gn/secondary/clang/unittests/libclang/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/libclang/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("libclangTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/libclang/CrashTests/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/libclang/CrashTests/BUILD.gn
index 37f277d08d59c..fa261aa13996f 100644
--- a/llvm/utils/gn/secondary/clang/unittests/libclang/CrashTests/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/libclang/CrashTests/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("libclangCrashTests") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/tests/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/tests/BUILD.gn
index 757871a890ff7..452c19f480d97 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/tests/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/tests/BUILD.gn
@@ -1,5 +1,5 @@
import("//llvm/utils/gn/build/toolchain/compiler.gni")
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
test_cflags = [ "-DSCUDO_DEBUG=1" ]
diff --git a/llvm/utils/gn/secondary/llvm/lib/Testing/Support/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Testing/Support/BUILD.gn
index cdc4230d03e70..6d7d525d01afb 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Testing/Support/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Testing/Support/BUILD.gn
@@ -2,7 +2,7 @@ static_library("Support") {
output_name = "LLVMTestingSupport"
deps = [
"//llvm/lib/Support",
- "//llvm/utils/unittest:gtest",
+ "//third-party/unittest:gtest",
]
sources = [
"Annotations.cpp",
diff --git a/llvm/utils/gn/secondary/llvm/test/BUILD.gn b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
index d372f6893eae9..38729e0f7e19c 100644
--- a/llvm/utils/gn/secondary/llvm/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
@@ -319,11 +319,11 @@ group("test") {
"//llvm/utils/llvm-locstats",
"//llvm/utils/not",
"//llvm/utils/split-file",
+ "//llvm/utils/yaml-bench",
# llvm-config wants libgtest_main.a to exist at runtime when run as in
# its tests, but nothing in the tree depends on them.
- "//llvm/utils/unittest/UnitTestMain:gtest_main",
- "//llvm/utils/yaml-bench",
+ "//third-party/unittest/UnitTestMain:gtest_main",
]
if (host_os != "win") {
# loadable_modules don't work on Windows.
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ADT/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ADT/BUILD.gn
index 54e8a8ee182ec..7b7b8008896ad 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ADT/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ADT/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ADTTests") {
# ADT is a headers-only library so there's no //llvm/lib/ADT to depend on.
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn
index f76ed7d9702c4..6818c88687626 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("AnalysisTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/AsmParser/BUILD.gn
index ca576b1ffe322..a5eac2e0310d3 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/AsmParser/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("AsmParserTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/BinaryFormat/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/BinaryFormat/BUILD.gn
index 1c1951f3faa3c..209b3c03434db 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/BinaryFormat/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/BinaryFormat/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("BinaryFormatTests") {
deps = [ "//llvm/lib/BinaryFormat" ]
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Bitcode/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Bitcode/BUILD.gn
index 6200a0f07cd62..59d4075538a25 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Bitcode/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Bitcode/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("BitcodeTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Bitstream/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Bitstream/BUILD.gn
index 336d646a60660..20961a2d303b5 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Bitstream/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Bitstream/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("BitstreamTests") {
deps = [ "//llvm/lib/Bitstream/Reader" ]
diff --git a/llvm/utils/gn/secondary/llvm/unittests/CodeGen/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/CodeGen/BUILD.gn
index 8dece10278da5..aecef6e0e4a1f 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/CodeGen/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/CodeGen/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("CodeGenTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/CodeGen/GlobalISel/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/CodeGen/GlobalISel/BUILD.gn
index 16f1f20fec0c7..95ec74d670c47 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/CodeGen/GlobalISel/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/CodeGen/GlobalISel/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("GlobalISelTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/CodeView/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/CodeView/BUILD.gn
index db28b4b4d1cd6..c74f2b251fa14 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/CodeView/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/CodeView/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("DebugInfoCodeViewTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/DWARF/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/DWARF/BUILD.gn
index a7c1d6ac8a546..9767d5ff5671b 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/DWARF/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/DWARF/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("DebugInfoDWARFTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/GSYM/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/GSYM/BUILD.gn
index 27507406150f6..16c0faf1ac08d 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/GSYM/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/GSYM/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("DebugInfoGSYMTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/LogicalView/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/LogicalView/BUILD.gn
index 579e7c75c9196..ec938c8dd6a14 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/LogicalView/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/LogicalView/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("DebugInfoLogicalViewTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/MSF/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/MSF/BUILD.gn
index 6c9bc06ab4cff..8ee26a12f5605 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/MSF/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/MSF/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("DebugInfoMSFTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/PDB/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/PDB/BUILD.gn
index 50979695e6f72..dc474c46d3cb3 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/PDB/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/PDB/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("DebugInfoPDBTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/Symbolizer/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/Symbolizer/BUILD.gn
index f756f6dfadb33..7f4d9fd709cc4 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/Symbolizer/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/Symbolizer/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("DebugInfoSymbolizerTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Debuginfod/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Debuginfod/BUILD.gn
index 2aefe6c5b94e1..d95e58b04c49a 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Debuginfod/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Debuginfod/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("DebuginfodTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Demangle/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Demangle/BUILD.gn
index 4da0db73e2f0b..7daa3a4cef108 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Demangle/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Demangle/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("DemangleTests") {
deps = [ "//llvm/lib/Demangle" ]
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/BUILD.gn
index 095ca3e6b6d05..e5c58c10871ca 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ExecutionEngineTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn
index 3177d26acefaa..f95734c348700 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("JITLinkTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn
index eed7d734eb798..aa1f38c39a73f 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("MCJITTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/Orc/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/Orc/BUILD.gn
index e91b83052540e..02f0febc4cd97 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/Orc/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/Orc/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("OrcJITTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/FileCheck/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/FileCheck/BUILD.gn
index 22c81e24970de..2e802429a6ff8 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/FileCheck/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/FileCheck/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("FileCheckTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Frontend/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Frontend/BUILD.gn
index 0a5031f23e72b..ea483bba4c4e5 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Frontend/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Frontend/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("LLVMFrontendTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/FuzzMutate/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/FuzzMutate/BUILD.gn
index 2967ddcc44c10..1ef49ba9ce0be 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/FuzzMutate/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/FuzzMutate/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("FuzzMutateTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/IR/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/IR/BUILD.gn
index 672d372f32961..bfcc4f4e2b9a7 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/IR/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/IR/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("IRTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/InterfaceStub/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/InterfaceStub/BUILD.gn
index cb508882778c0..0376ff68a8745 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/InterfaceStub/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/InterfaceStub/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("InterfaceStubTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/LineEditor/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/LineEditor/BUILD.gn
index f2daa813cb20c..eb211b9921dd7 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/LineEditor/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/LineEditor/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("LineEditorTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Linker/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Linker/BUILD.gn
index ab88ae9b495e5..8e6a5b21b0549 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Linker/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Linker/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("LinkerTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/MC/AMDGPU/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/MC/AMDGPU/BUILD.gn
index 0ddca65697952..48726e5945e19 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/MC/AMDGPU/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/MC/AMDGPU/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("AMDGPUDwarfTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/MC/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/MC/BUILD.gn
index 45497d3310ea3..6227b62fd8fe3 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/MC/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/MC/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("MCTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/MC/SystemZ/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/MC/SystemZ/BUILD.gn
index 637fc342d489c..7a6095f4d3a7a 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/MC/SystemZ/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/MC/SystemZ/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("SystemZAsmLexerTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/MC/X86/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/MC/X86/BUILD.gn
index a66c3228847c4..92fb60a75e8e4 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/MC/X86/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/MC/X86/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("X86MCTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/MI/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/MI/BUILD.gn
index 6ac92ec49d225..df15d82876be3 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/MI/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/MI/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("MITests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/MIR/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/MIR/BUILD.gn
index c6dd5ae607fb7..a93a846ba6516 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/MIR/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/MIR/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("MIRTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ObjCopy/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ObjCopy/BUILD.gn
index 58c168156d073..003a1f3667eb9 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ObjCopy/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ObjCopy/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ObjCopyTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Object/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Object/BUILD.gn
index 1c4a32eea9597..1eaaf709764a3 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Object/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Object/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ObjectTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn
index a8861ba5b2677..a3a088e93772f 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ObjectYAMLTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Option/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Option/BUILD.gn
index 13d80ef02ee7a..46f3ff9102340 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Option/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Option/BUILD.gn
@@ -1,5 +1,5 @@
import("//llvm/utils/TableGen/tablegen.gni")
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
tablegen("Opts") {
visibility = [ ":OptionTests" ]
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Passes/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Passes/BUILD.gn
index 29e4183d974f1..e38df369eb692 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Passes/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Passes/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
# Keyed off LLVM_ENABLE_PLUGINS in the CMake build, which is usually false
# on Windows and true elsewhere.
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ProfileData/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ProfileData/BUILD.gn
index 7b848a435c4b6..a022c4c7a4c39 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ProfileData/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ProfileData/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ProfileDataTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Remarks/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Remarks/BUILD.gn
index 2fdd6137778a8..224c763be9a18 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Remarks/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Remarks/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("RemarksTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Support/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Support/BUILD.gn
index 619020ca8c43d..3d869de7d290b 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Support/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Support/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("SupportTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Support/DynamicLibrary/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Support/DynamicLibrary/BUILD.gn
index 28c0b4b6d3d14..dd82c3be18022 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Support/DynamicLibrary/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Support/DynamicLibrary/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
# FIXME: If we add -Wl,-z,nodelete to the global ldflags, we need to remove
# it again for these tests (cf CMake).
diff --git a/llvm/utils/gn/secondary/llvm/unittests/TableGen/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/TableGen/BUILD.gn
index 2dae703dfbb37..ce04c967c2484 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/TableGen/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/TableGen/BUILD.gn
@@ -1,5 +1,5 @@
import("//llvm/utils/TableGen/tablegen.gni")
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
tablegen("AutomataAutomata") {
visibility = [ ":TableGenTests" ]
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Target/AArch64/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/AArch64/BUILD.gn
index ed694f9e8db4b..4f94ecd9afbe7 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/AArch64/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/AArch64/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("AArch64Tests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn
index 68b127abc9bc7..1c579b4f1cf98 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("AMDGPUTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Target/ARM/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/ARM/BUILD.gn
index b13adf2a5f2cb..6d81e3044a186 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/ARM/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/ARM/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ARMTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Target/DirectX/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/DirectX/BUILD.gn
index 5b211562a25f4..babc17135b248 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/DirectX/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/DirectX/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
# This test is currently not referenced by anything, it only exists
# to make sync_source_lists_from_cmake.py happy.
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Target/PowerPC/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/PowerPC/BUILD.gn
index 85a15fb588147..f0bedddbf1e4c 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/PowerPC/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/PowerPC/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("PowerPCTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Target/WebAssembly/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/WebAssembly/BUILD.gn
index e5a3dda94ed46..190b9afe637b1 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/WebAssembly/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/WebAssembly/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("WebAssemblyTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn
index b181780a971f8..423d31bc6f9f0 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("X86Tests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Testing/ADT/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Testing/ADT/BUILD.gn
index 94fe2cd53b3d0..bc41019fc1c0b 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Testing/ADT/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Testing/ADT/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("TestingADTTests") {
deps = [ "//llvm/lib/Support" ]
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Testing/Support/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Testing/Support/BUILD.gn
index 590148dcae7eb..88b8002431a8f 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Testing/Support/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Testing/Support/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("TestingSupportTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/TextAPI/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/TextAPI/BUILD.gn
index 0ebeb4f773bbc..f4f43450b08c7 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/TextAPI/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/TextAPI/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("TextAPITests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Transforms/IPO/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Transforms/IPO/BUILD.gn
index 904ee9c517481..bb1b27370ee1f 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Transforms/IPO/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Transforms/IPO/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("IPOTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Transforms/Scalar/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Transforms/Scalar/BUILD.gn
index 493a282436527..097b555e4cf72 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Transforms/Scalar/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Transforms/Scalar/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("ScalarTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Transforms/Utils/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Transforms/Utils/BUILD.gn
index 556527cac1caf..15e3518960b49 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Transforms/Utils/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Transforms/Utils/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("UtilsTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Transforms/Vectorize/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Transforms/Vectorize/BUILD.gn
index 218ef86f2777b..e44d6326826c0 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Transforms/Vectorize/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Transforms/Vectorize/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("VectorizeTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/XRay/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/XRay/BUILD.gn
index 003bfc08239a8..1e64302a04876 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/XRay/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/XRay/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("XRayTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn
index e25d8383b0867..7a401b1e29669 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("CFIVerifyTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/AArch64/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/AArch64/BUILD.gn
index d7a5b09804932..701c930de1b83 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/AArch64/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/AArch64/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("LLVMExegesisAArch64Tests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/ARM/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/ARM/BUILD.gn
index 141b30b174c02..697d722a41d4a 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/ARM/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/ARM/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("LLVMExegesisARMTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/BUILD.gn
index 9eb3c9d3037ec..c43624e276c5e 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("LLVMExegesisTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/Mips/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/Mips/BUILD.gn
index a7e00a9a71c4e..679d632a7e7bd 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/Mips/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/Mips/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("LLVMExegesisMipsTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/PowerPC/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/PowerPC/BUILD.gn
index ef4a38468ac97..06221c1ad6749 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/PowerPC/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/PowerPC/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("LLVMExegesisPowerPCTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/X86/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/X86/BUILD.gn
index 9807b58977feb..37102b6c03e16 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/X86/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/X86/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("LLVMExegesisX86Tests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/BUILD.gn
index 9d79fb73aab33..192b812e2b137 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/BUILD.gn
@@ -1,5 +1,5 @@
import("//llvm/lib/Target/targets.gni")
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("LLVMMCATests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/X86/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/X86/BUILD.gn
index f43473d33ecaa..7819c73a288cd 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/X86/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/X86/BUILD.gn
@@ -3,7 +3,7 @@ source_set("X86") {
testonly = true
deps = [
"//llvm/lib/Target/X86",
- "//llvm/utils/unittest:gtest",
+ "//third-party/unittest:gtest",
# This test target reaches inside the Target/X86 tablegen internals and must
# depend on this Target/X86-internal build target.
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-profgen/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-profgen/BUILD.gn
index 835bc7c848ab9..b53b84d8603ce 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-profgen/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-profgen/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
unittest("LLVMProfgenTests") {
deps = [
diff --git a/llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn b/llvm/utils/gn/secondary/third-party/unittest/BUILD.gn
similarity index 100%
rename from llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn
rename to llvm/utils/gn/secondary/third-party/unittest/BUILD.gn
diff --git a/llvm/utils/gn/secondary/llvm/utils/unittest/UnitTestMain/BUILD.gn b/llvm/utils/gn/secondary/third-party/unittest/UnitTestMain/BUILD.gn
similarity index 100%
rename from llvm/utils/gn/secondary/llvm/utils/unittest/UnitTestMain/BUILD.gn
rename to llvm/utils/gn/secondary/third-party/unittest/UnitTestMain/BUILD.gn
diff --git a/llvm/utils/gn/secondary/llvm/utils/unittest/unittest.gni b/llvm/utils/gn/secondary/third-party/unittest/unittest.gni
similarity index 95%
rename from llvm/utils/gn/secondary/llvm/utils/unittest/unittest.gni
rename to llvm/utils/gn/secondary/third-party/unittest/unittest.gni
index f0c8309a9aff2..ab854599e661c 100644
--- a/llvm/utils/gn/secondary/llvm/utils/unittest/unittest.gni
+++ b/llvm/utils/gn/secondary/third-party/unittest/unittest.gni
@@ -45,9 +45,9 @@ template("unittest") {
output_dir = target_out_dir
if (has_custom_main) {
- deps += [ "//llvm/utils/unittest:gtest" ]
+ deps += [ "//third-party/unittest:gtest" ]
} else {
- deps += [ "//llvm/utils/unittest/UnitTestMain" ]
+ deps += [ "//third-party/unittest/UnitTestMain" ]
}
testonly = true
}
More information about the llvm-commits
mailing list