Index: llvm/trunk/utils/gn/secondary/llvm/unittests/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/BUILD.gn
@@ -19,26 +19,37 @@
     #"DebugInfo/PDB:DebugInfoPDBTests",
     "Demangle:DemangleTests",
 
-    # FIXME: Add more:
+    # FIXME: Add.
     #"ExecutionEngine:ExecutionEngineTests",
     #"ExecutionEngine/MCJIT:MCJITTests",
     #"ExecutionEngine/Orc:OrcJITTests",
-    #"FuzzMutate:FuzzMutateTests",
-    #"IR:IRTests",
-    #"LineEditor:LineEditorTests",
-    #"MC:MCTests",
+    "FuzzMutate:FuzzMutateTests",
+    "IR:IRTests",
+    "LineEditor:LineEditorTests",
+    "Linker:LinkerTests",
+    "MC:MCTests",
+
+    # FIXME: Add.
     #"MI:MITests",
-    #"Object:ObjectTests",
-    #"ObjectYAML:ObjectYAMLTests",
-    #"Option:OptionTests",
+    "Object:ObjectTests",
+    "ObjectYAML:ObjectYAMLTests",
+    "Option:OptionTests",
+
+    # FIXME: Add more:
+    #"OptRemarks:OptRemarksTests",
     #"Passes:PluginsTests",
-    #"ProfileData:ProfileDataTests",
+
+    "ProfileData:ProfileDataTests",
+
+    # FIXME: Add more:
     #"Support:SupportTests",
     #"Support/DynamicLibrary:DynamicLibraryTests",
     #"Transforms/IPO:IPOTests",
     #"Transforms/Scalar:ScalarTests",
     #"Transforms/Utils:UtilsTests",
-    #"XRay:XRayTests",
+    "XRay:XRayTests",
+
+    # FIXME: Add more:
     #"tools/llvm-cfi-verify:CFIVerifyTests",
     #"tools/llvm-exegesis:LLVMExegesisTests",
   ]
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/FuzzMutate/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/FuzzMutate/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/FuzzMutate/BUILD.gn
@@ -0,0 +1,16 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("FuzzMutateTests") {
+  deps = [
+    "//llvm/lib/AsmParser",
+    "//llvm/lib/FuzzMutate",
+    "//llvm/lib/IR",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "OperationsTest.cpp",
+    "RandomIRBuilderTest.cpp",
+    "ReservoirSamplerTest.cpp",
+    "StrategiesTest.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/IR/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/IR/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/IR/BUILD.gn
@@ -0,0 +1,46 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("IRTests") {
+  deps = [
+    "//llvm/lib/Analysis",
+    "//llvm/lib/AsmParser",
+    "//llvm/lib/IR",
+    "//llvm/lib/Passes",
+    "//llvm/lib/Support",
+    "//llvm/lib/Testing/Support",
+  ]
+  sources = [
+    "AsmWriterTest.cpp",
+    "AttributesTest.cpp",
+    "BasicBlockTest.cpp",
+    "CFGBuilder.cpp",
+    "ConstantRangeTest.cpp",
+    "ConstantsTest.cpp",
+    "DebugInfoTest.cpp",
+    "DebugTypeODRUniquingTest.cpp",
+    "DomTreeUpdaterTest.cpp",
+    "DominatorTreeBatchUpdatesTest.cpp",
+    "DominatorTreeTest.cpp",
+    "FunctionTest.cpp",
+    "IRBuilderTest.cpp",
+    "InstructionsTest.cpp",
+    "IntrinsicsTest.cpp",
+    "LegacyPassManagerTest.cpp",
+    "MDBuilderTest.cpp",
+    "ManglerTest.cpp",
+    "MetadataTest.cpp",
+    "ModuleTest.cpp",
+    "PassBuilderCallbacksTest.cpp",
+    "PassManagerTest.cpp",
+    "PatternMatch.cpp",
+    "TypeBuilderTest.cpp",
+    "TypesTest.cpp",
+    "UseTest.cpp",
+    "UserTest.cpp",
+    "ValueHandleTest.cpp",
+    "ValueMapTest.cpp",
+    "ValueTest.cpp",
+    "VerifierTest.cpp",
+    "WaymarkTest.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/LineEditor/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/LineEditor/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/LineEditor/BUILD.gn
@@ -0,0 +1,11 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("LineEditorTests") {
+  deps = [
+    "//llvm/lib/LineEditor",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "LineEditor.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/Linker/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/Linker/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/Linker/BUILD.gn
@@ -0,0 +1,12 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("LinkerTests") {
+  deps = [
+    "//llvm/lib/AsmParser",
+    "//llvm/lib/IR",
+    "//llvm/lib/Linker",
+  ]
+  sources = [
+    "LinkModulesTest.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/MC/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/MC/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/MC/BUILD.gn
@@ -0,0 +1,16 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("MCTests") {
+  deps = [
+    "//llvm/lib/MC",
+    "//llvm/lib/MC/MCDisassembler",
+    "//llvm/lib/Support",
+    "//llvm/lib/Target:TargetsToBuild",
+  ]
+  sources = [
+    "Disassembler.cpp",
+    "DwarfLineTables.cpp",
+    "StringTableBuilderTest.cpp",
+    "TargetRegistry.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/Object/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/Object/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/Object/BUILD.gn
@@ -0,0 +1,11 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("ObjectTests") {
+  deps = [
+    "//llvm/lib/Object",
+  ]
+  sources = [
+    "SymbolSizeTest.cpp",
+    "SymbolicFileTest.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn
@@ -0,0 +1,10 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("ObjectYAMLTests") {
+  deps = [
+    "//llvm/lib/ObjectYAML",
+  ]
+  sources = [
+    "YAMLTest.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/Option/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/Option/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/Option/BUILD.gn
@@ -0,0 +1,18 @@
+import("//llvm/utils/TableGen/tablegen.gni")
+import("//llvm/utils/unittest/unittest.gni")
+
+tablegen("Opts") {
+  visibility = [ ":OptionTests" ]
+  args = [ "-gen-opt-parser-defs" ]
+}
+
+unittest("OptionTests") {
+  deps = [
+    ":Opts",
+    "//llvm/lib/Option",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "OptionParsingTest.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/ProfileData/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/ProfileData/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/ProfileData/BUILD.gn
@@ -0,0 +1,15 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("ProfileDataTests") {
+  deps = [
+    "//llvm/lib/IR",
+    "//llvm/lib/ProfileData",
+    "//llvm/lib/ProfileData/Coverage",
+    "//llvm/lib/Testing/Support",
+  ]
+  sources = [
+    "CoverageMappingTest.cpp",
+    "InstrProfTest.cpp",
+    "SampleProfTest.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/unittests/XRay/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/XRay/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/XRay/BUILD.gn
@@ -0,0 +1,19 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("XRayTests") {
+  deps = [
+    "//llvm/lib/Support",
+    "//llvm/lib/Testing/Support",
+    "//llvm/lib/XRay",
+  ]
+  sources = [
+    "FDRBlockIndexerTest.cpp",
+    "FDRBlockVerifierTest.cpp",
+    "FDRProducerConsumerTest.cpp",
+    "FDRRecordPrinterTest.cpp",
+    "FDRRecordsTest.cpp",
+    "FDRTraceWriterTest.cpp",
+    "GraphTest.cpp",
+    "ProfileTest.cpp",
+  ]
+}