diff options
| author | Julian Büning <julian.buening@rwth-aachen.de> | 2019-09-15 23:00:08 +0200 |
|---|---|---|
| committer | Cristian Cadar <c.cadar@imperial.ac.uk> | 2019-10-07 13:26:53 +0100 |
| commit | 548651e3513de258adcc20c2431046a9c7a6839d (patch) | |
| tree | 79b2a46f18935cb789b588b131277bb84e468b8a | |
| parent | eca1ff0a116a1443d7d8dd7f2efab48de7fc4ad5 (diff) | |
| download | klee-548651e3513de258adcc20c2431046a9c7a6839d.tar.gz | |
test/lit.cfg: use lit_config instead of lit
Since LLVM version 3.6.0 or lit version 0.5.0, `lit_config` is the name of the global object, not `lit`.
| -rw-r--r-- | test/lit.cfg | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/test/lit.cfg b/test/lit.cfg index 0942a057..037cbf37 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -39,12 +39,12 @@ if klee_obj_root is not None: 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!') + lit_config.fatal('No KLEE tools dir set!') # Check LLVM tool directory llvm_tools_dir = getattr(config, 'llvm_tools_dir', None) if not llvm_tools_dir: - lit.fatal('No LLVM tool directory set!') + lit_config.fatal('No LLVM tool directory set!') path = os.path.pathsep.join( ( @@ -80,7 +80,7 @@ addEnv('CPLUS_INCLUDE_PATH') # Check that the object root is known. if config.test_exec_root is None: - lit.fatal('test execution root not set!') + lit_config.fatal('test execution root not set!') # Add substitutions from lit.site.cfg @@ -88,7 +88,7 @@ subs = [ 'clangxx', 'clang', 'cc', 'cxx', 'O0opt' ] for name in subs: value = getattr(config, name, None) if value == None: - lit.fatal('{0} is not set'.format(name)) + lit_config.fatal('{0} is not set'.format(name)) config.substitutions.append( ('%' + name, value)) # Add a substitution for lli. @@ -114,14 +114,8 @@ config.substitutions.append( # Get KLEE and Kleaver specific parameters passed on llvm-lit cmd line # e.g. llvm-lit --param klee_opts=--help -try: - lit.params -except AttributeError: - klee_extra_params = lit_config.params.get('klee_opts',"") - kleaver_extra_params = lit_config.params.get('kleaver_opts',"") -else: - klee_extra_params = lit.params.get('klee_opts',"") - kleaver_extra_params = lit.params.get('kleaver_opts',"") +klee_extra_params = lit_config.params.get('klee_opts',"") +kleaver_extra_params = lit_config.params.get('kleaver_opts',"") if len(klee_extra_params) != 0: print("Passing extra KLEE command line args: {0}".format( |