From ea778e185c4fde46a2c2fd31a90f805dc2b8afd2 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Tue, 15 Feb 2022 10:41:22 +0100 Subject: [PATCH 2/2] Remove unused modules from TAP tests This avoids pulling in Config and Cwd were they are no longer used. --- contrib/amcheck/t/002_cic.pl | 1 - contrib/amcheck/t/003_cic_2pc.pl | 1 - src/bin/pg_basebackup/t/010_pg_basebackup.pl | 2 -- src/bin/pg_checksums/t/002_actions.pl | 1 - src/bin/pg_dump/t/001_basic.pl | 1 - src/bin/pg_dump/t/002_pg_dump.pl | 1 - src/bin/pg_test_fsync/t/001_basic.pl | 1 - src/bin/pg_test_timing/t/001_basic.pl | 1 - src/bin/pg_verifybackup/t/002_algorithm.pl | 2 -- src/bin/pg_verifybackup/t/003_corruption.pl | 2 -- src/bin/pg_verifybackup/t/004_options.pl | 2 -- src/bin/pg_verifybackup/t/005_bad_manifest.pl | 2 -- src/bin/pg_verifybackup/t/006_encoding.pl | 2 -- src/bin/pg_verifybackup/t/007_wal.pl | 2 -- src/bin/pg_verifybackup/t/008_untar.pl | 1 - src/bin/pg_verifybackup/t/009_extract.pl | 2 -- src/bin/pg_verifybackup/t/010_client_untar.pl | 1 - src/bin/pgbench/t/001_pgbench_with_server.pl | 1 - src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl | 1 - src/test/modules/test_pg_dump/t/001_base.pl | 1 - src/test/perl/PostgreSQL/Test/Cluster.pm | 1 - src/test/recovery/t/006_logical_decoding.pl | 1 - src/test/recovery/t/011_crash_recovery.pl | 1 - src/test/recovery/t/013_crash_restart.pl | 1 - src/test/recovery/t/017_shm.pl | 1 - src/test/recovery/t/020_archive_status.pl | 1 - src/test/recovery/t/021_row_visibility.pl | 1 - src/test/recovery/t/022_crash_temp_files.pl | 1 - 28 files changed, 36 deletions(-) diff --git a/contrib/amcheck/t/002_cic.pl b/contrib/amcheck/t/002_cic.pl index d604def0d0..c84482b61e 100644 --- a/contrib/amcheck/t/002_cic.pl +++ b/contrib/amcheck/t/002_cic.pl @@ -5,7 +5,6 @@ use strict; use warnings; -use Config; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/contrib/amcheck/t/003_cic_2pc.pl b/contrib/amcheck/t/003_cic_2pc.pl index f668ed3c40..33df7d1be7 100644 --- a/contrib/amcheck/t/003_cic_2pc.pl +++ b/contrib/amcheck/t/003_cic_2pc.pl @@ -5,7 +5,6 @@ use strict; use warnings; -use Config; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl index 8c70e5b32b..a2d08a777d 100644 --- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl +++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl @@ -3,8 +3,6 @@ use strict; use warnings; -use Cwd; -use Config; use File::Basename qw(basename dirname); use File::Path qw(rmtree); use Fcntl qw(:seek); diff --git a/src/bin/pg_checksums/t/002_actions.pl b/src/bin/pg_checksums/t/002_actions.pl index 5563244f11..bba1f3494c 100644 --- a/src/bin/pg_checksums/t/002_actions.pl +++ b/src/bin/pg_checksums/t/002_actions.pl @@ -6,7 +6,6 @@ use strict; use warnings; -use Config; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/src/bin/pg_dump/t/001_basic.pl b/src/bin/pg_dump/t/001_basic.pl index 48faeb4371..e0bf3eb032 100644 --- a/src/bin/pg_dump/t/001_basic.pl +++ b/src/bin/pg_dump/t/001_basic.pl @@ -4,7 +4,6 @@ use strict; use warnings; -use Config; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl index dd065c758f..e23e8afa22 100644 --- a/src/bin/pg_dump/t/002_pg_dump.pl +++ b/src/bin/pg_dump/t/002_pg_dump.pl @@ -4,7 +4,6 @@ use strict; use warnings; -use Config; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; diff --git a/src/bin/pg_test_fsync/t/001_basic.pl b/src/bin/pg_test_fsync/t/001_basic.pl index 0b579dde9d..8c5c0e7967 100644 --- a/src/bin/pg_test_fsync/t/001_basic.pl +++ b/src/bin/pg_test_fsync/t/001_basic.pl @@ -4,7 +4,6 @@ use strict; use warnings; -use Config; use PostgreSQL::Test::Utils; use Test::More; diff --git a/src/bin/pg_test_timing/t/001_basic.pl b/src/bin/pg_test_timing/t/001_basic.pl index ef9f6d6746..51bf68b0e1 100644 --- a/src/bin/pg_test_timing/t/001_basic.pl +++ b/src/bin/pg_test_timing/t/001_basic.pl @@ -4,7 +4,6 @@ use strict; use warnings; -use Config; use PostgreSQL::Test::Utils; use Test::More; diff --git a/src/bin/pg_verifybackup/t/002_algorithm.pl b/src/bin/pg_verifybackup/t/002_algorithm.pl index 20e3ca587a..ca2c0f0c7b 100644 --- a/src/bin/pg_verifybackup/t/002_algorithm.pl +++ b/src/bin/pg_verifybackup/t/002_algorithm.pl @@ -5,8 +5,6 @@ use strict; use warnings; -use Cwd; -use Config; use File::Path qw(rmtree); use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/src/bin/pg_verifybackup/t/003_corruption.pl b/src/bin/pg_verifybackup/t/003_corruption.pl index f402d301ac..7778727eca 100644 --- a/src/bin/pg_verifybackup/t/003_corruption.pl +++ b/src/bin/pg_verifybackup/t/003_corruption.pl @@ -5,8 +5,6 @@ use strict; use warnings; -use Cwd; -use Config; use File::Path qw(rmtree); use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/src/bin/pg_verifybackup/t/004_options.pl b/src/bin/pg_verifybackup/t/004_options.pl index 7461dee03f..6fdd74e5ee 100644 --- a/src/bin/pg_verifybackup/t/004_options.pl +++ b/src/bin/pg_verifybackup/t/004_options.pl @@ -5,8 +5,6 @@ use strict; use warnings; -use Cwd; -use Config; use File::Path qw(rmtree); use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/src/bin/pg_verifybackup/t/005_bad_manifest.pl b/src/bin/pg_verifybackup/t/005_bad_manifest.pl index 118beb53d7..74d0a8d1b2 100644 --- a/src/bin/pg_verifybackup/t/005_bad_manifest.pl +++ b/src/bin/pg_verifybackup/t/005_bad_manifest.pl @@ -6,8 +6,6 @@ use strict; use warnings; -use Cwd; -use Config; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; diff --git a/src/bin/pg_verifybackup/t/006_encoding.pl b/src/bin/pg_verifybackup/t/006_encoding.pl index ce45c919a8..210f269d59 100644 --- a/src/bin/pg_verifybackup/t/006_encoding.pl +++ b/src/bin/pg_verifybackup/t/006_encoding.pl @@ -5,8 +5,6 @@ use strict; use warnings; -use Cwd; -use Config; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; diff --git a/src/bin/pg_verifybackup/t/007_wal.pl b/src/bin/pg_verifybackup/t/007_wal.pl index 56fcd84bec..bef2701ef7 100644 --- a/src/bin/pg_verifybackup/t/007_wal.pl +++ b/src/bin/pg_verifybackup/t/007_wal.pl @@ -5,8 +5,6 @@ use strict; use warnings; -use Cwd; -use Config; use File::Path qw(rmtree); use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/src/bin/pg_verifybackup/t/008_untar.pl b/src/bin/pg_verifybackup/t/008_untar.pl index 6927ca4c74..3fd18143d0 100644 --- a/src/bin/pg_verifybackup/t/008_untar.pl +++ b/src/bin/pg_verifybackup/t/008_untar.pl @@ -7,7 +7,6 @@ use strict; use warnings; -use Config; use File::Path qw(rmtree); use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/src/bin/pg_verifybackup/t/009_extract.pl b/src/bin/pg_verifybackup/t/009_extract.pl index c51cdf79f8..f5a70ff8c9 100644 --- a/src/bin/pg_verifybackup/t/009_extract.pl +++ b/src/bin/pg_verifybackup/t/009_extract.pl @@ -6,8 +6,6 @@ use strict; use warnings; -use Cwd; -use Config; use File::Path qw(rmtree); use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/src/bin/pg_verifybackup/t/010_client_untar.pl b/src/bin/pg_verifybackup/t/010_client_untar.pl index 3616529390..9fe5a43783 100644 --- a/src/bin/pg_verifybackup/t/010_client_untar.pl +++ b/src/bin/pg_verifybackup/t/010_client_untar.pl @@ -6,7 +6,6 @@ use strict; use warnings; -use Config; use File::Path qw(rmtree); use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/src/bin/pgbench/t/001_pgbench_with_server.pl b/src/bin/pgbench/t/001_pgbench_with_server.pl index 8b03900f32..8092d23736 100644 --- a/src/bin/pgbench/t/001_pgbench_with_server.pl +++ b/src/bin/pgbench/t/001_pgbench_with_server.pl @@ -7,7 +7,6 @@ use warnings; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; -use Config; # start a pgbench specific server my $node = PostgreSQL::Test::Cluster->new('main'); diff --git a/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl b/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl index 0c164dcaba..cc79d96d47 100644 --- a/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl +++ b/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl @@ -4,7 +4,6 @@ use strict; use warnings; -use Config; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; diff --git a/src/test/modules/test_pg_dump/t/001_base.pl b/src/test/modules/test_pg_dump/t/001_base.pl index c73bd37835..84a35590b7 100644 --- a/src/test/modules/test_pg_dump/t/001_base.pl +++ b/src/test/modules/test_pg_dump/t/001_base.pl @@ -4,7 +4,6 @@ use strict; use warnings; -use Config; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; diff --git a/src/test/perl/PostgreSQL/Test/Cluster.pm b/src/test/perl/PostgreSQL/Test/Cluster.pm index 41beadff9d..52c18f8c69 100644 --- a/src/test/perl/PostgreSQL/Test/Cluster.pm +++ b/src/test/perl/PostgreSQL/Test/Cluster.pm @@ -92,7 +92,6 @@ use warnings; use Carp; use Config; -use Cwd; use Fcntl qw(:mode); use File::Basename; use File::Path qw(rmtree); diff --git a/src/test/recovery/t/006_logical_decoding.pl b/src/test/recovery/t/006_logical_decoding.pl index a4d51eb995..77c85ca4b6 100644 --- a/src/test/recovery/t/006_logical_decoding.pl +++ b/src/test/recovery/t/006_logical_decoding.pl @@ -11,7 +11,6 @@ use warnings; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; -use Config; # Initialize primary node my $node_primary = PostgreSQL::Test::Cluster->new('primary'); diff --git a/src/test/recovery/t/011_crash_recovery.pl b/src/test/recovery/t/011_crash_recovery.pl index 14154d1ce0..1b57d01046 100644 --- a/src/test/recovery/t/011_crash_recovery.pl +++ b/src/test/recovery/t/011_crash_recovery.pl @@ -9,7 +9,6 @@ use warnings; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; -use Config; my $node = PostgreSQL::Test::Cluster->new('primary'); $node->init(allows_streaming => 1); diff --git a/src/test/recovery/t/013_crash_restart.pl b/src/test/recovery/t/013_crash_restart.pl index 3b740eb6f3..36e6230fac 100644 --- a/src/test/recovery/t/013_crash_restart.pl +++ b/src/test/recovery/t/013_crash_restart.pl @@ -16,7 +16,6 @@ use warnings; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; -use Config; # To avoid hanging while expecting some specific input from a psql # instance being driven by us, add a timeout high enough that it diff --git a/src/test/recovery/t/017_shm.pl b/src/test/recovery/t/017_shm.pl index 678a252165..9d26bd270e 100644 --- a/src/test/recovery/t/017_shm.pl +++ b/src/test/recovery/t/017_shm.pl @@ -6,7 +6,6 @@ # use strict; use warnings; -use Config; use File::stat qw(stat); use IPC::Run 'run'; use PostgreSQL::Test::Cluster; diff --git a/src/test/recovery/t/020_archive_status.pl b/src/test/recovery/t/020_archive_status.pl index cbff26e122..e6e4eb56a9 100644 --- a/src/test/recovery/t/020_archive_status.pl +++ b/src/test/recovery/t/020_archive_status.pl @@ -9,7 +9,6 @@ use warnings; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; -use Config; my $primary = PostgreSQL::Test::Cluster->new('primary'); $primary->init( diff --git a/src/test/recovery/t/021_row_visibility.pl b/src/test/recovery/t/021_row_visibility.pl index e01f3f57c7..b63e32d8cb 100644 --- a/src/test/recovery/t/021_row_visibility.pl +++ b/src/test/recovery/t/021_row_visibility.pl @@ -9,7 +9,6 @@ use warnings; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; -use Config; # Initialize primary node my $node_primary = PostgreSQL::Test::Cluster->new('primary'); diff --git a/src/test/recovery/t/022_crash_temp_files.pl b/src/test/recovery/t/022_crash_temp_files.pl index c37723a144..c98475c4c7 100644 --- a/src/test/recovery/t/022_crash_temp_files.pl +++ b/src/test/recovery/t/022_crash_temp_files.pl @@ -7,7 +7,6 @@ use warnings; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; -use Config; if ($windows_os) { -- 2.24.3 (Apple Git-128)