On Mon, Jan 24, 2022 at 12:02:43AM -0800, Noah Misch wrote: > For 003_cic_2pc.pl, I'm > fine using $TODO so we continue to run all test commands and quietly log their > results. For 027_stream_regress.pl, which would need deep changes to use > $TODO, it works to use any of todo_skip, skip, or skip_all. I prefer > skip_all, because it prints the skip reason to gmake's stdout. (If the number > of affected users is zero as theorized, the choice doesn't matter.) Any > objections?
I pushed that on 2022-01-26 as ce6d793, but it wasn't enough: https://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=snapper&dt=2022-02-01%2013%3A29%3A58 In older Test::More versions, $TODO only works if tests know the right package in which to examine $that_pkg::TODO. In PostgreSQL v12+, all relevant functions set $Test::Builder::Level, so Test::More finds $main::TODO as intended. This would be one way to fix v11: --- a/src/test/perl/PostgresNode.pm +++ b/src/test/perl/PostgresNode.pm @@ -1869,4 +1869,6 @@ command_ok(...) sub command_checks_all { + local $Test::Builder::Level = $Test::Builder::Level + 1; + my $self = shift; diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm index 0c56156..2ab78b4 100644 --- a/src/test/perl/TestLib.pm +++ b/src/test/perl/TestLib.pm @@ -598,4 +598,6 @@ sub command_fails_like sub command_checks_all { + local $Test::Builder::Level = $Test::Builder::Level + 1; + my ($cmd, $expected_ret, $out, $err, $test_name) = @_; However, I'm inclined to use a less-fragile way, in all branches: --- a/src/bin/pgbench/t/023_cic_2pc.pl +++ b/src/bin/pgbench/t/023_cic_2pc.pl @@ -14 +14,2 @@ use Test::More tests => 6; -local $TODO = 'filesystem bug' if TestLib::has_wal_read_bug; +Test::More->builder->todo_start('filesystem bug') + if TestLib::has_wal_read_bug; None of this matters under newer Test::More. kittiwake's Test::More 1.302133 is new enough not to care, but tadarida's Test::More 1.001014 is not. The Test::More->builder->todo_start() syntax works in 0.82, if not earlier. (PostgreSQL v10 requires Test::More 0.87.)