Commit a3b23403 authored by cmiller@zippy.(none)'s avatar cmiller@zippy.(none)

Merge cleanup, with a change of verbose test status to Off.

parent 91b8b264
...@@ -951,7 +951,7 @@ sub mtr_kill_process ($$$) { ...@@ -951,7 +951,7 @@ sub mtr_kill_process ($$$) {
my $timeout= shift; # Seconds to wait for process my $timeout= shift; # Seconds to wait for process
my $max_loop= $timeout*10; # Sleeping 0.1 between each kill attempt my $max_loop= $timeout*10; # Sleeping 0.1 between each kill attempt
for (my $cur_attempt= 1; $cur_attempt <= $total_retries; ++$cur_attempt) for (my $cur_attempt= 1; $cur_attempt <= $max_loop; ++$cur_attempt)
{ {
mtr_debug("Sending $signal to $pid..."); mtr_debug("Sending $signal to $pid...");
......
...@@ -168,7 +168,7 @@ our $opt_suite; ...@@ -168,7 +168,7 @@ our $opt_suite;
our $opt_netware; our $opt_netware;
our $opt_script_debug= 0; # Script debugging, enable with --script-debug our $opt_script_debug= 0; # Script debugging, enable with --script-debug
our $opt_verbose= 1; # Verbose output, enable with --verbose our $opt_verbose= 0; # Verbose output, enable with --verbose
# Options FIXME not all.... # Options FIXME not all....
......
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