diff options
| author | Andrew Trick <atrick@apple.com> | 2011-06-23 17:52:36 +0000 |
|---|---|---|
| committer | Andrew Trick <atrick@apple.com> | 2011-06-23 17:52:36 +0000 |
| commit | 75d33878ab75618f169939f9b6941a5c4794336f (patch) | |
| tree | 62766c2ca0412dbb5b341a5211dc0c76759b092b /test | |
| parent | 83471853b1d5a9efe6b9e7565c457fc901f84926 (diff) | |
| download | llvm-75d33878ab75618f169939f9b6941a5c4794336f.tar.gz llvm-75d33878ab75618f169939f9b6941a5c4794336f.tar.bz2 llvm-75d33878ab75618f169939f9b6941a5c4794336f.tar.xz | |
cmake+lit: handle ENABLE_ASSERTIONS feature properly.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@133725 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | test/Makefile | 2 | ||||
| -rw-r--r-- | test/lit.site.cfg.in | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2db58b9dcc..2634f79cf2 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -79,6 +79,12 @@ if(PYTHONINTERP_FOUND) set(ENABLE_SHARED ${LLVM_SHARED_LIBS_ENABLED}) set(SHLIBPATH_VAR ${SHLIBPATH_VAR}) + if(LLVM_ENABLE_ASSERTIONS) + set(ENABLE_ASSERTIONS "1") + else() + set(ENABLE_ASSERTIONS "0") + endif(LLVM_ENABLE_ASSERTIONS) + # lit.site.cfg uses the config-time build mode set(LLVM_BUILD_MODE "${LLVM_BUILD_MODE}") diff --git a/test/Makefile b/test/Makefile index 4e34e7222e..c0bc36c54d 100644 --- a/test/Makefile +++ b/test/Makefile @@ -185,7 +185,7 @@ lit.site.cfg: site.exp @$(ECHOPATH) s=@LLVMGCCDIR@=$(LLVMGCCDIR)=g >> lit.tmp @$(ECHOPATH) s=@PYTHON_EXECUTABLE@=python=g >> lit.tmp @$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> lit.tmp - @$(ECHOPATH) s=@LLVM_ENABLE_ASSERTIONS@=$(ENABLE_ASSERTIONS)=g >> lit.tmp + @$(ECHOPATH) s=@ENABLE_ASSERTIONS@=$(ENABLE_ASSERTIONS)=g >> lit.tmp @sed -f lit.tmp $(PROJ_SRC_DIR)/lit.site.cfg.in > $@ @-rm -f lit.tmp diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in index 6c33831124..fe152ef499 100644 --- a/test/lit.site.cfg.in +++ b/test/lit.site.cfg.in @@ -7,7 +7,7 @@ config.llvmgcc_dir = "@LLVMGCCDIR@" config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" config.python_executable = "@PYTHON_EXECUTABLE@" config.enable_shared = @ENABLE_SHARED@ -config.enable_assertions = @LLVM_ENABLE_ASSERTIONS@ +config.enable_assertions = @ENABLE_ASSERTIONS@ # Support substitution of the tools_dir with user parameters. This is # used when we can't determine the tool dir at configuration time. |