Fix lit fatal errors about requiring a USE_Z3_SOLVER param

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@339728 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/lit.site.cfg.py.in b/test/lit.site.cfg.py.in
index 7bd8846dbd41231946ceff62912a2fa441fe9926..d76f8aa6720850479b804a19448a9be4ce37c30b 100644 (file)
--- a/test/lit.site.cfg.py.in
+++ b/test/lit.site.cfg.py.in
@@ -26,7 +26,7 @@ config.enable_shared = @ENABLE_SHARED@
 config.enable_backtrace = @ENABLE_BACKTRACES@
 config.host_arch = "@HOST_ARCH@"
 config.python_executable = "@PYTHON_EXECUTABLE@"
-config.use_z3_solver = "@USE_Z3_SOLVER@"
+config.use_z3_solver = lit_config.params.get('USE_Z3_SOLVER', "@USE_Z3_SOLVER@")
 
 # Support substitution of the tools and libs dirs with user parameters. This is
 # used when we can't determine the tool dir at configuration time.
@@ -35,7 +35,6 @@ try:
     config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
     config.llvm_shlib_dir = config.llvm_shlib_dir % lit_config.params
     config.llvm_libs_dir = config.llvm_libs_dir % lit_config.params
-    config.use_z3_solver = lit_config.params['USE_Z3_SOLVER']
 except KeyError:
     e = sys.exc_info()[1]
     key, = e.args