Placed --max-time in the termination category

2 files changed, 15 insertions, 8 deletions

diff --git a/lib/Core/ExecutorTimers.cpp b/lib/Core/ExecutorTimers.cpp
index 9d2e8868..22429221 100644
--- a/lib/Core/ExecutorTimers.cpp
+++ b/lib/Core/ExecutorTimers.cpp
@@ -9,33 +9,38 @@
 
 #include "CoreStats.h"
 #include "Executor.h"
+#include "ExecutorTimerInfo.h"
 #include "PTree.h"
 #include "StatsTracker.h"
-#include "ExecutorTimerInfo.h"
 
 #include "klee/ExecutionState.h"
 #include "klee/Internal/Module/InstructionInfoTable.h"
 #include "klee/Internal/Module/KInstruction.h"
 #include "klee/Internal/Module/KModule.h"
-#include "klee/Internal/System/Time.h"
 #include "klee/Internal/Support/ErrorHandling.h"
+#include "klee/Internal/System/Time.h"
+#include "klee/OptionCategories.h"
 
 #include "llvm/IR/Function.h"
 #include "llvm/Support/CommandLine.h"
 
-#include <string>
-#include <unistd.h>
+#include <math.h>
 #include <signal.h>
+#include <string>
 #include <sys/time.h>
-#include <math.h>
-
+#include <unistd.h>
 
 using namespace llvm;
 using namespace klee;
 
+namespace klee {
 cl::opt<std::string>
-MaxTime("max-time",
-        cl::desc("Halt execution after the specified number of seconds (default=0s (off))"));
+    MaxTime("max-time",
+            cl::desc("Halt execution after the specified number of seconds.  "
+                     "Set to 0s to disable (default=0s)"),
+            cl::init("0s"),
+            cl::cat(TerminationCat));
+}
 
 ///
 
diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp
index 36015c5e..787df1ec 100644
--- a/tools/klee/main.cpp
+++ b/tools/klee/main.cpp
@@ -288,7 +288,9 @@ namespace {
            cl::cat(TerminationCat));
 }
 
+namespace klee {
 extern cl::opt<std::string> MaxTime;
+}
 
 /***/