From 97fef7c60bf3c004cfdd81d1dc650f4d72c8113a Mon Sep 17 00:00:00 2001
From: Todd Strader <todd.strader@gmail.com>
Date: Thu, 30 May 2019 20:34:35 -0400
Subject: [PATCH] Tests: Fix t_dist_whitespace.pl --golden, bug1451

Signed-off-by: Wilson Snyder <wsnyder@wsnyder.org>
---
 test_regress/t/t_dist_whitespace.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test_regress/t/t_dist_whitespace.pl b/test_regress/t/t_dist_whitespace.pl
index 5aecb910d..86d3c9a64 100755
--- a/test_regress/t/t_dist_whitespace.pl
+++ b/test_regress/t/t_dist_whitespace.pl
@@ -28,8 +28,10 @@ foreach my $file (sort keys %files) {
                              || $file =~ m!^README$!
                              || $file =~ m!/gtkwave/!);
         if ($ENV{HARNESS_UPDATE_GOLDEN}) {
-            $contents =~ s/[ \t]+\n/\n/g;
-            $contents =~ s/\n\n+$/\n/g unless $eol_ws_exempt;
+            my $changes = undef;
+            $changes = 1 if ($contents =~ s/[ \t]+\n/\n/g);
+            $changes = 1 if (!$eol_ws_exempt && $contents =~ s/\n\n+$/\n/g);
+            next if (!$changes);
             $warns{$file} = "Updated whitespace at $file";
             write_wholefile($filename, $contents);
             next;