Improve reporting of pg_upgrade log files on test failure

On failure, the pg_upgrade log files are automatically appended to the
test log file, but the information reported was inconsistent.

A header, with the log file name, was reported with note(), while the
log contents and a footer used print(), making it harder to diagnose
failures when these are split into console output and test log file
because the pg_upgrade log file path in the header may not be included
in the test log file.

The output is now consolidated so as the header uses print() rather than
note().  An extra note() is added to inform that the contents of a
pg_upgrade log file are appended to the test log file.

The diffs from the regression test suite and dump files all use print()
to show their contents on failure.

Author: Joel Jacobson
Reviewed-by: Daniel Gustafsson
Discussion: https://postgr.es/m/49f7e64a-b9be-4a90-a9fe-210a7740405e@app.fastmail.com
Backpatch-through: 15

diff --git a/src/bin/pg_upgrade/t/002_pg_upgrade.pl b/src/bin/pg_upgrade/t/002_pg_upgrade.pl
index ceca3ac5cf4d3a49410adf83a7cf446287cf289c..0b3216935704ee6d09eadbd12f91ccbcbf6c7747 100644 (file)
--- a/src/bin/pg_upgrade/t/002_pg_upgrade.pl
+++ b/src/bin/pg_upgrade/t/002_pg_upgrade.pl
@@ -347,9 +347,14 @@ if (-d $log_path)
                          if $File::Find::name =~ m/.*\.log/;
                },
                $newnode->data_dir . "/pg_upgrade_output.d");
+
+       my $test_logfile = $PostgreSQL::Test::Utils::test_logfile;
+
+       note "=== pg_upgrade logs found - appending to $test_logfile ===\n";
        foreach my $log (@log_files)
        {
-               note "=== contents of $log ===\n";
+               note "=== appending $log ===\n";
+               print "=== contents of $log ===\n";
                print slurp_file($log);
                print "=== EOF ===\n";
        }