From: Michael Richardson <mcr@sandelman.ca>
Date: Wed, 18 Sep 2019 22:18:10 +0000 (-0400)
Subject: do not warn about extra lines in stderr if there is a stderr file that was compared
X-Git-Tag: tcpdump-4.9.3~12
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/b07acab03ae9f76fe822ff9239d705f48efd270d?hp=1c3f65b0408c23227f99ac08e38681604e3049ab

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

diff --git a/tests/TESTonce b/tests/TESTonce
index 07a682ac..425abaab 100755
--- 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"})) {