19 files changed, 5 insertions, 42 deletions
diff --git a/llvm/test/CodeGen/AArch64/lit.local.cfg b/llvm/test/CodeGen/AArch64/lit.local.cfg
index c5ce2411ed4..9a66a00189e 100644
--- a/llvm/test/CodeGen/AArch64/lit.local.cfg
+++ b/llvm/test/CodeGen/AArch64/lit.local.cfg
@@ -1,5 +1,3 @@
-config.suffixes = ['.ll', '.c', '.cpp']
-
 targets = set(config.root.targets_to_build.split())
 if not 'AArch64' in targets:
     config.unsupported = True
diff --git a/llvm/test/CodeGen/ARM/lit.local.cfg b/llvm/test/CodeGen/ARM/lit.local.cfg
index 4d75f581a1d..8a3ba96497e 100644
--- a/llvm/test/CodeGen/ARM/lit.local.cfg
+++ b/llvm/test/CodeGen/ARM/lit.local.cfg
@@ -1,5 +1,3 @@
-config.suffixes = ['.ll', '.c', '.cpp', '.test']
-
 targets = set(config.root.targets_to_build.split())
 if not 'ARM' in targets:
     config.unsupported = True
diff --git a/llvm/test/CodeGen/CPP/lit.local.cfg b/llvm/test/CodeGen/CPP/lit.local.cfg
index 4d4b4a4a7e2..4063dd1b861 100644
--- a/llvm/test/CodeGen/CPP/lit.local.cfg
+++ b/llvm/test/CodeGen/CPP/lit.local.cfg
@@ -1,5 +1,3 @@
-config.suffixes = ['.ll', '.c', '.cpp']
-
 targets = set(config.root.targets_to_build.split())
 if not 'CppBackend' in targets:
     config.unsupported = True
diff --git a/llvm/test/CodeGen/Generic/lit.local.cfg b/llvm/test/CodeGen/Generic/lit.local.cfg
deleted file mode 100644
index 19eebc0ac7a..00000000000
--- a/llvm/test/CodeGen/Generic/lit.local.cfg
+++ /dev/null
@@ -1 +0,0 @@
-config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/CodeGen/Hexagon/lit.local.cfg b/llvm/test/CodeGen/Hexagon/lit.local.cfg
index 24324b2792e..e96bab818a3 100644
--- a/llvm/test/CodeGen/Hexagon/lit.local.cfg
+++ b/llvm/test/CodeGen/Hexagon/lit.local.cfg
@@ -1,5 +1,3 @@
-config.suffixes = ['.ll', '.c', '.cpp']
-
 targets = set(config.root.targets_to_build.split())
 if not 'Hexagon' in targets:
     config.unsupported = True
diff --git a/llvm/test/CodeGen/MSP430/lit.local.cfg b/llvm/test/CodeGen/MSP430/lit.local.cfg
index 0ca9fc9c691..a18fe6f927d 100644
--- a/llvm/test/CodeGen/MSP430/lit.local.cfg
+++ b/llvm/test/CodeGen/MSP430/lit.local.cfg
@@ -1,5 +1,3 @@
-config.suffixes = ['.ll', '.c', '.cpp', '.test']
-
 targets = set(config.root.targets_to_build.split())
 if not 'MSP430' in targets:
     config.unsupported = True
diff --git a/llvm/test/CodeGen/Mips/lit.local.cfg b/llvm/test/CodeGen/Mips/lit.local.cfg
index e157c540b53..1fa54b428cd 100644
--- a/llvm/test/CodeGen/Mips/lit.local.cfg
+++ b/llvm/test/CodeGen/Mips/lit.local.cfg
@@ -1,5 +1,3 @@
-config.suffixes = ['.ll', '.c', '.cpp', '.test']
-
 targets = set(config.root.targets_to_build.split())
 if not 'Mips' in targets:
     config.unsupported = True
diff --git a/llvm/test/CodeGen/NVPTX/lit.local.cfg b/llvm/test/CodeGen/NVPTX/lit.local.cfg
index 7180c841d6e..85cf8c2c8c0 100644
--- a/llvm/test/CodeGen/NVPTX/lit.local.cfg
+++ b/llvm/test/CodeGen/NVPTX/lit.local.cfg
@@ -1,5 +1,3 @@
-config.suffixes = ['.ll', '.c', '.cpp']
-
 targets = set(config.root.targets_to_build.split())
 if not 'NVPTX' in targets:
     config.unsupported = True
diff --git a/llvm/test/CodeGen/PowerPC/lit.local.cfg b/llvm/test/CodeGen/PowerPC/lit.local.cfg
index aaa31d93d5f..2e463005586 100644
--- a/llvm/test/CodeGen/PowerPC/lit.local.cfg
+++ b/llvm/test/CodeGen/PowerPC/lit.local.cfg
@@ -1,5 +1,3 @@
-config.suffixes = ['.ll', '.c', '.cpp', '.test']
-
 targets = set(config.root.targets_to_build.split())
 if not 'PowerPC' in targets:
     config.unsupported = True
diff --git a/llvm/test/CodeGen/R600/lit.local.cfg b/llvm/test/CodeGen/R600/lit.local.cfg
index 36ee493e594..2d8930ad0e8 100644
--- a/llvm/test/CodeGen/R600/lit.local.cfg
+++ b/llvm/test/CodeGen/R600/lit.local.cfg
@@ -1,13 +1,3 @@
-config.suffixes = ['.ll', '.c', '.cpp']
-
-def getRoot(config):
-    if not config.parent:
-        return config
-    return getRoot(config.parent)
-
-root = getRoot(config)
-
-targets = set(root.targets_to_build.split())
+targets = set(config.root.targets_to_build.split())
 if not 'R600' in targets:
     config.unsupported = True
-
diff --git a/llvm/test/CodeGen/SI/lit.local.cfg b/llvm/test/CodeGen/SI/lit.local.cfg
new file mode 100644
index 00000000000..2d8930ad0e8
--- /dev/null
+++ b/llvm/test/CodeGen/SI/lit.local.cfg
@@ -0,0 +1,3 @@
+targets = set(config.root.targets_to_build.split())
+if not 'R600' in targets:
+    config.unsupported = True
diff --git a/llvm/test/CodeGen/SI/sanity.ll b/llvm/test/CodeGen/SI/sanity.ll
index 62cdcf5eca2..80335fb3354 100644
--- a/llvm/test/CodeGen/SI/sanity.ll
+++ b/llvm/test/CodeGen/SI/sanity.ll
@@ -1,4 +1,5 @@
 ;RUN: llc < %s -march=r600 -mcpu=SI | FileCheck %s
+;XFAIL: *
 
 ; CHECK: S_ENDPGM
 
diff --git a/llvm/test/CodeGen/SPARC/lit.local.cfg b/llvm/test/CodeGen/SPARC/lit.local.cfg
index 6f30a879796..4d344fa91a9 100644
--- a/llvm/test/CodeGen/SPARC/lit.local.cfg
+++ b/llvm/test/CodeGen/SPARC/lit.local.cfg
@@ -1,5 +1,3 @@
-config.suffixes = ['.ll', '.c', '.cpp', '.test']
-
 targets = set(config.root.targets_to_build.split())
 if not 'Sparc' in targets:
     config.unsupported = True
diff --git a/llvm/test/CodeGen/SystemZ/lit.local.cfg b/llvm/test/CodeGen/SystemZ/lit.local.cfg
index 79528d178f2..b12af09434b 100644
--- a/llvm/test/CodeGen/SystemZ/lit.local.cfg
+++ b/llvm/test/CodeGen/SystemZ/lit.local.cfg
@@ -1,5 +1,3 @@
-config.suffixes = ['.ll', '.c', '.cpp']
-
 targets = set(config.root.targets_to_build.split())
 if not 'SystemZ' in targets:
     config.unsupported = True
diff --git a/llvm/test/CodeGen/Thumb/lit.local.cfg b/llvm/test/CodeGen/Thumb/lit.local.cfg
index 4d75f581a1d..8a3ba96497e 100644
--- a/llvm/test/CodeGen/Thumb/lit.local.cfg
+++ b/llvm/test/CodeGen/Thumb/lit.local.cfg
@@ -1,5 +1,3 @@
-config.suffixes = ['.ll', '.c', '.cpp', '.test']
-
 targets = set(config.root.targets_to_build.split())
 if not 'ARM' in targets:
     config.unsupported = True
diff --git a/llvm/test/CodeGen/Thumb2/lit.local.cfg b/llvm/test/CodeGen/Thumb2/lit.local.cfg
index cb77b09ef4a..8a3ba96497e 100644
--- a/llvm/test/CodeGen/Thumb2/lit.local.cfg
+++ b/llvm/test/CodeGen/Thumb2/lit.local.cfg
@@ -1,5 +1,3 @@
-config.suffixes = ['.ll', '.c', '.cpp']
-
 targets = set(config.root.targets_to_build.split())
 if not 'ARM' in 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 a8ad0f1a28b..ba763cf03ff 100644
--- a/llvm/test/CodeGen/X86/GC/lit.local.cfg
+++ b/llvm/test/CodeGen/X86/GC/lit.local.cfg
@@ -1,5 +1,3 @@
-config.suffixes = ['.ll', '.c', '.cpp']
-
 targets = set(config.root.targets_to_build.split())
 if not 'X86' in targets:
     config.unsupported = True
diff --git a/llvm/test/CodeGen/X86/lit.local.cfg b/llvm/test/CodeGen/X86/lit.local.cfg
index 9d285bf4e23..ba763cf03ff 100644
--- a/llvm/test/CodeGen/X86/lit.local.cfg
+++ b/llvm/test/CodeGen/X86/lit.local.cfg
@@ -1,5 +1,3 @@
-config.suffixes = ['.ll', '.c', '.cpp', '.test']
-
 targets = set(config.root.targets_to_build.split())
 if not 'X86' in targets:
     config.unsupported = True
diff --git a/llvm/test/CodeGen/XCore/lit.local.cfg b/llvm/test/CodeGen/XCore/lit.local.cfg
index 8756f37fe8a..3e84c1befea 100644
--- a/llvm/test/CodeGen/XCore/lit.local.cfg
+++ b/llvm/test/CodeGen/XCore/lit.local.cfg
@@ -1,5 +1,3 @@
-config.suffixes = ['.ll', '.c', '.cpp', '.test']
-
 targets = set(config.root.targets_to_build.split())
 if not 'XCore' in targets:
     config.unsupported = True