From 9c5ae47c94ffae49eed805dc27a736b8958e157c Mon Sep 17 00:00:00 2001 From: Alp Toker Date: Fri, 15 Nov 2013 13:37:49 +0000 Subject: [PATCH] Ignore test Inputs globally and remove redundant lit.local.cfg files By adding a default config.excludes pattern we can avoid individual suppressions in subdirectories. This matches LLVM's lit.cfg which also excludes a few other common non-test filenames for consistency. llvm-svn: 194814 --- clang/test/ASTMerge/Inputs/lit.local.cfg | 1 - clang/test/Driver/Inputs/lit.local.cfg | 1 - clang/test/Frontend/Inputs/lit.local.cfg | 1 - clang/test/Index/Inputs/lit.local.cfg | 1 - clang/test/SemaCXX/Inputs/lit.local.cfg | 1 - clang/test/Tooling/Inputs/lit.local.cfg | 1 - clang/test/lit.cfg | 5 +++++ 7 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 clang/test/ASTMerge/Inputs/lit.local.cfg delete mode 100644 clang/test/Driver/Inputs/lit.local.cfg delete mode 100644 clang/test/Frontend/Inputs/lit.local.cfg delete mode 100644 clang/test/Index/Inputs/lit.local.cfg delete mode 100644 clang/test/SemaCXX/Inputs/lit.local.cfg delete mode 100644 clang/test/Tooling/Inputs/lit.local.cfg diff --git a/clang/test/ASTMerge/Inputs/lit.local.cfg b/clang/test/ASTMerge/Inputs/lit.local.cfg deleted file mode 100644 index e6f55eef7af5..000000000000 --- a/clang/test/ASTMerge/Inputs/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = [] diff --git a/clang/test/Driver/Inputs/lit.local.cfg b/clang/test/Driver/Inputs/lit.local.cfg deleted file mode 100644 index e6f55eef7af5..000000000000 --- a/clang/test/Driver/Inputs/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = [] diff --git a/clang/test/Frontend/Inputs/lit.local.cfg b/clang/test/Frontend/Inputs/lit.local.cfg deleted file mode 100644 index e6f55eef7af5..000000000000 --- a/clang/test/Frontend/Inputs/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = [] diff --git a/clang/test/Index/Inputs/lit.local.cfg b/clang/test/Index/Inputs/lit.local.cfg deleted file mode 100644 index e6f55eef7af5..000000000000 --- a/clang/test/Index/Inputs/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = [] diff --git a/clang/test/SemaCXX/Inputs/lit.local.cfg b/clang/test/SemaCXX/Inputs/lit.local.cfg deleted file mode 100644 index e6f55eef7af5..000000000000 --- a/clang/test/SemaCXX/Inputs/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = [] diff --git a/clang/test/Tooling/Inputs/lit.local.cfg b/clang/test/Tooling/Inputs/lit.local.cfg deleted file mode 100644 index e6f55eef7af5..000000000000 --- a/clang/test/Tooling/Inputs/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = [] diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg index bfac9f2415be..19daa61a64ff 100644 --- a/clang/test/lit.cfg +++ b/clang/test/lit.cfg @@ -46,6 +46,11 @@ config.test_format = lit.formats.ShTest(execute_external) # suffixes: A list of file extensions to treat as test files. config.suffixes = ['.c', '.cpp', '.m', '.mm', '.cu', '.ll', '.cl', '.s'] +# excludes: A list of directories to exclude from the testsuite. The 'Inputs' +# subdirectories contain auxiliary inputs for various tests in their parent +# directories. +config.excludes = ['Inputs', 'CMakeLists.txt', 'README.txt', 'LICENSE.txt'] + # test_source_root: The root path where tests are located. config.test_source_root = os.path.dirname(__file__)