message: Allow users to disable the watchdog entirely
diff: @@ -85,6 +85,7 @@ private:
  namespace { watchdog* s_watchdog; }
  void watchdog::start(int secs) {
  + if (secs > 0)
  s_watchdog = new watchdog(secs);
  }
  @@ -488,7 +489,7 @@ int main(int argc, char** argv) {
  // default values.
  int verbosity_console = 3;
  int verbosity_file = 3;
  - int max_runtime = 0;
  + int max_runtime = engine::max_runtime();
  std::string log_file;
  std::string suites = ".*";
  std::string not_suites;
  @@ -513,7 +514,8 @@ int main(int argc, char** argv) {
  verbosity_console},
  {"file-verbosity,V", "set verbosity level of file output (1-5)",
  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",
  "define what suites to run, either * or a comma-separated list", suites},
  {"not-suites,S", "exclude suites", not_suites},
  @@ -554,7 +556,6 @@ int main(int argc, char** argv) {
  } else {
  engine::args(1, argv);
  }
  - if (res.opts.count("max-runtime") > 0)
  engine::max_runtime(max_runtime);
  auto result = engine::run(colorize, log_file, verbosity_console,
  verbosity_file, suites,
  