From adbd00f7a59bcfbcd6907858499c94a27c6680ed Mon Sep 17 00:00:00 2001 From: Noah Misch Date: Wed, 9 Feb 2022 18:16:59 -0800 Subject: [PATCH] Use Test::Builder::todo_start(), replacing $::TODO. Some pre-2017 Test::More versions need perfect $Test::Builder::Level maintenance to find the variable. Buildfarm member snapper reported an overall failure that the file intended to hide via the TODO construct. That trouble was reachable in v11 and v10. For later branches, this serves as defense in depth. Back-patch to v10 (all supported versions). Discussion: https://postgr.es/m/20220202055556.GB2745933@rfd.leadboat.com --- contrib/amcheck/t/003_cic_2pc.pl | 3 ++- src/test/recovery/t/027_stream_regress.pl | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/amcheck/t/003_cic_2pc.pl b/contrib/amcheck/t/003_cic_2pc.pl index 2f804efb84..44b425f558 100644 --- a/contrib/amcheck/t/003_cic_2pc.pl +++ b/contrib/amcheck/t/003_cic_2pc.pl @@ -11,7 +11,8 @@ use PostgreSQL::Test::Utils; use Test::More tests => 5; -local $TODO = 'filesystem bug' if PostgreSQL::Test::Utils::has_wal_read_bug; +Test::More->builder->todo_start('filesystem bug') + if PostgreSQL::Test::Utils::has_wal_read_bug; my ($node, $result); diff --git a/src/test/recovery/t/027_stream_regress.pl b/src/test/recovery/t/027_stream_regress.pl index cd8163a4b5..37449006c1 100644 --- a/src/test/recovery/t/027_stream_regress.pl +++ b/src/test/recovery/t/027_stream_regress.pl @@ -8,8 +8,8 @@ use File::Basename; if (PostgreSQL::Test::Utils::has_wal_read_bug) { - # We'd prefer to use "local $TODO", but the bug causes this test file to - # die(), not merely to fail. + # We'd prefer to use Test::More->builder->todo_start, but the bug causes + # this test file to die(), not merely to fail. plan skip_all => 'filesystem bug'; } else