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/ExecutionEngine/MCJIT/lit.local.cfg | 10 +--------- test/ExecutionEngine/MCJIT/remote/lit.local.cfg | 12 ++---------- test/ExecutionEngine/RuntimeDyld/lit.local.cfg | 1 - test/ExecutionEngine/lit.local.cfg | 13 ++----------- 4 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 test/ExecutionEngine/RuntimeDyld/lit.local.cfg (limited to 'test/ExecutionEngine') diff --git a/test/ExecutionEngine/MCJIT/lit.local.cfg b/test/ExecutionEngine/MCJIT/lit.local.cfg index f21468f..bad4c8c 100644 --- a/test/ExecutionEngine/MCJIT/lit.local.cfg +++ b/test/ExecutionEngine/MCJIT/lit.local.cfg @@ -1,12 +1,4 @@ -config.suffixes = ['.ll', '.c', '.cpp'] - -def getRoot(config): - if not config.parent: - return config - return getRoot(config.parent) - -root = getRoot(config) - +root = config.root targets = set(root.targets_to_build.split()) if ('X86' in targets) | ('AArch64' in targets) | ('ARM' in targets) | \ ('Mips' in targets) | ('PowerPC' in targets) | ('SystemZ' in targets): diff --git a/test/ExecutionEngine/MCJIT/remote/lit.local.cfg b/test/ExecutionEngine/MCJIT/remote/lit.local.cfg index 39b2a95..6b192ae 100644 --- a/test/ExecutionEngine/MCJIT/remote/lit.local.cfg +++ b/test/ExecutionEngine/MCJIT/remote/lit.local.cfg @@ -1,11 +1,3 @@ -config.suffixes = ['.ll', '.c', '.cpp'] - -def getRoot(config): - if not config.parent: - return config - return getRoot(config.parent) - -root = getRoot(config) - -if 'armv4' in root.target_triple or 'armv5' in root.target_triple: +if 'armv4' in config.root.target_triple or \ + 'armv5' in config.root.target_triple: config.unsupported = True diff --git a/test/ExecutionEngine/RuntimeDyld/lit.local.cfg b/test/ExecutionEngine/RuntimeDyld/lit.local.cfg deleted file mode 100644 index df9b335..0000000 --- a/test/ExecutionEngine/RuntimeDyld/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.test'] diff --git a/test/ExecutionEngine/lit.local.cfg b/test/ExecutionEngine/lit.local.cfg index b6945ad..215ecae 100644 --- a/test/ExecutionEngine/lit.local.cfg +++ b/test/ExecutionEngine/lit.local.cfg @@ -1,14 +1,5 @@ -config.suffixes = ['.ll', '.c', '.cpp'] - -def getRoot(config): - if not config.parent: - return config - return getRoot(config.parent) - -root = getRoot(config) - -if root.host_arch in ['PowerPC', 'AArch64', 'SystemZ']: +if config.root.host_arch in ['PowerPC', 'AArch64', 'SystemZ']: config.unsupported = True -if 'hexagon' in root.target_triple: +if 'hexagon' in config.root.target_triple: config.unsupported = True -- cgit v1.1