From 24ec2e5a72d7fca58f8ae2b3c01501a9927ef04e Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Fri, 16 Aug 2013 00:37:11 +0000 Subject: [tests] Cleanup initialization of test suffixes. - Instead of setting the suffixes in a bunch of places, just set one master list in the top-level config. We now only modify the suffix list in a few suites that have one particular unique suffix (.ml, .mc, .yaml, .td, .py). - Aside from removing the need for a bunch of lit.local.cfg files, this enables 4 tests that were inadvertently being skipped (one in Transforms/BranchFolding, a .s file each in DebugInfo/AArch64 and CodeGen/PowerPC, and one in CodeGen/SI which is now failing and has been XFAILED). - This commit also fixes a bunch of config files to use config.root instead of older copy-pasted code. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188513 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Analysis/BasicAA/lit.local.cfg | 1 - test/Analysis/BlockFrequencyInfo/lit.local.cfg | 1 - test/Analysis/BranchProbabilityInfo/lit.local.cfg | 1 - test/Analysis/CallGraph/lit.local.cfg | 1 - test/Analysis/CostModel/ARM/lit.local.cfg | 2 -- test/Analysis/CostModel/PowerPC/lit.local.cfg | 2 -- test/Analysis/CostModel/X86/lit.local.cfg | 2 -- test/Analysis/CostModel/lit.local.cfg | 1 - test/Analysis/DependenceAnalysis/lit.local.cfg | 1 - test/Analysis/Dominators/lit.local.cfg | 1 - test/Analysis/GlobalsModRef/lit.local.cfg | 1 - test/Analysis/LoopInfo/lit.local.cfg | 1 - test/Analysis/MemoryDependenceAnalysis/lit.local.cfg | 1 - test/Analysis/PostDominators/lit.local.cfg | 1 - test/Analysis/Profiling/lit.local.cfg | 11 +---------- test/Analysis/RegionInfo/lit.local.cfg | 1 - test/Analysis/ScalarEvolution/lit.local.cfg | 1 - test/Analysis/TypeBasedAliasAnalysis/lit.local.cfg | 1 - 18 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 test/Analysis/BasicAA/lit.local.cfg delete mode 100644 test/Analysis/BlockFrequencyInfo/lit.local.cfg delete mode 100644 test/Analysis/BranchProbabilityInfo/lit.local.cfg delete mode 100644 test/Analysis/CallGraph/lit.local.cfg delete mode 100644 test/Analysis/CostModel/lit.local.cfg delete mode 100644 test/Analysis/DependenceAnalysis/lit.local.cfg delete mode 100644 test/Analysis/Dominators/lit.local.cfg delete mode 100644 test/Analysis/GlobalsModRef/lit.local.cfg delete mode 100644 test/Analysis/LoopInfo/lit.local.cfg delete mode 100644 test/Analysis/MemoryDependenceAnalysis/lit.local.cfg delete mode 100644 test/Analysis/PostDominators/lit.local.cfg delete mode 100644 test/Analysis/RegionInfo/lit.local.cfg delete mode 100644 test/Analysis/ScalarEvolution/lit.local.cfg delete mode 100644 test/Analysis/TypeBasedAliasAnalysis/lit.local.cfg (limited to 'test/Analysis') diff --git a/test/Analysis/BasicAA/lit.local.cfg b/test/Analysis/BasicAA/lit.local.cfg deleted file mode 100644 index 19eebc0..0000000 --- a/test/Analysis/BasicAA/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll', '.c', '.cpp'] diff --git a/test/Analysis/BlockFrequencyInfo/lit.local.cfg b/test/Analysis/BlockFrequencyInfo/lit.local.cfg deleted file mode 100644 index 19eebc0..0000000 --- a/test/Analysis/BlockFrequencyInfo/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll', '.c', '.cpp'] diff --git a/test/Analysis/BranchProbabilityInfo/lit.local.cfg b/test/Analysis/BranchProbabilityInfo/lit.local.cfg deleted file mode 100644 index 19eebc0..0000000 --- a/test/Analysis/BranchProbabilityInfo/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll', '.c', '.cpp'] diff --git a/test/Analysis/CallGraph/lit.local.cfg b/test/Analysis/CallGraph/lit.local.cfg deleted file mode 100644 index 19eebc0..0000000 --- a/test/Analysis/CallGraph/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll', '.c', '.cpp'] diff --git a/test/Analysis/CostModel/ARM/lit.local.cfg b/test/Analysis/CostModel/ARM/lit.local.cfg index cb77b09..8a3ba96 100644 --- a/test/Analysis/CostModel/ARM/lit.local.cfg +++ b/test/Analysis/CostModel/ARM/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/test/Analysis/CostModel/PowerPC/lit.local.cfg b/test/Analysis/CostModel/PowerPC/lit.local.cfg index 4019eca..2e46300 100644 --- a/test/Analysis/CostModel/PowerPC/lit.local.cfg +++ b/test/Analysis/CostModel/PowerPC/lit.local.cfg @@ -1,5 +1,3 @@ -config.suffixes = ['.ll', '.c', '.cpp'] - targets = set(config.root.targets_to_build.split()) if not 'PowerPC' in targets: config.unsupported = True diff --git a/test/Analysis/CostModel/X86/lit.local.cfg b/test/Analysis/CostModel/X86/lit.local.cfg index a8ad0f1..ba763cf 100644 --- a/test/Analysis/CostModel/X86/lit.local.cfg +++ b/test/Analysis/CostModel/X86/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/test/Analysis/CostModel/lit.local.cfg b/test/Analysis/CostModel/lit.local.cfg deleted file mode 100644 index 19eebc0..0000000 --- a/test/Analysis/CostModel/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll', '.c', '.cpp'] diff --git a/test/Analysis/DependenceAnalysis/lit.local.cfg b/test/Analysis/DependenceAnalysis/lit.local.cfg deleted file mode 100644 index c6106e4..0000000 --- a/test/Analysis/DependenceAnalysis/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll'] diff --git a/test/Analysis/Dominators/lit.local.cfg b/test/Analysis/Dominators/lit.local.cfg deleted file mode 100644 index 19eebc0..0000000 --- a/test/Analysis/Dominators/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll', '.c', '.cpp'] diff --git a/test/Analysis/GlobalsModRef/lit.local.cfg b/test/Analysis/GlobalsModRef/lit.local.cfg deleted file mode 100644 index 19eebc0..0000000 --- a/test/Analysis/GlobalsModRef/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll', '.c', '.cpp'] diff --git a/test/Analysis/LoopInfo/lit.local.cfg b/test/Analysis/LoopInfo/lit.local.cfg deleted file mode 100644 index 19eebc0..0000000 --- a/test/Analysis/LoopInfo/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll', '.c', '.cpp'] diff --git a/test/Analysis/MemoryDependenceAnalysis/lit.local.cfg b/test/Analysis/MemoryDependenceAnalysis/lit.local.cfg deleted file mode 100644 index c6106e4..0000000 --- a/test/Analysis/MemoryDependenceAnalysis/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll'] diff --git a/test/Analysis/PostDominators/lit.local.cfg b/test/Analysis/PostDominators/lit.local.cfg deleted file mode 100644 index 19eebc0..0000000 --- a/test/Analysis/PostDominators/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll', '.c', '.cpp'] diff --git a/test/Analysis/Profiling/lit.local.cfg b/test/Analysis/Profiling/lit.local.cfg index d40fa4f..5481b13 100644 --- a/test/Analysis/Profiling/lit.local.cfg +++ b/test/Analysis/Profiling/lit.local.cfg @@ -1,11 +1,2 @@ -config.suffixes = ['.ll', '.c', '.cpp'] - -def getRoot(config): - if not config.parent: - return config - return getRoot(config.parent) - -root = getRoot(config) - -if 'hexagon' in root.target_triple: +if 'hexagon' in config.root.target_triple: config.unsupported = True diff --git a/test/Analysis/RegionInfo/lit.local.cfg b/test/Analysis/RegionInfo/lit.local.cfg deleted file mode 100644 index 19eebc0..0000000 --- a/test/Analysis/RegionInfo/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll', '.c', '.cpp'] diff --git a/test/Analysis/ScalarEvolution/lit.local.cfg b/test/Analysis/ScalarEvolution/lit.local.cfg deleted file mode 100644 index c6106e4..0000000 --- a/test/Analysis/ScalarEvolution/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll'] diff --git a/test/Analysis/TypeBasedAliasAnalysis/lit.local.cfg b/test/Analysis/TypeBasedAliasAnalysis/lit.local.cfg deleted file mode 100644 index 19eebc0..0000000 --- a/test/Analysis/TypeBasedAliasAnalysis/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll', '.c', '.cpp'] -- cgit v1.1