diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile | 34 | ||||
| -rw-r--r-- | test/lib/llvm.exp | 14 | ||||
| -rw-r--r-- | test/lit.cfg | 133 | ||||
| -rw-r--r-- | test/lit.site.cfg.in | 8 |
4 files changed, 168 insertions, 21 deletions
diff --git a/test/Makefile b/test/Makefile index 46d69d40..75e05dda 100644 --- a/test/Makefile +++ b/test/Makefile @@ -22,10 +22,21 @@ include Makefile.tests # DejaGNU testing support #===------------------------------------------------------------------------===# +# FIXME: Fix test suite so we can run lit in parallel. +ifdef VERBOSE +RUNTESTFLAGS := $(VERBOSE) +LIT_ARGS := -j1 -v +else +LIT_ARGS := -j1 -s -v +endif + ifdef TESTSUITE +LIT_TESTSUITE := $(TESTSUITE) CLEANED_TESTSUITE := $(patsubst %/,%,$(TESTSUITE)) CLEANED_TESTSUITE := $(patsubst test/%,%,$(CLEANED_TESTSUITE)) RUNTESTFLAGS := --tool $(CLEANED_TESTSUITE) +else +LIT_TESTSUITE := . endif ifneq ($(RUNTEST),) @@ -39,6 +50,14 @@ check-local:: site.exp @echo "*** dejagnu not found. Make sure runtest is in your PATH, then reconfigure llvm." endif +check-local-lit:: lit.site.cfg + ( $(ULIMIT) \ + $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_TESTSUITE) ) + +check-local-all:: lit.site.cfg + ( $(ULIMIT) \ + $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_TESTSUITE) ) + ifdef TESTONE CLEANED_TESTONE := $(patsubst %/,%,$(TESTONE)) CLEANED_TESTONE := $(patsubst test/%,%,$(CLEANED_TESTONE)) @@ -77,18 +96,10 @@ site.exp: Makefile $(LEVEL)/Makefile.config @echo 'set ENABLE_UCLIBC "$(ENABLE_UCLIBC)"' >> site.tmp @echo 'set ENABLE_POSIX_RUNTIME "$(ENABLE_POSIX_RUNTIME)"' >> site.tmp @echo 'set TEST_FEATURE_LIST "$(TEST_FEATURE_LIST)"' >> site.tmp - @echo 'set prcontext "$(TCLSH) $(LLVM_SRC_ROOT)/test/Scripts/prcontext.tcl"' >> site.tmp - @echo 'set llvmtoolsdir "$(ToolDir)"' >>site.tmp - @echo 'set llvmlibsdir "$(LibDir)"' >>site.tmp @echo 'set srcroot "$(PROJ_SRC_ROOT)"' >>site.tmp @echo 'set objroot "$(PROJ_OBJ_ROOT)"' >>site.tmp @echo 'set srcdir "$(PROJ_SRC_ROOT)/test"' >>site.tmp @echo 'set objdir "$(PROJ_OBJ_ROOT)/test"' >>site.tmp - @echo 'set gccpath "$(CC)"' >>site.tmp - @echo 'set gxxpath "$(CXX)"' >>site.tmp - @echo 'set compile_c "$(CC) $(CPP.Flags) $(C.Flags) $(CompileCommonOpts) -c "' >>site.tmp - @echo 'set compile_cxx "$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) - c"' >> site.tmp - @echo 'set link "$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) $(LD.Flags)"' >>site.tmp @echo 'set llvmgcc "$(LLVMCC) -I$(PROJ_SRC_ROOT)/include"' >> site.tmp @echo 'set llvmgxx "$(LLVMCXX) -I$(PROJ_SRC_ROOT)/include"' >> site.tmp @echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp @@ -97,3 +108,10 @@ site.exp: Makefile $(LEVEL)/Makefile.config @-rm -f site.bak @test ! -f site.exp || mv site.exp site.bak @mv site.tmp site.exp + +lit.site.cfg: site.exp + @echo "Making KLEE 'lit.site.cfg' file..." + @sed -e "s#@KLEE_SOURCE_DIR@#$(PROJ_SRC_ROOT)#g" \ + -e "s#@KLEE_BINARY_DIR@#$(PROJ_OBJ_ROOT)#g" \ + -e "s#@KLEE_TOOLS_DIR@#$(ToolDir)#g" \ + $(PROJ_SRC_DIR)/lit.site.cfg.in > $@ diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp index 158cc54c..ce52c4b5 100644 --- a/test/lib/llvm.exp +++ b/test/lib/llvm.exp @@ -42,29 +42,17 @@ proc execOneLine { test PRS outcome lineno line } { # This procedure performs variable substitutions on the RUN: lines of a test # cases. proc substitute { line test tmpFile } { - global srcroot objroot srcdir objdir subdir target_triplet prcontext + global srcroot objroot srcdir objdir subdir target_triplet global llvmgcc llvmgxx llvmgcc_version - global gccpath gxxpath compile_c compile_cxx link llvmlibsdir - global llvmtoolsdir set path [file join $srcdir $subdir] # Substitute all Tcl variables. set new_line [subst $line ] - #replace %prcontext with prcontext.tcl (Must replace before %p) - regsub -all {%prcontext} $new_line $prcontext new_line #replace %llvmgcc with actual path to llvmgcc regsub -all {%llvmgcc} $new_line "$llvmgcc -emit-llvm" new_line #replace %llvmgxx with actual path to llvmg++ regsub -all {%llvmgxx} $new_line "$llvmgxx -emit-llvm" new_line - #replace %compile_c with C compilation command - regsub -all {%compile_c} $new_line "$compile_c" new_line - #replace %compile_cxx with C++ compilation command - regsub -all {%compile_cxx} $new_line "$compile_cxx" new_line - #replace %link with C++ link command - regsub -all {%link} $new_line "$link" new_line - #replace %llvmlibsdir with configure library directory - regsub -all {%llvmlibsdir} $new_line "$llvmlibsdir" new_line #replace %klee with klee binary regsub -all {%klee} $new_line "klee" new_line #replace %kleaver with kleaver binary diff --git a/test/lit.cfg b/test/lit.cfg new file mode 100644 index 00000000..39aaa824 --- /dev/null +++ b/test/lit.cfg @@ -0,0 +1,133 @@ +# -*- Python -*- + +# Configuration file for the 'lit' test runner. + +import os + +# name: The name of this test suite. +config.name = 'KLEE' + +# testFormat: The test format to use to interpret tests. +config.test_format = lit.formats.TclTest() + +# suffixes: A list of file extensions to treat as test files, this is actually +# set by on_clone(). +config.suffixes = [] + +# test_source_root: The root path where tests are located. +config.test_source_root = os.path.dirname(__file__) + +# test_exec_root: The root path where tests should be run. +klee_obj_root = getattr(config, 'klee_obj_root', None) +if klee_obj_root is not None: + config.test_exec_root = os.path.join(klee_obj_root, 'test') + +# Tweak the PATH to include the tool dir. +if klee_obj_root is not None: + klee_tools_dir = getattr(config, 'klee_tools_dir', None) + if not klee_tools_dir: + lit.fatal('No KLEE tools dir set!') + path = os.path.pathsep.join((klee_tools_dir, config.environment['PATH'])) + config.environment['PATH'] = path + +# Propogate 'HOME' through the environment. +config.environment['HOME'] = os.environ['HOME'] + +### + +import os + +# Check that the object root is known. +if config.test_exec_root is None: + lit.fatal('test execution root not set!') + +### + +# Load site data from DejaGNU's site.exp. +import re +site_exp = {} +# FIXME: Implement lit.site.cfg. +for line in open(os.path.join(config.klee_obj_root, 'test', 'site.exp')): + m = re.match('set ([^ ]+) "([^"]*)"', line) + if m: + site_exp[m.group(1)] = m.group(2) + +# Add substitutions. +config.substitutions.append(('%llvmgcc_only', site_exp['llvmgcc'])) +for sub in ['llvmgcc', 'llvmgxx']: + if sub in ('llvmgcc', 'llvmgxx'): + config.substitutions.append(('%' + sub, + site_exp[sub] + ' -emit-llvm -w')) + # FIXME: This is a hack to avoid LLVMC tests failing due to a clang driver + # warning when passing in "-fexceptions -fno-exceptions". + elif sub == 'compile_cxx': + config.substitutions.append(('%' + sub, + site_exp[sub].replace('-fno-exceptions', ''))) + else: + config.substitutions.append(('%' + sub, site_exp[sub])) + +# FIXME: Give these proper paths. +config.substitutions.append(('%kleaver', 'kleaver')) +config.substitutions.append(('%klee', 'klee')) + +def klee_supports_posix_runtime(): + return int(site_exp['ENABLE_POSIX_RUNTIME']) + +def klee_supports_uclibc(): + return int(site_exp['ENABLE_UCLIBC']) + +excludes = [] + +# Provide target_triple for use in XFAIL and XTARGET. +config.target_triple = site_exp['target_triplet'] + +# Provide on_clone hook for reading 'dg.exp'. +import os +simpleLibData = re.compile(r"""load_lib llvm.exp + +RunLLVMTests \[lsort \[glob -nocomplain \$srcdir/\$subdir/\*\.(.*)\]\]""", + re.MULTILINE) +conditionalLibData = re.compile(r"""load_lib llvm.exp + +if.*\[?(klee[^ ]*)\].*{ + *RunLLVMTests \[lsort \[glob -nocomplain \$srcdir/\$subdir/\*\.(.*)\]\] +\}""", re.MULTILINE) +def on_clone(parent, cfg, for_path): + def addSuffixes(match): + if match[0] == '{' and match[-1] == '}': + cfg.suffixes = ['.' + s for s in match[1:-1].split(',')] + else: + cfg.suffixes = ['.' + match] + + libPath = os.path.join(os.path.dirname(for_path), + 'dg.exp') + if not os.path.exists(libPath): + cfg.unsupported = True + return + + # Reset unsupported, in case we inherited it. + cfg.unsupported = False + lib = open(libPath).read().strip() + + # Check for a simple library. + m = simpleLibData.match(lib) + if m: + addSuffixes(m.group(1)) + return + + # Check for a conditional test set. + m = conditionalLibData.match(lib) + if m: + funcname,match = m.groups() + addSuffixes(match) + + func = globals().get(funcname) + if not func: + lit.error('unsupported predicate %r' % funcname) + elif not func(): + cfg.unsupported = True + return + # Otherwise, give up. + lit.error('unable to understand %r:\n%s' % (libPath, lib)) + +config.on_clone = on_clone diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in new file mode 100644 index 00000000..ec92b32d --- /dev/null +++ b/test/lit.site.cfg.in @@ -0,0 +1,8 @@ +## Autogenerated by LLVM/Clang configuration. +# Do not edit! +config.klee_src_root = "@KLEE_SOURCE_DIR@" +config.klee_obj_root = "@KLEE_BINARY_DIR@" +config.klee_tools_dir = "@KLEE_TOOLS_DIR@" + +# Let the main config do the real work. +lit.load_config(config, "@KLEE_SOURCE_DIR@/test/lit.cfg") |