diff options
| author | Cristian Cadar <c.cadar@imperial.ac.uk> | 2013-08-07 17:10:10 +0100 |
|---|---|---|
| committer | Cristian Cadar <c.cadar@imperial.ac.uk> | 2013-08-07 17:10:10 +0100 |
| commit | 39616bca565f1d3f958dc7e0e071ac5dc64f5439 (patch) | |
| tree | fe7172fe6df50be65ae5317a82ed1d5b16d821ec /tools | |
| parent | 363e7ab2d7bfa790b666eac1b48b7b7daf02e5e3 (diff) | |
| parent | 6eae8c62e620c86ef5c95839e899d39e003c13eb (diff) | |
| download | klee-39616bca565f1d3f958dc7e0e071ac5dc64f5439.tar.gz | |
Merge branch 'master' of https://github.com/hpalikareva/klee into hpalikareva-master
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/kleaver/main.cpp | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/tools/kleaver/main.cpp b/tools/kleaver/main.cpp index 5b9e43a6..accc48e4 100644 --- a/tools/kleaver/main.cpp +++ b/tools/kleaver/main.cpp @@ -211,25 +211,19 @@ static bool EvaluateInputAST(const char *Filename, return false; // FIXME: Support choice of solver. - Solver *S = 0; - Solver *STP = 0; + Solver *coreSolver = UseDummySolver ? createDummySolver() : new STPSolver(UseForkedCoreSolver); + if (!UseDummySolver) { - STPSolver* stpSolver = new STPSolver(true); - if (0 != MaxSTPTime) { - stpSolver->setTimeout(MaxSTPTime); + if (0 != MaxCoreSolverTime) { + coreSolver->setCoreSolverTimeout(MaxCoreSolverTime); } - STP = S = stpSolver; - } - else { - STP = S = createDummySolver(); } - S= constructSolverChain((STPSolver*) STP, - getQueryLogPath(ALL_QUERIES_SMT2_FILE_NAME), - getQueryLogPath(SOLVER_QUERIES_SMT2_FILE_NAME), - getQueryLogPath(ALL_QUERIES_PC_FILE_NAME), - getQueryLogPath(SOLVER_QUERIES_PC_FILE_NAME)); - + Solver *S = constructSolverChain(coreSolver, + getQueryLogPath(ALL_QUERIES_SMT2_FILE_NAME), + getQueryLogPath(SOLVER_QUERIES_SMT2_FILE_NAME), + getQueryLogPath(ALL_QUERIES_PC_FILE_NAME), + getQueryLogPath(SOLVER_QUERIES_PC_FILE_NAME)); unsigned Index = 0; for (std::vector<Decl*>::iterator it = Decls.begin(), |