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/Instrumentation/AddressSanitizer/X86/lit.local.cfg | 11 +---------- test/Instrumentation/AddressSanitizer/lit.local.cfg | 1 - test/Instrumentation/BoundsChecking/lit.local.cfg | 1 - test/Instrumentation/DataFlowSanitizer/lit.local.cfg | 1 - test/Instrumentation/MemorySanitizer/lit.local.cfg | 1 - test/Instrumentation/ThreadSanitizer/lit.local.cfg | 1 - 6 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 test/Instrumentation/AddressSanitizer/lit.local.cfg delete mode 100644 test/Instrumentation/BoundsChecking/lit.local.cfg delete mode 100644 test/Instrumentation/DataFlowSanitizer/lit.local.cfg delete mode 100644 test/Instrumentation/MemorySanitizer/lit.local.cfg delete mode 100644 test/Instrumentation/ThreadSanitizer/lit.local.cfg (limited to 'test/Instrumentation') diff --git a/test/Instrumentation/AddressSanitizer/X86/lit.local.cfg b/test/Instrumentation/AddressSanitizer/X86/lit.local.cfg index b05ed3c..ba763cf 100644 --- a/test/Instrumentation/AddressSanitizer/X86/lit.local.cfg +++ b/test/Instrumentation/AddressSanitizer/X86/lit.local.cfg @@ -1,13 +1,4 @@ -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 'X86' in targets: config.unsupported = True diff --git a/test/Instrumentation/AddressSanitizer/lit.local.cfg b/test/Instrumentation/AddressSanitizer/lit.local.cfg deleted file mode 100644 index 19eebc0..0000000 --- a/test/Instrumentation/AddressSanitizer/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll', '.c', '.cpp'] diff --git a/test/Instrumentation/BoundsChecking/lit.local.cfg b/test/Instrumentation/BoundsChecking/lit.local.cfg deleted file mode 100644 index 19eebc0..0000000 --- a/test/Instrumentation/BoundsChecking/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll', '.c', '.cpp'] diff --git a/test/Instrumentation/DataFlowSanitizer/lit.local.cfg b/test/Instrumentation/DataFlowSanitizer/lit.local.cfg deleted file mode 100644 index 19eebc0..0000000 --- a/test/Instrumentation/DataFlowSanitizer/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll', '.c', '.cpp'] diff --git a/test/Instrumentation/MemorySanitizer/lit.local.cfg b/test/Instrumentation/MemorySanitizer/lit.local.cfg deleted file mode 100644 index 19eebc0..0000000 --- a/test/Instrumentation/MemorySanitizer/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll', '.c', '.cpp'] diff --git a/test/Instrumentation/ThreadSanitizer/lit.local.cfg b/test/Instrumentation/ThreadSanitizer/lit.local.cfg deleted file mode 100644 index 19eebc0..0000000 --- a/test/Instrumentation/ThreadSanitizer/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll', '.c', '.cpp'] -- cgit v1.1