diff options
| author | Cristian Cadar <c.cadar@imperial.ac.uk> | 2018-12-18 14:21:34 +0000 |
|---|---|---|
| committer | MartinNowack <martin.nowack@gmail.com> | 2018-12-19 13:25:31 +0000 |
| commit | c86e3bcf164c91ee215cc4e52de42ba64369d60b (patch) | |
| tree | 147b6b517bf8ab6ab67074c77d9cc00b3880cfc9 | |
| parent | c44b6aa52812d712860677af18d586bea18d3c94 (diff) | |
| download | klee-c86e3bcf164c91ee215cc4e52de42ba64369d60b.tar.gz | |
Renamed --stop-after-n-instructions to --max-instructions, as suggested by @251
| -rw-r--r-- | lib/Core/Executor.cpp | 10 | ||||
| -rw-r--r-- | test/Feature/BFSSearcher.c | 2 | ||||
| -rw-r--r-- | test/Feature/DumpStatesOnHalt.c | 2 | ||||
| -rw-r--r-- | test/Feature/Optimize.c | 2 | ||||
| -rw-r--r-- | test/regression/2018-05-05-number-instructions-dumped-states.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp index 6ac24447..2a2e4a11 100644 --- a/lib/Core/Executor.cpp +++ b/lib/Core/Executor.cpp @@ -254,10 +254,10 @@ namespace { cl::cat(TerminationCat)); cl::opt<unsigned long long> - StopAfterNInstructions("stop-after-n-instructions", - cl::desc("Stop execution after specified number of instructions (default=0 (off))"), - cl::init(0), - cl::cat(TerminationCat)); + MaxInstructions("max-instructions", + cl::desc("Stop execution after this many instructions (default=0 (off))"), + cl::init(0), + cl::cat(TerminationCat)); cl::opt<unsigned> MaxForks("max-forks", @@ -1270,7 +1270,7 @@ void Executor::stepInstruction(ExecutionState &state) { state.prevPC = state.pc; ++state.pc; - if (stats::instructions==StopAfterNInstructions) + if (stats::instructions == MaxInstructions) haltExecution = true; } diff --git a/test/Feature/BFSSearcher.c b/test/Feature/BFSSearcher.c index 313791d5..eb323c4c 100644 --- a/test/Feature/BFSSearcher.c +++ b/test/Feature/BFSSearcher.c @@ -1,6 +1,6 @@ // RUN: %llvmgcc %s -emit-llvm -g -c -o %t1.bc // RUN: rm -rf %t.klee-out -// RUN: %klee --output-dir=%t.klee-out --stop-after-n-instructions=500 --search=bfs %t1.bc 2>%t2.log +// RUN: %klee --output-dir=%t.klee-out --max-instructions=500 --search=bfs %t1.bc 2>%t2.log // RUN: FileCheck -input-file=%t2.log %s #include "assert.h" #include "klee/klee.h" diff --git a/test/Feature/DumpStatesOnHalt.c b/test/Feature/DumpStatesOnHalt.c index 21767798..f154fc82 100644 --- a/test/Feature/DumpStatesOnHalt.c +++ b/test/Feature/DumpStatesOnHalt.c @@ -1,6 +1,6 @@ // RUN: %llvmgcc %s -g -emit-llvm %O0opt -c -o %t1.bc // RUN: rm -rf %t.klee-out -// RUN: %klee --output-dir=%t.klee-out --stop-after-n-instructions=1 --dump-states-on-halt=true %t1.bc 2>&1 | FileCheck %s +// RUN: %klee --output-dir=%t.klee-out --max-instructions=1 --dump-states-on-halt=true %t1.bc 2>&1 | FileCheck %s // RUN: test -f %t.klee-out/test000001.ktest int main(int argc, char** argv) { diff --git a/test/Feature/Optimize.c b/test/Feature/Optimize.c index c0eb2d33..326e4912 100644 --- a/test/Feature/Optimize.c +++ b/test/Feature/Optimize.c @@ -1,7 +1,7 @@ // RUN: %llvmgcc %s -emit-llvm %O0opt -c -o %t2.bc // RUN: rm -f %t2.log // RUN: rm -rf %t.klee-out -// RUN: %klee --output-dir=%t.klee-out --stop-after-n-instructions=100 --optimize %t2.bc > %t3.log +// RUN: %klee --output-dir=%t.klee-out --max-instructions=100 --optimize %t2.bc > %t3.log // RUN: echo "good" > %t3.good // RUN: diff %t3.log %t3.good diff --git a/test/regression/2018-05-05-number-instructions-dumped-states.c b/test/regression/2018-05-05-number-instructions-dumped-states.c index 8d183b77..0f84408e 100644 --- a/test/regression/2018-05-05-number-instructions-dumped-states.c +++ b/test/regression/2018-05-05-number-instructions-dumped-states.c @@ -1,6 +1,6 @@ // RUN: %llvmgcc %s -emit-llvm %O0opt -g -c -o %t1.bc // RUN: rm -rf %t.klee-out -// RUN: %klee -stop-after-n-instructions=1 --output-dir=%t.klee-out %t1.bc 2>&1 | FileCheck %s +// RUN: %klee -max-instructions=1 --output-dir=%t.klee-out %t1.bc 2>&1 | FileCheck %s // CHECK: KLEE: done: total instructions = 1 |