From 2450b82b7d110ac1a11ffde3be90b8255767381d Mon Sep 17 00:00:00 2001 From: Roman Divacky Date: Tue, 27 Aug 2013 19:27:35 +0000 Subject: [PATCH] Make the information about disabled ARCMT/Rewriter/StaticAnalyzer available to lit and use this info to disable Analysis/FixIt/Rewriter/Analysis tests when those are not compiled into clang. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@189395 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/ARCMT/lit.local.cfg | 2 ++ test/Analysis/lit.local.cfg | 2 ++ test/FixIt/lit.local.cfg | 2 ++ test/Makefile | 3 +++ test/Rewriter/lit.local.cfg | 2 ++ test/lit.site.cfg.in | 3 +++ 6 files changed, 14 insertions(+) create mode 100644 test/ARCMT/lit.local.cfg create mode 100644 test/Analysis/lit.local.cfg create mode 100644 test/FixIt/lit.local.cfg create mode 100644 test/Rewriter/lit.local.cfg diff --git a/test/ARCMT/lit.local.cfg b/test/ARCMT/lit.local.cfg new file mode 100644 index 0000000000..4b28d6dff8 --- /dev/null +++ b/test/ARCMT/lit.local.cfg @@ -0,0 +1,2 @@ +if config.root.clang_arcmt == 0: + config.unsupported = True diff --git a/test/Analysis/lit.local.cfg b/test/Analysis/lit.local.cfg new file mode 100644 index 0000000000..da2a68b378 --- /dev/null +++ b/test/Analysis/lit.local.cfg @@ -0,0 +1,2 @@ +if config.root.clang_staticanalyzer == 0: + config.unsupported = True diff --git a/test/FixIt/lit.local.cfg b/test/FixIt/lit.local.cfg new file mode 100644 index 0000000000..5bbc711c65 --- /dev/null +++ b/test/FixIt/lit.local.cfg @@ -0,0 +1,2 @@ +if config.root.clang_rewriter == 0: + config.unsupported = True diff --git a/test/Makefile b/test/Makefile index 4fdafe1481..dbfa52177b 100644 --- a/test/Makefile +++ b/test/Makefile @@ -45,6 +45,9 @@ lit.site.cfg: FORCE @$(ECHOPATH) s=@CLANG_SOURCE_DIR@=$(PROJ_SRC_DIR)/..=g >> lit.tmp @$(ECHOPATH) s=@CLANG_BINARY_DIR@=$(PROJ_OBJ_DIR)/..=g >> lit.tmp @$(ECHOPATH) s=@TARGET_TRIPLE@=$(TARGET_TRIPLE)=g >> lit.tmp + @$(ECHOPATH) s=@ENABLE_CLANG_ARCMT@=$(ENABLE_CLANG_ARCMT)=g >> lit.tmp + @$(ECHOPATH) s=@ENABLE_CLANG_REWRITER@=$(ENABLE_CLANG_REWRITER)=g >> lit.tmp + @$(ECHOPATH) s=@ENABLE_CLANG_STATIC_ANALYZER@=$(ENABLE_CLANG_STATIC_ANALYZER)=g >> lit.tmp @sed -f lit.tmp $(PROJ_SRC_DIR)/lit.site.cfg.in > $@ @-rm -f lit.tmp diff --git a/test/Rewriter/lit.local.cfg b/test/Rewriter/lit.local.cfg new file mode 100644 index 0000000000..5bbc711c65 --- /dev/null +++ b/test/Rewriter/lit.local.cfg @@ -0,0 +1,2 @@ +if config.root.clang_rewriter == 0: + config.unsupported = True diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in index 39f432205a..1b0b09ae96 100644 --- a/test/lit.site.cfg.in +++ b/test/lit.site.cfg.in @@ -10,6 +10,9 @@ config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" config.clang_obj_root = "@CLANG_BINARY_DIR@" config.target_triple = "@TARGET_TRIPLE@" config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@" +config.clang_arcmt = @ENABLE_CLANG_ARCMT@ +config.clang_staticanalyzer = @ENABLE_CLANG_STATIC_ANALYZER@ +config.clang_rewriter = @ENABLE_CLANG_REWRITER@ # Support substitution of the tools and libs dirs with user parameters. This is # used when we can't determine the tool dir at configuration time. -- 2.40.0