postgres
diff --git a/‎contrib/amcheck/t/001_verify_heapam.pl
Lines changed: 3 additions & 3 deletions b/‎contrib/amcheck/t/001_verify_heapam.pl
Lines changed: 3 additions & 3 deletions
diff --git a/‎contrib/amcheck/t/002_cic.pl
Lines changed: 3 additions & 3 deletions b/‎contrib/amcheck/t/002_cic.pl
Lines changed: 3 additions & 3 deletions
diff --git a/‎contrib/amcheck/t/003_cic_2pc.pl
Lines changed: 3 additions & 3 deletions b/‎contrib/amcheck/t/003_cic_2pc.pl
Lines changed: 3 additions & 3 deletions
diff --git a/‎contrib/auto_explain/t/001_auto_explain.pl
Lines changed: 3 additions & 3 deletions b/‎contrib/auto_explain/t/001_auto_explain.pl
Lines changed: 3 additions & 3 deletions
diff --git a/‎contrib/bloom/t/001_wal.pl
Lines changed: 4 additions & 4 deletions b/‎contrib/bloom/t/001_wal.pl
Lines changed: 4 additions & 4 deletions
diff --git a/‎contrib/oid2name/t/001_basic.pl
Lines changed: 1 addition & 1 deletion b/‎contrib/oid2name/t/001_basic.pl
Lines changed: 1 addition & 1 deletion
diff --git a/‎contrib/test_decoding/t/001_repl_stats.pl
Lines changed: 3 additions & 3 deletions b/‎contrib/test_decoding/t/001_repl_stats.pl
Lines changed: 3 additions & 3 deletions
diff --git a/‎contrib/vacuumlo/t/001_basic.pl
Lines changed: 1 addition & 1 deletion b/‎contrib/vacuumlo/t/001_basic.pl
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/bin/initdb/t/001_initdb.pl
Lines changed: 3 additions & 3 deletions b/‎src/bin/initdb/t/001_initdb.pl
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/bin/pg_amcheck/t/001_basic.pl
Lines changed: 1 addition & 1 deletion b/‎src/bin/pg_amcheck/t/001_basic.pl
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/bin/pg_amcheck/t/002_nonesuch.pl
Lines changed: 3 additions & 3 deletions b/‎src/bin/pg_amcheck/t/002_nonesuch.pl
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/bin/pg_amcheck/t/003_check.pl
Lines changed: 4 additions & 4 deletions b/‎src/bin/pg_amcheck/t/003_check.pl
Lines changed: 4 additions & 4 deletions
diff --git a/‎src/bin/pg_amcheck/t/004_verify_heapam.pl
Lines changed: 3 additions & 3 deletions b/‎src/bin/pg_amcheck/t/004_verify_heapam.pl
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/bin/pg_amcheck/t/005_opclass_damage.pl
Lines changed: 3 additions & 3 deletions b/‎src/bin/pg_amcheck/t/005_opclass_damage.pl
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/bin/pg_archivecleanup/t/010_pg_archivecleanup.pl
Lines changed: 2 additions & 2 deletions b/‎src/bin/pg_archivecleanup/t/010_pg_archivecleanup.pl
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/bin/pg_basebackup/t/010_pg_basebackup.pl
Lines changed: 9 additions & 9 deletions b/‎src/bin/pg_basebackup/t/010_pg_basebackup.pl
Lines changed: 9 additions & 9 deletions
diff --git a/‎src/bin/pg_basebackup/t/020_pg_receivewal.pl
Lines changed: 3 additions & 3 deletions b/‎src/bin/pg_basebackup/t/020_pg_receivewal.pl
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/bin/pg_basebackup/t/030_pg_recvlogical.pl
Lines changed: 3 additions & 3 deletions b/‎src/bin/pg_basebackup/t/030_pg_recvlogical.pl
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/bin/pg_checksums/t/001_basic.pl
Lines changed: 1 addition & 1 deletion b/‎src/bin/pg_checksums/t/001_basic.pl
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/bin/pg_checksums/t/002_actions.pl
Lines changed: 4 additions & 4 deletions b/‎src/bin/pg_checksums/t/002_actions.pl
Lines changed: 4 additions & 4 deletions
@@ -4,8 +4,8 @@
 use strict;
 use warnings;
 
-use PostgresNode;
-use TestLib;
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
 
 use Fcntl qw(:seek);
 use Test::More tests => 272;
@@ -15,7 +15,7 @@
 #
 # Test set-up
 #
-$node = PostgresNode->new('test');
+$node = PostgreSQL::Test::Cluster->new('test');
 $node->init;
 $node->append_conf('postgresql.conf', 'autovacuum=off');
 $node->start;
 
@@ -6,8 +6,8 @@
 use warnings;
 
 use Config;
-use PostgresNode;
-use TestLib;
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
 
 use Test::More tests => 4;
 
@@ -16,7 +16,7 @@
 #
 # Test set-up
 #
-$node = PostgresNode->new('CIC_test');
+$node = PostgreSQL::Test::Cluster->new('CIC_test');
 $node->init;
 $node->append_conf('postgresql.conf', 'lock_timeout = 180000');
 $node->start;
 
@@ -6,8 +6,8 @@
 use warnings;
 
 use Config;
-use PostgresNode;
-use TestLib;
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
 
 use Test::More tests => 6;
 
@@ -16,7 +16,7 @@
 #
 # Test set-up
 #
-$node = PostgresNode->new('CIC_2PC_test');
+$node = PostgreSQL::Test::Cluster->new('CIC_2PC_test');
 $node->init;
 $node->append_conf('postgresql.conf', 'max_prepared_transactions = 10');
 $node->append_conf('postgresql.conf', 'lock_timeout = 180000');
 
@@ -4,11 +4,11 @@
 use strict;
 use warnings;
 
-use PostgresNode;
-use TestLib;
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
 use Test::More tests => 4;
 
-my $node = PostgresNode->new('main');
+my $node = PostgreSQL::Test::Cluster->new('main');
 $node->init;
 $node->append_conf('postgresql.conf',
 	"shared_preload_libraries = 'auto_explain'");
 
@@ -4,8 +4,8 @@
 # Test generic xlog record work for bloom index replication.
 use strict;
 use warnings;
-use PostgresNode;
-use TestLib;
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
 use Test::More tests => 31;
 
 my $node_primary;
@@ -41,7 +41,7 @@ sub test_index_replay
 }
 
 # Initialize primary node
-$node_primary = PostgresNode->new('primary');
+$node_primary = PostgreSQL::Test::Cluster->new('primary');
 $node_primary->init(allows_streaming => 1);
 $node_primary->start;
 my $backup_name = 'my_backup';
@@ -50,7 +50,7 @@ sub test_index_replay
 $node_primary->backup($backup_name);
 
 # Create streaming standby linking to primary
-$node_standby = PostgresNode->new('standby');
+$node_standby = PostgreSQL::Test::Cluster->new('standby');
 $node_standby->init_from_backup($node_primary, $backup_name,
 	has_streaming => 1);
 $node_standby->start;
 
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
-use TestLib;
+use PostgreSQL::Test::Utils;
 use Test::More tests => 8;
 
 #########################################
 
@@ -6,12 +6,12 @@
 use strict;
 use warnings;
 use File::Path qw(rmtree);
-use PostgresNode;
-use TestLib;
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
 use Test::More tests => 2;
 
 # Test set-up
-my $node = PostgresNode->new('test');
+my $node = PostgreSQL::Test::Cluster->new('test');
 $node->init(allows_streaming => 'logical');
 $node->append_conf('postgresql.conf', 'synchronous_commit = on');
 $node->start;
 
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
-use TestLib;
+use PostgreSQL::Test::Utils;
 use Test::More tests => 8;
 
 program_help_ok('vacuumlo');
 
@@ -9,11 +9,11 @@
 use warnings;
 use Fcntl ':mode';
 use File::stat qw{lstat};
-use PostgresNode;
-use TestLib;
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
 use Test::More tests => 22;
 
-my $tempdir = TestLib::tempdir;
+my $tempdir = PostgreSQL::Test::Utils::tempdir;
 my $xlogdir = "$tempdir/pgxlog";
 my $datadir = "$tempdir/data";
 
 
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
-use TestLib;
+use PostgreSQL::Test::Utils;
 
 program_help_ok('pg_amcheck');
 
@@ -4,13 +4,13 @@
 use strict;
 use warnings;
 
-use PostgresNode;
-use TestLib;
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
 use Test::More tests => 76;
 
 # Test set-up
 my ($node, $port);
-$node = PostgresNode->new('test');
+$node = PostgreSQL::Test::Cluster->new('test');
 $node->init;
 $node->start;
 $port = $node->port;
 
@@ -4,8 +4,8 @@
 use strict;
 use warnings;
 
-use PostgresNode;
-use TestLib;
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
 
 use Fcntl qw(:seek);
 use Test::More tests => 63;
@@ -120,7 +120,7 @@ ()
 }
 
 # Test set-up
+$node = PostgreSQL::Test::Cluster->new('test');
 $node->init;
 $node->append_conf('postgresql.conf', 'autovacuum=off');
 $node->start;
@@ -316,7 +316,7 @@ ()
 # Leave 'db3' uncorrupted
 #
 
-# Standard first arguments to TestLib functions
+# Standard first arguments to PostgreSQL::Test::Utils functions
 my @cmd = ('pg_amcheck', '-p', $port);
 
 # Regular expressions to match various expected output
 
@@ -4,8 +4,8 @@
 use strict;
 use warnings;
 
-use PostgresNode;
-use TestLib;
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
 
 use Fcntl qw(:seek);
 use Test::More;
@@ -178,7 +178,7 @@ sub write_tuple
 # Set up the node.  Once we create and corrupt the table,
 # autovacuum workers visiting the table could crash the backend.
 # Disable autovacuum so that won't happen.
-my $node = PostgresNode->new('test');
+my $node = PostgreSQL::Test::Cluster->new('test');
 $node->init;
 $node->append_conf('postgresql.conf', 'autovacuum=off');
 
 
@@ -6,11 +6,11 @@
 #
 use strict;
 use warnings;
-use PostgresNode;
-use TestLib;
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
 use Test::More tests => 5;
 
-my $node = PostgresNode->new('test');
+my $node = PostgreSQL::Test::Cluster->new('test');
 $node->init;
 $node->start;
 
 
@@ -3,14 +3,14 @@
 
 use strict;
 use warnings;
-use TestLib;
+use PostgreSQL::Test::Utils;
 use Test::More tests => 42;
 
 program_help_ok('pg_archivecleanup');
 program_version_ok('pg_archivecleanup');
 program_options_handling_ok('pg_archivecleanup');
 
-my $tempdir = TestLib::tempdir;
+my $tempdir = PostgreSQL::Test::Utils::tempdir;
 
 my @walfiles = (
 	'00000001000000370000000C.gz', '00000001000000370000000D',
 
@@ -8,17 +8,17 @@
 use File::Basename qw(basename dirname);
 use File::Path qw(rmtree);
 use Fcntl qw(:seek);
-use PostgresNode;<
10000
/div>
-use TestLib;
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
 use Test::More tests => 110;
 
 program_help_ok('pg_basebackup');
 program_version_ok('pg_basebackup');
 program_options_handling_ok('pg_basebackup');
 
-my $tempdir = TestLib::tempdir;
+my $tempdir = PostgreSQL::Test::Utils::tempdir;
 
-my $node = PostgresNode->new('main');
+my $node = PostgreSQL::Test::Cluster->new('main');
 
 # Set umask so test directories and files are created with default permissions
 umask(0077);
@@ -238,14 +238,14 @@
 # to our physical temp location.  That way we can use shorter names
 # for the tablespace directories, which hopefully won't run afoul of
 # the 99 character length limit.
-my $sys_tempdir = TestLib::tempdir_short;
-my $real_sys_tempdir = TestLib::perl2host($sys_tempdir) . "/tempdir";
+my $sys_tempdir = PostgreSQL::Test::Utils::tempdir_short;
+my $real_sys_tempdir = PostgreSQL::Test::Utils::perl2host($sys_tempdir) . "/tempdir";
 my $shorter_tempdir =  $sys_tempdir . "/tempdir";
 dir_symlink "$tempdir", $shorter_tempdir;
 
 mkdir "$tempdir/tblspc1";
 my $realTsDir    = "$real_sys_tempdir/tblspc1";
-my $real_tempdir = TestLib::perl2host($tempdir);
+my $real_tempdir = PostgreSQL::Test::Utils::perl2host($tempdir);
 $node->safe_psql('postgres',
 	"CREATE TABLESPACE tblspc1 LOCATION '$realTsDir';");
 $node->safe_psql('postgres',
@@ -270,7 +270,7 @@
 	skip "no tar program available", 1
 	  if (!defined $tar || $tar eq '');
 
-	my $node2 = PostgresNode->new('replica');
+	my $node2 = PostgreSQL::Test::Cluster->new('replica');
 
 	# Recover main data directory
 	$node2->init_from_backup($node, 'tarbackup2', tar_program => $tar);
@@ -279,7 +279,7 @@
 	my $repTsDir     = "$tempdir/tblspc1replica";
 	my $realRepTsDir = "$real_sys_tempdir/tblspc1replica";
 	mkdir $repTsDir;
-	TestLib::system_or_bail($tar, 'xf', $tblspc_tars[0], '-C', $repTsDir);
+	PostgreSQL::Test::Utils::system_or_bail($tar, 'xf', $tblspc_tars[0], '-C', $repTsDir);
 
 	# Update tablespace map to point to new directory.
 	# XXX Ideally pg_basebackup would handle this.
 
@@ -3,8 +3,8 @@
 
 use strict;
 use warnings;
-use TestLib;
-use PostgresNode;
+use PostgreSQL::Test::Utils;
+use PostgreSQL::Test::Cluster;
 use Test::More tests => 27;
 
 program_help_ok('pg_receivewal');
@@ -14,7 +14,7 @@
 # Set umask so test directories and files are created with default permissions
 umask(0077);
 
-my $primary = PostgresNode->new('primary');
+my $primary = PostgreSQL::Test::Cluster->new('primary');
 $primary->init(allows_streaming => 1);
 $primary->start;
 
 
@@ -3,15 +3,15 @@
 
 use strict;
 use warnings;
-use TestLib;
-use PostgresNode;
+use PostgreSQL::Test::Utils;
+use PostgreSQL::Test::Cluster;
 use Test::More tests => 20;
 
 program_help_ok('pg_recvlogical');
 program_version_ok('pg_recvlogical');
 program_options_handling_ok('pg_recvlogical');
 
-my $node = PostgresNode->new('main');
+my $node = PostgreSQL::Test::Cluster->new('main');
 
 # Initialize node without replication settings
 $node->init(allows_streaming => 1, has_archiving => 1);
 
@@ -3,7 +3,7 @@
 
 use strict;
 use warnings;
-use TestLib;
+use PostgreSQL::Test::Utils;
 use Test::More tests => 8;
 
 program_help_ok('pg_checksums');
 
@@ -7,8 +7,8 @@
 use strict;
 use warnings;
 use Config;
-use PostgresNode;
-use TestLib;
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
 
 use Fcntl qw(:seek);
 use Test::More tests => 66;
@@ -93,7 +93,7 @@ sub check_relation_corruption
 }
 
 # Initialize node with checksums disabled.
-my $node = PostgresNode->new('node_checksum');
+my $node = PostgreSQL::Test::Cluster->new('node_checksum');
 $node->init();
 my $pgdata = $node->data_dir;
 
@@ -207,7 +207,7 @@ sub check_relation_corruption
 my $basedir        = $node->basedir;
 my $tablespace_dir = "$basedir/ts_corrupt_dir";
 mkdir($tablespace_dir);
-$tablespace_dir = TestLib::perl2host($tablespace_dir);
+$tablespace_dir = PostgreSQL::Test::Utils::perl2host($tablespace_dir);
 $node->safe_psql('postgres',
 	"CREATE TABLESPACE ts_corrupt LOCATION '$tablespace_dir';");
 check_relation_corruption($node, 'corrupt2', 'ts_corrupt');