diff options
| author | Andrew Trick <atrick@apple.com> | 2011-06-22 23:23:49 +0000 |
|---|---|---|
| committer | Andrew Trick <atrick@apple.com> | 2011-06-22 23:23:49 +0000 |
| commit | b7bca251bc4b6223b2968a0380c0b2ae6bfff06b (patch) | |
| tree | 2b5c201b3256e7e2286651ad96de5b170ba40873 | |
| parent | 4f0845ec62d5fb8be5d07adc09c54944ab952e5c (diff) | |
lit support for REQUIRES: asserts.
Take #2. Don't piggyback on the existing config.build_mode. Instead,
define a new lit feature for each build feature we need (currently
just "asserts"). Teach both autoconf'd and cmake'd Makefiles to define
this feature within test/lit.site.cfg. This doesn't require any lit
harness changes and should be more robust across build systems.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@133665 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/Makefile | 1 | ||||
| -rw-r--r-- | test/lit.site.cfg.in | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/test/Makefile b/test/Makefile index e5d538b087..4fdafe1481 100644 --- a/test/Makefile +++ b/test/Makefile @@ -42,7 +42,6 @@ lit.site.cfg: FORCE @$(ECHOPATH) s=@LLVM_BINARY_DIR@=$(LLVM_OBJ_ROOT)=g >> lit.tmp @$(ECHOPATH) s=@LLVM_TOOLS_DIR@=$(ToolDir)=g >> lit.tmp @$(ECHOPATH) s=@LLVM_LIBS_DIR@=$(LibDir)=g >> lit.tmp - @$(ECHOPATH) s=@LLVM_BUILD_MODE@=$(BuildMode)=g >> lit.tmp @$(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 diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in index 9943ba3569..df90b81055 100644 --- a/test/lit.site.cfg.in +++ b/test/lit.site.cfg.in @@ -5,7 +5,6 @@ config.llvm_obj_root = "@LLVM_BINARY_DIR@" config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" config.llvm_libs_dir = "@LLVM_LIBS_DIR@" config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" -config.llvm_build_modes = "@LLVM_BUILD_MODE@".split('+') config.clang_obj_root = "@CLANG_BINARY_DIR@" config.target_triple = "@TARGET_TRIPLE@" |