Replace all instances of dg.exp file with lit.local.cfg, since all tests are run with LIT now and now Dejagnu. dg.exp is no longer needed.

Patch reviewed by Daniel Dunbar. It will be followed by additional cleanup patches.

llvm-svn: 150664

36 files changed, 222 insertions, 88 deletions

diff --git a/llvm/test/CodeGen/ARM/dg.exp b/llvm/test/CodeGen/ARM/dg.exp
deleted file mode 100644
index 3ff359aab39..00000000000
--- a/llvm/test/CodeGen/ARM/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target ARM] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
-}
diff --git a/llvm/test/CodeGen/ARM/lit.local.cfg b/llvm/test/CodeGen/ARM/lit.local.cfg
new file mode 100644
index 00000000000..dd6c50d4fe4
--- /dev/null
+++ b/llvm/test/CodeGen/ARM/lit.local.cfg
@@ -0,0 +1,13 @@
+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())
+if not 'ARM' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/CodeGen/CBackend/X86/dg.exp b/llvm/test/CodeGen/CBackend/X86/dg.exp
deleted file mode 100644
index 44e3a5eff4a..00000000000
--- a/llvm/test/CodeGen/CBackend/X86/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target X86] && [llvm_supports_target CBackend] } {
-    RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp,s}]]
-}
diff --git a/llvm/test/CodeGen/CBackend/X86/lit.local.cfg b/llvm/test/CodeGen/CBackend/X86/lit.local.cfg
new file mode 100644
index 00000000000..037d8c3910d
--- /dev/null
+++ b/llvm/test/CodeGen/CBackend/X86/lit.local.cfg
@@ -0,0 +1,13 @@
+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())
+if not 'CBackend' in targets or not 'X86' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/CodeGen/CBackend/dg.exp b/llvm/test/CodeGen/CBackend/dg.exp
deleted file mode 100644
index 9d789409d4a..00000000000
--- a/llvm/test/CodeGen/CBackend/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target CBackend] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
-}
diff --git a/llvm/test/CodeGen/CBackend/lit.local.cfg b/llvm/test/CodeGen/CBackend/lit.local.cfg
new file mode 100644
index 00000000000..0dce1702a79
--- /dev/null
+++ b/llvm/test/CodeGen/CBackend/lit.local.cfg
@@ -0,0 +1,13 @@
+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())
+if not 'CBackend' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/CodeGen/CPP/dg.exp b/llvm/test/CodeGen/CPP/dg.exp
deleted file mode 100644
index 3276dcc3275..00000000000
--- a/llvm/test/CodeGen/CPP/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target CppBackend] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
-}
diff --git a/llvm/test/CodeGen/CPP/lit.local.cfg b/llvm/test/CodeGen/CPP/lit.local.cfg
new file mode 100644
index 00000000000..96596d85f6e
--- /dev/null
+++ b/llvm/test/CodeGen/CPP/lit.local.cfg
@@ -0,0 +1,13 @@
+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())
+if not 'CppBackend' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/CodeGen/CellSPU/dg.exp b/llvm/test/CodeGen/CellSPU/dg.exp
deleted file mode 100644
index d41647991a0..00000000000
--- a/llvm/test/CodeGen/CellSPU/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target CellSPU] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
-}
diff --git a/llvm/test/CodeGen/CellSPU/lit.local.cfg b/llvm/test/CodeGen/CellSPU/lit.local.cfg
new file mode 100644
index 00000000000..6ae0972b66c
--- /dev/null
+++ b/llvm/test/CodeGen/CellSPU/lit.local.cfg
@@ -0,0 +1,13 @@
+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())
+if not 'CellSPU' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/CodeGen/Generic/dg.exp b/llvm/test/CodeGen/Generic/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/CodeGen/Generic/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/CodeGen/Generic/lit.local.cfg b/llvm/test/CodeGen/Generic/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/CodeGen/Generic/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/CodeGen/Hexagon/dg.exp b/llvm/test/CodeGen/Hexagon/dg.exp
deleted file mode 100644
index 89f45e6723c..00000000000
--- a/llvm/test/CodeGen/Hexagon/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target Hexagon] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
-}
diff --git a/llvm/test/CodeGen/Hexagon/lit.local.cfg b/llvm/test/CodeGen/Hexagon/lit.local.cfg
new file mode 100644
index 00000000000..ea12f68870e
--- /dev/null
+++ b/llvm/test/CodeGen/Hexagon/lit.local.cfg
@@ -0,0 +1,13 @@
+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())
+if not 'Hexagon' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/CodeGen/MBlaze/dg.exp b/llvm/test/CodeGen/MBlaze/dg.exp
deleted file mode 100644
index bfd5e471574..00000000000
--- a/llvm/test/CodeGen/MBlaze/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target MBlaze] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
-}
diff --git a/llvm/test/CodeGen/MBlaze/lit.local.cfg b/llvm/test/CodeGen/MBlaze/lit.local.cfg
new file mode 100644
index 00000000000..e43df89e196
--- /dev/null
+++ b/llvm/test/CodeGen/MBlaze/lit.local.cfg
@@ -0,0 +1,13 @@
+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())
+if not 'MBlaze' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/CodeGen/MSP430/dg.exp b/llvm/test/CodeGen/MSP430/dg.exp
deleted file mode 100644
index e4ea13a4064..00000000000
--- a/llvm/test/CodeGen/MSP430/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target MSP430] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
-}
diff --git a/llvm/test/CodeGen/MSP430/lit.local.cfg b/llvm/test/CodeGen/MSP430/lit.local.cfg
new file mode 100644
index 00000000000..b9b654deba5
--- /dev/null
+++ b/llvm/test/CodeGen/MSP430/lit.local.cfg
@@ -0,0 +1,13 @@
+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())
+if not 'MSP430' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/CodeGen/Mips/dg.exp b/llvm/test/CodeGen/Mips/dg.exp
deleted file mode 100644
index adb2cac9a6b..00000000000
--- a/llvm/test/CodeGen/Mips/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target Mips] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
-}
diff --git a/llvm/test/CodeGen/Mips/lit.local.cfg b/llvm/test/CodeGen/Mips/lit.local.cfg
new file mode 100644
index 00000000000..e1cd73a3786
--- /dev/null
+++ b/llvm/test/CodeGen/Mips/lit.local.cfg
@@ -0,0 +1,13 @@
+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())
+if not 'Mips' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/CodeGen/PTX/dg.exp b/llvm/test/CodeGen/PTX/dg.exp
deleted file mode 100644
index 2c304b57741..00000000000
--- a/llvm/test/CodeGen/PTX/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target PTX] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
-}
diff --git a/llvm/test/CodeGen/PTX/lit.local.cfg b/llvm/test/CodeGen/PTX/lit.local.cfg
new file mode 100644
index 00000000000..73990890766
--- /dev/null
+++ b/llvm/test/CodeGen/PTX/lit.local.cfg
@@ -0,0 +1,13 @@
+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())
+if not 'PTX' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/CodeGen/PowerPC/dg.exp b/llvm/test/CodeGen/PowerPC/dg.exp
deleted file mode 100644
index 9e50b558aa3..00000000000
--- a/llvm/test/CodeGen/PowerPC/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target PowerPC] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
-}
diff --git a/llvm/test/CodeGen/PowerPC/lit.local.cfg b/llvm/test/CodeGen/PowerPC/lit.local.cfg
new file mode 100644
index 00000000000..5c7f2677f35
--- /dev/null
+++ b/llvm/test/CodeGen/PowerPC/lit.local.cfg
@@ -0,0 +1,13 @@
+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())
+if not 'PowerPC' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/CodeGen/SPARC/dg.exp b/llvm/test/CodeGen/SPARC/dg.exp
deleted file mode 100644
index 6c0a9975fe4..00000000000
--- a/llvm/test/CodeGen/SPARC/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target Sparc] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
-}
diff --git a/llvm/test/CodeGen/SPARC/lit.local.cfg b/llvm/test/CodeGen/SPARC/lit.local.cfg
new file mode 100644
index 00000000000..ba81a16057c
--- /dev/null
+++ b/llvm/test/CodeGen/SPARC/lit.local.cfg
@@ -0,0 +1,13 @@
+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())
+if not 'Sparc' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/CodeGen/Thumb/dg.exp b/llvm/test/CodeGen/Thumb/dg.exp
deleted file mode 100644
index 3ff359aab39..00000000000
--- a/llvm/test/CodeGen/Thumb/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target ARM] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
-}
diff --git a/llvm/test/CodeGen/Thumb/lit.local.cfg b/llvm/test/CodeGen/Thumb/lit.local.cfg
new file mode 100644
index 00000000000..dd6c50d4fe4
--- /dev/null
+++ b/llvm/test/CodeGen/Thumb/lit.local.cfg
@@ -0,0 +1,13 @@
+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())
+if not 'ARM' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/CodeGen/Thumb2/dg.exp b/llvm/test/CodeGen/Thumb2/dg.exp
deleted file mode 100644
index 3ff359aab39..00000000000
--- a/llvm/test/CodeGen/Thumb2/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target ARM] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
-}
diff --git a/llvm/test/CodeGen/Thumb2/lit.local.cfg b/llvm/test/CodeGen/Thumb2/lit.local.cfg
new file mode 100644
index 00000000000..dd6c50d4fe4
--- /dev/null
+++ b/llvm/test/CodeGen/Thumb2/lit.local.cfg
@@ -0,0 +1,13 @@
+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())
+if not 'ARM' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/CodeGen/X86/GC/dg.exp b/llvm/test/CodeGen/X86/GC/dg.exp
deleted file mode 100644
index 629a1477361..00000000000
--- a/llvm/test/CodeGen/X86/GC/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target X86] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
-}
diff --git a/llvm/test/CodeGen/X86/GC/lit.local.cfg b/llvm/test/CodeGen/X86/GC/lit.local.cfg
new file mode 100644
index 00000000000..b05ed3c77c1
--- /dev/null
+++ b/llvm/test/CodeGen/X86/GC/lit.local.cfg
@@ -0,0 +1,13 @@
+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())
+if not 'X86' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/CodeGen/X86/dg.exp b/llvm/test/CodeGen/X86/dg.exp
deleted file mode 100644
index 629a1477361..00000000000
--- a/llvm/test/CodeGen/X86/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target X86] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
-}
diff --git a/llvm/test/CodeGen/X86/lit.local.cfg b/llvm/test/CodeGen/X86/lit.local.cfg
new file mode 100644
index 00000000000..b05ed3c77c1
--- /dev/null
+++ b/llvm/test/CodeGen/X86/lit.local.cfg
@@ -0,0 +1,13 @@
+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())
+if not 'X86' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/CodeGen/XCore/dg.exp b/llvm/test/CodeGen/XCore/dg.exp
deleted file mode 100644
index 7110eabb3a5..00000000000
--- a/llvm/test/CodeGen/XCore/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target XCore] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
-}
diff --git a/llvm/test/CodeGen/XCore/lit.local.cfg b/llvm/test/CodeGen/XCore/lit.local.cfg
new file mode 100644
index 00000000000..c697912418e
--- /dev/null
+++ b/llvm/test/CodeGen/XCore/lit.local.cfg
@@ -0,0 +1,13 @@
+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())
+if not 'XCore' in targets:
+    config.unsupported = True
+