Reduce verbiage of lit.local.cfg files
We can just split targets_to_build in one place and make it immutable.
llvm-svn: 210496
diff --git a/llvm/test/Analysis/CostModel/AArch64/lit.local.cfg b/llvm/test/Analysis/CostModel/AArch64/lit.local.cfg
index c420349..7184443 100644
--- a/llvm/test/Analysis/CostModel/AArch64/lit.local.cfg
+++ b/llvm/test/Analysis/CostModel/AArch64/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'AArch64' in targets:
+if not 'AArch64' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Analysis/CostModel/ARM/lit.local.cfg b/llvm/test/Analysis/CostModel/ARM/lit.local.cfg
index 8a3ba96..98c6700 100644
--- a/llvm/test/Analysis/CostModel/ARM/lit.local.cfg
+++ b/llvm/test/Analysis/CostModel/ARM/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'ARM' in targets:
+if not 'ARM' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Analysis/CostModel/PowerPC/lit.local.cfg b/llvm/test/Analysis/CostModel/PowerPC/lit.local.cfg
index 2e46300..5d33887 100644
--- a/llvm/test/Analysis/CostModel/PowerPC/lit.local.cfg
+++ b/llvm/test/Analysis/CostModel/PowerPC/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'PowerPC' in targets:
+if not 'PowerPC' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Analysis/CostModel/X86/lit.local.cfg b/llvm/test/Analysis/CostModel/X86/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/Analysis/CostModel/X86/lit.local.cfg
+++ b/llvm/test/Analysis/CostModel/X86/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Bindings/llvm-c/lit.local.cfg b/llvm/test/Bindings/llvm-c/lit.local.cfg
index d83ebee..75b22c0 100644
--- a/llvm/test/Bindings/llvm-c/lit.local.cfg
+++ b/llvm/test/Bindings/llvm-c/lit.local.cfg
@@ -1,5 +1,4 @@
-targets = set(config.root.targets_to_build.split())
-if not "X86" in targets:
+if not "X86" in config.root.targets:
config.unsupported = True
-if not "ARM" in targets:
+if not "ARM" in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/CodeGen/AArch64/lit.local.cfg b/llvm/test/CodeGen/AArch64/lit.local.cfg
index 77493d8..125995c 100644
--- a/llvm/test/CodeGen/AArch64/lit.local.cfg
+++ b/llvm/test/CodeGen/AArch64/lit.local.cfg
@@ -2,8 +2,7 @@
config.suffixes = ['.ll']
-targets = set(config.root.targets_to_build.split())
-if not 'AArch64' in targets:
+if not 'AArch64' in config.root.targets:
config.unsupported = True
# For now we don't test arm64-win32.
diff --git a/llvm/test/CodeGen/ARM/lit.local.cfg b/llvm/test/CodeGen/ARM/lit.local.cfg
index 8a3ba96..98c6700 100644
--- a/llvm/test/CodeGen/ARM/lit.local.cfg
+++ b/llvm/test/CodeGen/ARM/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'ARM' in targets:
+if not 'ARM' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/CodeGen/CPP/lit.local.cfg b/llvm/test/CodeGen/CPP/lit.local.cfg
index 4063dd1..3ff5c6b 100644
--- a/llvm/test/CodeGen/CPP/lit.local.cfg
+++ b/llvm/test/CodeGen/CPP/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'CppBackend' in targets:
+if not 'CppBackend' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/CodeGen/Hexagon/lit.local.cfg b/llvm/test/CodeGen/Hexagon/lit.local.cfg
index e96bab8..ba72ff6 100644
--- a/llvm/test/CodeGen/Hexagon/lit.local.cfg
+++ b/llvm/test/CodeGen/Hexagon/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'Hexagon' in targets:
+if not 'Hexagon' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/CodeGen/MSP430/lit.local.cfg b/llvm/test/CodeGen/MSP430/lit.local.cfg
index a18fe6f..b1cf1fb 100644
--- a/llvm/test/CodeGen/MSP430/lit.local.cfg
+++ b/llvm/test/CodeGen/MSP430/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'MSP430' in targets:
+if not 'MSP430' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/CodeGen/Mips/lit.local.cfg b/llvm/test/CodeGen/Mips/lit.local.cfg
index 1fa54b4..a3183a2 100644
--- a/llvm/test/CodeGen/Mips/lit.local.cfg
+++ b/llvm/test/CodeGen/Mips/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'Mips' in targets:
+if not 'Mips' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/CodeGen/NVPTX/lit.local.cfg b/llvm/test/CodeGen/NVPTX/lit.local.cfg
index 85cf8c2..2cb98eb3 100644
--- a/llvm/test/CodeGen/NVPTX/lit.local.cfg
+++ b/llvm/test/CodeGen/NVPTX/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'NVPTX' in targets:
+if not 'NVPTX' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/CodeGen/PowerPC/lit.local.cfg b/llvm/test/CodeGen/PowerPC/lit.local.cfg
index 2e46300..5d33887 100644
--- a/llvm/test/CodeGen/PowerPC/lit.local.cfg
+++ b/llvm/test/CodeGen/PowerPC/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'PowerPC' in targets:
+if not 'PowerPC' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/CodeGen/R600/lit.local.cfg b/llvm/test/CodeGen/R600/lit.local.cfg
index 2d8930a..ad9ce25 100644
--- a/llvm/test/CodeGen/R600/lit.local.cfg
+++ b/llvm/test/CodeGen/R600/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'R600' in targets:
+if not 'R600' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/CodeGen/SPARC/lit.local.cfg b/llvm/test/CodeGen/SPARC/lit.local.cfg
index 4d344fa..fa6a54e 100644
--- a/llvm/test/CodeGen/SPARC/lit.local.cfg
+++ b/llvm/test/CodeGen/SPARC/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'Sparc' in targets:
+if not 'Sparc' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/CodeGen/SystemZ/Large/lit.local.cfg b/llvm/test/CodeGen/SystemZ/Large/lit.local.cfg
index 9a02f84..4f22a97 100644
--- a/llvm/test/CodeGen/SystemZ/Large/lit.local.cfg
+++ b/llvm/test/CodeGen/SystemZ/Large/lit.local.cfg
@@ -5,6 +5,5 @@
if config.root.host_arch not in ['SystemZ']:
config.unsupported = True
-targets = set(config.root.targets_to_build.split())
-if not 'SystemZ' in targets:
+if not 'SystemZ' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/CodeGen/SystemZ/lit.local.cfg b/llvm/test/CodeGen/SystemZ/lit.local.cfg
index b12af09..5c02dd3 100644
--- a/llvm/test/CodeGen/SystemZ/lit.local.cfg
+++ b/llvm/test/CodeGen/SystemZ/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'SystemZ' in targets:
+if not 'SystemZ' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/CodeGen/Thumb/lit.local.cfg b/llvm/test/CodeGen/Thumb/lit.local.cfg
index 8a3ba96..98c6700 100644
--- a/llvm/test/CodeGen/Thumb/lit.local.cfg
+++ b/llvm/test/CodeGen/Thumb/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'ARM' in targets:
+if not 'ARM' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/CodeGen/Thumb2/lit.local.cfg b/llvm/test/CodeGen/Thumb2/lit.local.cfg
index 8a3ba96..98c6700 100644
--- a/llvm/test/CodeGen/Thumb2/lit.local.cfg
+++ b/llvm/test/CodeGen/Thumb2/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'ARM' in targets:
+if not 'ARM' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/CodeGen/X86/GC/lit.local.cfg b/llvm/test/CodeGen/X86/GC/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/CodeGen/X86/GC/lit.local.cfg
+++ b/llvm/test/CodeGen/X86/GC/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/CodeGen/X86/lit.local.cfg b/llvm/test/CodeGen/X86/lit.local.cfg
index 3d91b03..8ed58f1 100644
--- a/llvm/test/CodeGen/X86/lit.local.cfg
+++ b/llvm/test/CodeGen/X86/lit.local.cfg
@@ -6,7 +6,6 @@
# cleanly.
config.suffixes = ['.ll', '.test', '.txt']
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/CodeGen/XCore/lit.local.cfg b/llvm/test/CodeGen/XCore/lit.local.cfg
index 3e84c1b..0b947bb 100644
--- a/llvm/test/CodeGen/XCore/lit.local.cfg
+++ b/llvm/test/CodeGen/XCore/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'XCore' in targets:
+if not 'XCore' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/DebugInfo/AArch64/lit.local.cfg b/llvm/test/DebugInfo/AArch64/lit.local.cfg
index 9a66a00..cec29af 100644
--- a/llvm/test/DebugInfo/AArch64/lit.local.cfg
+++ b/llvm/test/DebugInfo/AArch64/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'AArch64' in targets:
+if not 'AArch64' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/DebugInfo/ARM/lit.local.cfg b/llvm/test/DebugInfo/ARM/lit.local.cfg
index 8a3ba96..98c6700 100644
--- a/llvm/test/DebugInfo/ARM/lit.local.cfg
+++ b/llvm/test/DebugInfo/ARM/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'ARM' in targets:
+if not 'ARM' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/DebugInfo/COFF/lit.local.cfg b/llvm/test/DebugInfo/COFF/lit.local.cfg
index 19840aa..c8625f4 100644
--- a/llvm/test/DebugInfo/COFF/lit.local.cfg
+++ b/llvm/test/DebugInfo/COFF/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/DebugInfo/Mips/lit.local.cfg b/llvm/test/DebugInfo/Mips/lit.local.cfg
index 88262fb..7d12f7a 100644
--- a/llvm/test/DebugInfo/Mips/lit.local.cfg
+++ b/llvm/test/DebugInfo/Mips/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'Mips' in targets:
+if not 'Mips' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/DebugInfo/PowerPC/lit.local.cfg b/llvm/test/DebugInfo/PowerPC/lit.local.cfg
index 193ebeb..0913324 100644
--- a/llvm/test/DebugInfo/PowerPC/lit.local.cfg
+++ b/llvm/test/DebugInfo/PowerPC/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'PowerPC' in targets:
+if not 'PowerPC' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/DebugInfo/Sparc/lit.local.cfg b/llvm/test/DebugInfo/Sparc/lit.local.cfg
index e4cee97..d86c9e6 100644
--- a/llvm/test/DebugInfo/Sparc/lit.local.cfg
+++ b/llvm/test/DebugInfo/Sparc/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'Sparc' in targets:
+if not 'Sparc' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/DebugInfo/SystemZ/lit.local.cfg b/llvm/test/DebugInfo/SystemZ/lit.local.cfg
index b12af09..5c02dd3 100644
--- a/llvm/test/DebugInfo/SystemZ/lit.local.cfg
+++ b/llvm/test/DebugInfo/SystemZ/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'SystemZ' in targets:
+if not 'SystemZ' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/DebugInfo/X86/lit.local.cfg b/llvm/test/DebugInfo/X86/lit.local.cfg
index 19840aa..c8625f4 100644
--- a/llvm/test/DebugInfo/X86/lit.local.cfg
+++ b/llvm/test/DebugInfo/X86/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/ExecutionEngine/MCJIT/lit.local.cfg b/llvm/test/ExecutionEngine/MCJIT/lit.local.cfg
index 5dc749d..f981403 100644
--- a/llvm/test/ExecutionEngine/MCJIT/lit.local.cfg
+++ b/llvm/test/ExecutionEngine/MCJIT/lit.local.cfg
@@ -1,5 +1,5 @@
root = config.root
-targets = set(root.targets_to_build.split())
+targets = root.targets
if ('X86' in targets) | ('AArch64' in targets) | ('ARM' in targets) | \
('Mips' in targets) | ('PowerPC' in targets) | ('SystemZ' in targets):
config.unsupported = False
diff --git a/llvm/test/Instrumentation/AddressSanitizer/X86/lit.local.cfg b/llvm/test/Instrumentation/AddressSanitizer/X86/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/Instrumentation/AddressSanitizer/X86/lit.local.cfg
+++ b/llvm/test/Instrumentation/AddressSanitizer/X86/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/LTO/lit.local.cfg b/llvm/test/LTO/lit.local.cfg
index 6df0e03..afde89b 100644
--- a/llvm/test/LTO/lit.local.cfg
+++ b/llvm/test/LTO/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/AArch64/lit.local.cfg b/llvm/test/MC/AArch64/lit.local.cfg
index 1be70c0..5822b72 100644
--- a/llvm/test/MC/AArch64/lit.local.cfg
+++ b/llvm/test/MC/AArch64/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if 'AArch64' not in targets:
+if 'AArch64' not in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/ARM/AlignedBundling/lit.local.cfg b/llvm/test/MC/ARM/AlignedBundling/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/MC/ARM/AlignedBundling/lit.local.cfg
+++ b/llvm/test/MC/ARM/AlignedBundling/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/ARM/lit.local.cfg b/llvm/test/MC/ARM/lit.local.cfg
index 8a3ba96..98c6700 100644
--- a/llvm/test/MC/ARM/lit.local.cfg
+++ b/llvm/test/MC/ARM/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'ARM' in targets:
+if not 'ARM' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/AsmParser/lit.local.cfg b/llvm/test/MC/AsmParser/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/MC/AsmParser/lit.local.cfg
+++ b/llvm/test/MC/AsmParser/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/COFF/lit.local.cfg b/llvm/test/MC/COFF/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/MC/COFF/lit.local.cfg
+++ b/llvm/test/MC/COFF/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/Disassembler/AArch64/lit.local.cfg b/llvm/test/MC/Disassembler/AArch64/lit.local.cfg
index 2c423d1..180bb8a 100644
--- a/llvm/test/MC/Disassembler/AArch64/lit.local.cfg
+++ b/llvm/test/MC/Disassembler/AArch64/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if 'AArch64' not in targets:
+if 'AArch64' not in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/Disassembler/ARM/lit.local.cfg b/llvm/test/MC/Disassembler/ARM/lit.local.cfg
index 8a3ba96..98c6700 100644
--- a/llvm/test/MC/Disassembler/ARM/lit.local.cfg
+++ b/llvm/test/MC/Disassembler/ARM/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'ARM' in targets:
+if not 'ARM' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/Disassembler/Mips/lit.local.cfg b/llvm/test/MC/Disassembler/Mips/lit.local.cfg
index 1fa54b4..a3183a2 100644
--- a/llvm/test/MC/Disassembler/Mips/lit.local.cfg
+++ b/llvm/test/MC/Disassembler/Mips/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'Mips' in targets:
+if not 'Mips' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/Disassembler/PowerPC/lit.local.cfg b/llvm/test/MC/Disassembler/PowerPC/lit.local.cfg
index 2e46300..5d33887 100644
--- a/llvm/test/MC/Disassembler/PowerPC/lit.local.cfg
+++ b/llvm/test/MC/Disassembler/PowerPC/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'PowerPC' in targets:
+if not 'PowerPC' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/Disassembler/Sparc/lit.local.cfg b/llvm/test/MC/Disassembler/Sparc/lit.local.cfg
index 4d344fa..fa6a54e 100644
--- a/llvm/test/MC/Disassembler/Sparc/lit.local.cfg
+++ b/llvm/test/MC/Disassembler/Sparc/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'Sparc' in targets:
+if not 'Sparc' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/Disassembler/SystemZ/lit.local.cfg b/llvm/test/MC/Disassembler/SystemZ/lit.local.cfg
index b12af09..5c02dd3 100644
--- a/llvm/test/MC/Disassembler/SystemZ/lit.local.cfg
+++ b/llvm/test/MC/Disassembler/SystemZ/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'SystemZ' in targets:
+if not 'SystemZ' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/Disassembler/X86/lit.local.cfg b/llvm/test/MC/Disassembler/X86/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/MC/Disassembler/X86/lit.local.cfg
+++ b/llvm/test/MC/Disassembler/X86/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/Disassembler/XCore/lit.local.cfg b/llvm/test/MC/Disassembler/XCore/lit.local.cfg
index 4d17d46..bb48713 100644
--- a/llvm/test/MC/Disassembler/XCore/lit.local.cfg
+++ b/llvm/test/MC/Disassembler/XCore/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'XCore' in targets:
+if not 'XCore' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/ELF/ARM/lit.local.cfg b/llvm/test/MC/ELF/ARM/lit.local.cfg
index 8407bb7..d825cc0 100644
--- a/llvm/test/MC/ELF/ARM/lit.local.cfg
+++ b/llvm/test/MC/ELF/ARM/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
# We have to reset config.unsupported here because the parent directory is
# predicated on 'X86'.
-config.unsupported = not 'ARM' in targets
+config.unsupported = not 'ARM' in config.root.targets
diff --git a/llvm/test/MC/ELF/lit.local.cfg b/llvm/test/MC/ELF/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/MC/ELF/lit.local.cfg
+++ b/llvm/test/MC/ELF/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/MachO/AArch64/lit.local.cfg b/llvm/test/MC/MachO/AArch64/lit.local.cfg
index 9a66a00..cec29af 100644
--- a/llvm/test/MC/MachO/AArch64/lit.local.cfg
+++ b/llvm/test/MC/MachO/AArch64/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'AArch64' in targets:
+if not 'AArch64' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/MachO/ARM/lit.local.cfg b/llvm/test/MC/MachO/ARM/lit.local.cfg
index 8a3ba96..98c6700 100644
--- a/llvm/test/MC/MachO/ARM/lit.local.cfg
+++ b/llvm/test/MC/MachO/ARM/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'ARM' in targets:
+if not 'ARM' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/MachO/lit.local.cfg b/llvm/test/MC/MachO/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/MC/MachO/lit.local.cfg
+++ b/llvm/test/MC/MachO/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/Mips/lit.local.cfg b/llvm/test/MC/Mips/lit.local.cfg
index 1fa54b4..a3183a2 100644
--- a/llvm/test/MC/Mips/lit.local.cfg
+++ b/llvm/test/MC/Mips/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'Mips' in targets:
+if not 'Mips' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/PowerPC/lit.local.cfg b/llvm/test/MC/PowerPC/lit.local.cfg
index 193ebeb..0913324 100644
--- a/llvm/test/MC/PowerPC/lit.local.cfg
+++ b/llvm/test/MC/PowerPC/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'PowerPC' in targets:
+if not 'PowerPC' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/Sparc/lit.local.cfg b/llvm/test/MC/Sparc/lit.local.cfg
index 4d344fa..fa6a54e 100644
--- a/llvm/test/MC/Sparc/lit.local.cfg
+++ b/llvm/test/MC/Sparc/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'Sparc' in targets:
+if not 'Sparc' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/SystemZ/lit.local.cfg b/llvm/test/MC/SystemZ/lit.local.cfg
index b12af09..5c02dd3 100644
--- a/llvm/test/MC/SystemZ/lit.local.cfg
+++ b/llvm/test/MC/SystemZ/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'SystemZ' in targets:
+if not 'SystemZ' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/X86/AlignedBundling/lit.local.cfg b/llvm/test/MC/X86/AlignedBundling/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/MC/X86/AlignedBundling/lit.local.cfg
+++ b/llvm/test/MC/X86/AlignedBundling/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/MC/X86/lit.local.cfg b/llvm/test/MC/X86/lit.local.cfg
index 19840aa..c8625f4 100644
--- a/llvm/test/MC/X86/lit.local.cfg
+++ b/llvm/test/MC/X86/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Object/ARM/lit.local.cfg b/llvm/test/Object/ARM/lit.local.cfg
index 5fc35d8..236e1d3 100644
--- a/llvm/test/Object/ARM/lit.local.cfg
+++ b/llvm/test/Object/ARM/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'ARM' in targets:
+if not 'ARM' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Object/Mips/lit.local.cfg b/llvm/test/Object/Mips/lit.local.cfg
index 88262fb..7d12f7a 100644
--- a/llvm/test/Object/Mips/lit.local.cfg
+++ b/llvm/test/Object/Mips/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'Mips' in targets:
+if not 'Mips' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Object/X86/lit.local.cfg b/llvm/test/Object/X86/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/Object/X86/lit.local.cfg
+++ b/llvm/test/Object/X86/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Other/X86/lit.local.cfg b/llvm/test/Other/X86/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/Other/X86/lit.local.cfg
+++ b/llvm/test/Other/X86/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/AtomicExpandLoadLinked/ARM/lit.local.cfg b/llvm/test/Transforms/AtomicExpandLoadLinked/ARM/lit.local.cfg
index 8a3ba96..98c6700 100644
--- a/llvm/test/Transforms/AtomicExpandLoadLinked/ARM/lit.local.cfg
+++ b/llvm/test/Transforms/AtomicExpandLoadLinked/ARM/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'ARM' in targets:
+if not 'ARM' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/BBVectorize/lit.local.cfg b/llvm/test/Transforms/BBVectorize/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/Transforms/BBVectorize/lit.local.cfg
+++ b/llvm/test/Transforms/BBVectorize/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/CodeGenPrepare/X86/lit.local.cfg b/llvm/test/Transforms/CodeGenPrepare/X86/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/Transforms/CodeGenPrepare/X86/lit.local.cfg
+++ b/llvm/test/Transforms/CodeGenPrepare/X86/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/ConstantHoisting/AArch64/lit.local.cfg b/llvm/test/Transforms/ConstantHoisting/AArch64/lit.local.cfg
index c420349..7184443 100644
--- a/llvm/test/Transforms/ConstantHoisting/AArch64/lit.local.cfg
+++ b/llvm/test/Transforms/ConstantHoisting/AArch64/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'AArch64' in targets:
+if not 'AArch64' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/ConstantHoisting/PowerPC/lit.local.cfg b/llvm/test/Transforms/ConstantHoisting/PowerPC/lit.local.cfg
index 2e46300..5d33887 100644
--- a/llvm/test/Transforms/ConstantHoisting/PowerPC/lit.local.cfg
+++ b/llvm/test/Transforms/ConstantHoisting/PowerPC/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'PowerPC' in targets:
+if not 'PowerPC' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/ConstantHoisting/X86/lit.local.cfg b/llvm/test/Transforms/ConstantHoisting/X86/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/Transforms/ConstantHoisting/X86/lit.local.cfg
+++ b/llvm/test/Transforms/ConstantHoisting/X86/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/GlobalMerge/AArch64/lit.local.cfg b/llvm/test/Transforms/GlobalMerge/AArch64/lit.local.cfg
index 9a66a00..cec29af 100644
--- a/llvm/test/Transforms/GlobalMerge/AArch64/lit.local.cfg
+++ b/llvm/test/Transforms/GlobalMerge/AArch64/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'AArch64' in targets:
+if not 'AArch64' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/GlobalMerge/ARM/lit.local.cfg b/llvm/test/Transforms/GlobalMerge/ARM/lit.local.cfg
index 8a3ba96..98c6700 100644
--- a/llvm/test/Transforms/GlobalMerge/ARM/lit.local.cfg
+++ b/llvm/test/Transforms/GlobalMerge/ARM/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'ARM' in targets:
+if not 'ARM' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/LoopIdiom/X86/lit.local.cfg b/llvm/test/Transforms/LoopIdiom/X86/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/Transforms/LoopIdiom/X86/lit.local.cfg
+++ b/llvm/test/Transforms/LoopIdiom/X86/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/LoopStrengthReduce/AArch64/lit.local.cfg b/llvm/test/Transforms/LoopStrengthReduce/AArch64/lit.local.cfg
index 6642d28..675f48e 100644
--- a/llvm/test/Transforms/LoopStrengthReduce/AArch64/lit.local.cfg
+++ b/llvm/test/Transforms/LoopStrengthReduce/AArch64/lit.local.cfg
@@ -1,5 +1,4 @@
config.suffixes = ['.ll']
-targets = set(config.root.targets_to_build.split())
-if not 'AArch64' in targets:
+if not 'AArch64' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/LoopStrengthReduce/ARM/lit.local.cfg b/llvm/test/Transforms/LoopStrengthReduce/ARM/lit.local.cfg
index 8a3ba96..98c6700 100644
--- a/llvm/test/Transforms/LoopStrengthReduce/ARM/lit.local.cfg
+++ b/llvm/test/Transforms/LoopStrengthReduce/ARM/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'ARM' in targets:
+if not 'ARM' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/LoopStrengthReduce/X86/lit.local.cfg b/llvm/test/Transforms/LoopStrengthReduce/X86/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/Transforms/LoopStrengthReduce/X86/lit.local.cfg
+++ b/llvm/test/Transforms/LoopStrengthReduce/X86/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/LoopUnroll/PowerPC/lit.local.cfg b/llvm/test/Transforms/LoopUnroll/PowerPC/lit.local.cfg
index 2e46300..5d33887 100644
--- a/llvm/test/Transforms/LoopUnroll/PowerPC/lit.local.cfg
+++ b/llvm/test/Transforms/LoopUnroll/PowerPC/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'PowerPC' in targets:
+if not 'PowerPC' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/LoopUnroll/X86/lit.local.cfg b/llvm/test/Transforms/LoopUnroll/X86/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/Transforms/LoopUnroll/X86/lit.local.cfg
+++ b/llvm/test/Transforms/LoopUnroll/X86/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/LoopVectorize/AArch64/lit.local.cfg b/llvm/test/Transforms/LoopVectorize/AArch64/lit.local.cfg
index a24a728..937cffb 100644
--- a/llvm/test/Transforms/LoopVectorize/AArch64/lit.local.cfg
+++ b/llvm/test/Transforms/LoopVectorize/AArch64/lit.local.cfg
@@ -1,6 +1,5 @@
config.suffixes = ['.ll']
-targets = set(config.root.targets_to_build.split())
-if not 'AArch64' in targets:
+if not 'AArch64' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/LoopVectorize/ARM/lit.local.cfg b/llvm/test/Transforms/LoopVectorize/ARM/lit.local.cfg
index 8a3ba96..98c6700 100644
--- a/llvm/test/Transforms/LoopVectorize/ARM/lit.local.cfg
+++ b/llvm/test/Transforms/LoopVectorize/ARM/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'ARM' in targets:
+if not 'ARM' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/LoopVectorize/PowerPC/lit.local.cfg b/llvm/test/Transforms/LoopVectorize/PowerPC/lit.local.cfg
index 2e46300..5d33887 100644
--- a/llvm/test/Transforms/LoopVectorize/PowerPC/lit.local.cfg
+++ b/llvm/test/Transforms/LoopVectorize/PowerPC/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'PowerPC' in targets:
+if not 'PowerPC' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/LoopVectorize/X86/lit.local.cfg b/llvm/test/Transforms/LoopVectorize/X86/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/Transforms/LoopVectorize/X86/lit.local.cfg
+++ b/llvm/test/Transforms/LoopVectorize/X86/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/LoopVectorize/XCore/lit.local.cfg b/llvm/test/Transforms/LoopVectorize/XCore/lit.local.cfg
index 4d17d46..bb48713 100644
--- a/llvm/test/Transforms/LoopVectorize/XCore/lit.local.cfg
+++ b/llvm/test/Transforms/LoopVectorize/XCore/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'XCore' in targets:
+if not 'XCore' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/SLPVectorizer/AArch64/lit.local.cfg b/llvm/test/Transforms/SLPVectorizer/AArch64/lit.local.cfg
index c420349..7184443 100644
--- a/llvm/test/Transforms/SLPVectorizer/AArch64/lit.local.cfg
+++ b/llvm/test/Transforms/SLPVectorizer/AArch64/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'AArch64' in targets:
+if not 'AArch64' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/SLPVectorizer/ARM/lit.local.cfg b/llvm/test/Transforms/SLPVectorizer/ARM/lit.local.cfg
index 5fc35d8..236e1d3 100644
--- a/llvm/test/Transforms/SLPVectorizer/ARM/lit.local.cfg
+++ b/llvm/test/Transforms/SLPVectorizer/ARM/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'ARM' in targets:
+if not 'ARM' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/SLPVectorizer/R600/lit.local.cfg b/llvm/test/Transforms/SLPVectorizer/R600/lit.local.cfg
index 9e0ab99..4086e8d 100644
--- a/llvm/test/Transforms/SLPVectorizer/R600/lit.local.cfg
+++ b/llvm/test/Transforms/SLPVectorizer/R600/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'R600' in targets:
+if not 'R600' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/SLPVectorizer/X86/lit.local.cfg b/llvm/test/Transforms/SLPVectorizer/X86/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/Transforms/SLPVectorizer/X86/lit.local.cfg
+++ b/llvm/test/Transforms/SLPVectorizer/X86/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/SLPVectorizer/XCore/lit.local.cfg b/llvm/test/Transforms/SLPVectorizer/XCore/lit.local.cfg
index 4d17d46..bb48713 100644
--- a/llvm/test/Transforms/SLPVectorizer/XCore/lit.local.cfg
+++ b/llvm/test/Transforms/SLPVectorizer/XCore/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'XCore' in targets:
+if not 'XCore' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/SeparateConstOffsetFromGEP/NVPTX/lit.local.cfg b/llvm/test/Transforms/SeparateConstOffsetFromGEP/NVPTX/lit.local.cfg
index 40532cd..a5e90f8 100644
--- a/llvm/test/Transforms/SeparateConstOffsetFromGEP/NVPTX/lit.local.cfg
+++ b/llvm/test/Transforms/SeparateConstOffsetFromGEP/NVPTX/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'NVPTX' in targets:
+if not 'NVPTX' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/SimplifyCFG/SPARC/lit.local.cfg b/llvm/test/Transforms/SimplifyCFG/SPARC/lit.local.cfg
index 4d344fa..fa6a54e 100644
--- a/llvm/test/Transforms/SimplifyCFG/SPARC/lit.local.cfg
+++ b/llvm/test/Transforms/SimplifyCFG/SPARC/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'Sparc' in targets:
+if not 'Sparc' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/SimplifyCFG/X86/lit.local.cfg b/llvm/test/Transforms/SimplifyCFG/X86/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/Transforms/SimplifyCFG/X86/lit.local.cfg
+++ b/llvm/test/Transforms/SimplifyCFG/X86/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/TailDup/X86/lit.local.cfg b/llvm/test/Transforms/TailDup/X86/lit.local.cfg
index ba763cf..e71f3cc 100644
--- a/llvm/test/Transforms/TailDup/X86/lit.local.cfg
+++ b/llvm/test/Transforms/TailDup/X86/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/Transforms/TailDup/lit.local.cfg b/llvm/test/Transforms/TailDup/lit.local.cfg
index 19840aa..c8625f4 100644
--- a/llvm/test/Transforms/TailDup/lit.local.cfg
+++ b/llvm/test/Transforms/TailDup/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/lit.cfg b/llvm/test/lit.cfg
index 2815a61..cae708b 100644
--- a/llvm/test/lit.cfg
+++ b/llvm/test/lit.cfg
@@ -265,6 +265,10 @@
tool_path = llvm_tools_dir + '/' + tool_name
config.substitutions.append((pattern, tool_pipe + tool_path))
+### Targets
+
+config.targets = frozenset(config.targets_to_build.split())
+
### Features
# Shell execution
diff --git a/llvm/test/tools/llvm-objdump/lit.local.cfg b/llvm/test/tools/llvm-objdump/lit.local.cfg
index 19840aa..c8625f4 100644
--- a/llvm/test/tools/llvm-objdump/lit.local.cfg
+++ b/llvm/test/tools/llvm-objdump/lit.local.cfg
@@ -1,3 +1,2 @@
-targets = set(config.root.targets_to_build.split())
-if not 'X86' in targets:
+if not 'X86' in config.root.targets:
config.unsupported = True
diff --git a/llvm/test/tools/llvm-readobj/ARM/lit.local.cfg b/llvm/test/tools/llvm-readobj/ARM/lit.local.cfg
index 8a3ba96..98c6700 100644
--- a/llvm/test/tools/llvm-readobj/ARM/lit.local.cfg
+++ b/llvm/test/tools/llvm-readobj/ARM/lit.local.cfg
@@ -1,4 +1,3 @@
-targets = set(config.root.targets_to_build.split())
-if not 'ARM' in targets:
+if not 'ARM' in config.root.targets:
config.unsupported = True