diff options
| author | Dan Liew <daniel.liew@imperial.ac.uk> | 2014-01-13 02:18:37 +0000 |
|---|---|---|
| committer | Dan Liew <daniel.liew@imperial.ac.uk> | 2014-01-20 13:40:25 +0000 |
| commit | 313390c68fc808d5fe7cf746a7a65b1e018362dc (patch) | |
| tree | d5d33b2aa90a79a2691ee6999857e9ce3bf093fc | |
| parent | f5afeb84a847e3876122211913b7117fd3ad1862 (diff) | |
| download | klee-313390c68fc808d5fe7cf746a7a65b1e018362dc.tar.gz | |
Allow llvm-lit from 2.9 to work by hacking %T substitution variable.
| -rw-r--r-- | test/Makefile | 1 | ||||
| -rw-r--r-- | test/lit.cfg | 4 | ||||
| -rw-r--r-- | test/lit.site.cfg.in | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/test/Makefile b/test/Makefile index b2cc0210..4bc63b66 100644 --- a/test/Makefile +++ b/test/Makefile @@ -115,4 +115,5 @@ lit.site.cfg: site.exp -e "s#@KLEE_BINARY_DIR@#$(PROJ_OBJ_ROOT)#g" \ -e "s#@KLEE_TOOLS_DIR@#$(ToolDir)#g" \ -e "s#@LLVM_TOOLS_DIR@#$(LLVMToolDir)#g" \ + -e "s#@LLVM_VERSION_MAJOR@#$(LLVM_VERSION_MAJOR)#g" \ $(PROJ_SRC_DIR)/lit.site.cfg.in > $@ diff --git a/test/lit.cfg b/test/lit.cfg index 191461b6..f81576f9 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -77,6 +77,10 @@ for sub in ['llvmgcc', 'llvmgxx']: config.substitutions.append(('%kleaver', 'kleaver')) config.substitutions.append(('%klee', 'klee')) +# LLVM < 3.0 doesn't Support %T directive +if int(config.llvm_version_major) == 2: + config.substitutions.append(('%T','Output')) + def klee_supports_posix_runtime(): return int(site_exp['ENABLE_POSIX_RUNTIME']) diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in index f47d63b8..2b239f56 100644 --- a/test/lit.site.cfg.in +++ b/test/lit.site.cfg.in @@ -4,6 +4,7 @@ config.klee_src_root = "@KLEE_SOURCE_DIR@" config.klee_obj_root = "@KLEE_BINARY_DIR@" config.klee_tools_dir = "@KLEE_TOOLS_DIR@" config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" +config.llvm_version_major = "@LLVM_VERSION_MAJOR@" # Let the main config do the real work. lit.load_config(config, "@KLEE_SOURCE_DIR@/test/lit.cfg") |