From 45f44e32e7ba46923c4df167a448ba20fccece26 Mon Sep 17 00:00:00 2001 From: Joel Jacobson Date: Mon, 28 Oct 2024 16:38:21 +0100 Subject: [PATCH] Fix inconsistent output handling in 002_pg_upgrade.pl test logs. Ensure that both log headers and contents are appended to the dedicated test logfile instead of splitting between TAP output and the logfile. When pg_upgrade logs are found, notify the user of the logfile location. --- src/bin/pg_upgrade/t/002_pg_upgrade.pl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/bin/pg_upgrade/t/002_pg_upgrade.pl b/src/bin/pg_upgrade/t/002_pg_upgrade.pl index 17af2ce61e..78bd776f5b 100644 --- a/src/bin/pg_upgrade/t/002_pg_upgrade.pl +++ b/src/bin/pg_upgrade/t/002_pg_upgrade.pl @@ -475,9 +475,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"; } -- 2.45.1