do not warn about extra lines in stderr if there is a stderr file that was compared

[tcpdump] / tests / TESTonce

diff --git a/tests/TESTonce b/tests/TESTonce
index 07a682ac5afdc20745c6e72bd4c552b4317faa65..425abaab36d16f65f79bc30a74dba600e9de7845 100755 (executable)
--- a/tests/TESTonce
+++ b/tests/TESTonce
@@ -87,7 +87,7 @@ else {
     open(ERRORRAW, "<" . $rawstderrlog);
     open(ERROROUT, ">" . $stderrlog);
     while(<ERRORRAW>) {
-        next if /^$/;  # blank lines are boring
+        next if /^\s*$/;  # blank lines are boring
         if(/^(reading from file )(.*)(,.*)$/) {
             my $filename = basename($2);
             print ERROROUT "${1}${filename}${3}\n";
@@ -123,7 +123,7 @@ else {
 
 if($r == 0) {
     my $stderrlog="";
-    if($linecount > 0) {
+    if($linecount > 0 && $errdiffstat != "-") {
         $stderrlog=sprintf("-- %d lines extra in stderr", $linecount);
     }
     if(!defined($ENV{"SKIPPASSED"})) {