Commit 629b72f2 authored by Dominik Charousset's avatar Dominik Charousset

Allow users to disable the watchdog entirely

parent b38da135
...@@ -85,6 +85,7 @@ private: ...@@ -85,6 +85,7 @@ private:
namespace { watchdog* s_watchdog; } namespace { watchdog* s_watchdog; }
void watchdog::start(int secs) { void watchdog::start(int secs) {
if (secs > 0)
s_watchdog = new watchdog(secs); s_watchdog = new watchdog(secs);
} }
...@@ -488,7 +489,7 @@ int main(int argc, char** argv) { ...@@ -488,7 +489,7 @@ int main(int argc, char** argv) {
// default values. // default values.
int verbosity_console = 3; int verbosity_console = 3;
int verbosity_file = 3; int verbosity_file = 3;
int max_runtime = 0; int max_runtime = engine::max_runtime();
std::string log_file; std::string log_file;
std::string suites = ".*"; std::string suites = ".*";
std::string not_suites; std::string not_suites;
...@@ -513,7 +514,8 @@ int main(int argc, char** argv) { ...@@ -513,7 +514,8 @@ int main(int argc, char** argv) {
verbosity_console}, verbosity_console},
{"file-verbosity,V", "set verbosity level of file output (1-5)", {"file-verbosity,V", "set verbosity level of file output (1-5)",
verbosity_file}, verbosity_file},
{"max-runtime,r", "set maximum runtime in seconds", max_runtime}, {"max-runtime,r", "set maximum runtime in seconds (0 = infinite)",
max_runtime},
{"suites,s", {"suites,s",
"define what suites to run, either * or a comma-separated list", suites}, "define what suites to run, either * or a comma-separated list", suites},
{"not-suites,S", "exclude suites", not_suites}, {"not-suites,S", "exclude suites", not_suites},
...@@ -554,7 +556,6 @@ int main(int argc, char** argv) { ...@@ -554,7 +556,6 @@ int main(int argc, char** argv) {
} else { } else {
engine::args(1, argv); engine::args(1, argv);
} }
if (res.opts.count("max-runtime") > 0)
engine::max_runtime(max_runtime); engine::max_runtime(max_runtime);
auto result = engine::run(colorize, log_file, verbosity_console, auto result = engine::run(colorize, log_file, verbosity_console,
verbosity_file, suites, verbosity_file, suites,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment