diff options
author | Dan Liew <daniel.liew@imperial.ac.uk> | 2014-05-12 12:11:19 +0100 |
---|---|---|
committer | Dan Liew <daniel.liew@imperial.ac.uk> | 2014-05-12 12:11:19 +0100 |
commit | b873f464a293db9aed6016f0b30ede80b07f979e (patch) | |
tree | 129f5be2ce112d130a470c42bbb483a0d88891ac | |
parent | c5e30c266e804d0f7240cc7151dbd78cc5d5a8ca (diff) |
Remove solver executable check under windows at the request
of Valentin Wüstholz because under Windows Boogie looks in
other locations for Z3.
-rw-r--r-- | Test/lit.site.cfg | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/Test/lit.site.cfg b/Test/lit.site.cfg index cb0bb3e3..9cd85ef6 100644 --- a/Test/lit.site.cfg +++ b/Test/lit.site.cfg @@ -93,18 +93,22 @@ lit_config.note('Using Boogie: {}\n'.format(boogieExecutable)) config.substitutions.append( ('%boogie', boogieExecutable) ) # Sanity check: Check solver executable is available -solvers = ['z3.exe','cvc4.exe'] -solverFound = False -for solver in solvers: - if os.path.exists( os.path.join(binaryDir, solver)): - solverFound = True - -if not solverFound: - lit_config.fatal('Could not find solver in "{binaryDir}". Tried looking for {solvers}'.format( - binaryDir=binaryDir, - solvers=solvers - ) - ) +# FIXME: Should this check be removed entirely? +if os.name != 'nt': + solvers = ['z3.exe','cvc4.exe'] + solverFound = False + for solver in solvers: + if os.path.exists( os.path.join(binaryDir, solver)): + solverFound = True + + if not solverFound: + lit_config.fatal('Could not find solver in "{binaryDir}". Tried looking for {solvers}'.format( + binaryDir=binaryDir, + solvers=solvers + ) + ) +else: + lit_config.warning('Skipping solver sanity check on Windows') # Add diff tool substitution diffExecutable = None |