aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2023-07-08 11:21:58 -0400
committerAndrew Dunstan <andrew@dunslane.net>2023-07-08 11:48:20 -0400
commit67ece2e709c44880bd634daa18c0f9d6862857f5 (patch)
treecb69281bc6786cb3b77e7ac026356b35b28d2093
parent1421e8f3b6fc489f66d665d2a657f1af8bcd6595 (diff)
downloadpostgresql-67ece2e709c44880bd634daa18c0f9d6862857f5.tar.gz
postgresql-67ece2e709c44880bd634daa18c0f9d6862857f5.zip
Use shorter location for pg_replslot in pg_basebackup test
The symlink to a longer location tripped up some Windows limit on buildfarm animal fairywren when running with meson, which uses slightly longer paths. Backpatch to all live branches to keep the script in sync.
-rw-r--r--src/bin/pg_basebackup/t/010_pg_basebackup.pl15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
index a06690bf745..5ac2ba1b17f 100644
--- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl
+++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
@@ -339,19 +339,20 @@ umask(0027);
# Enable group permissions on PGDATA
chmod_recursive("$pgdata", 0750, 0640);
-rename("$pgdata/pg_replslot", "$tempdir/pg_replslot")
+# Create a temporary directory in the system location.
+my $sys_tempdir = PostgreSQL::Test::Utils::tempdir_short;
+
+rename("$pgdata/pg_replslot", "$sys_tempdir/pg_replslot")
or BAIL_OUT "could not move $pgdata/pg_replslot";
-dir_symlink("$tempdir/pg_replslot", "$pgdata/pg_replslot")
+dir_symlink("$sys_tempdir/pg_replslot", "$pgdata/pg_replslot")
or BAIL_OUT "could not symlink to $pgdata/pg_replslot";
$node->start;
# Test backup of a tablespace using tar format.
-# Create a temporary directory in the system location and symlink it
-# 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 = PostgreSQL::Test::Utils::tempdir_short;
+# Symlink the system located tempdir 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 $real_sys_tempdir = "$sys_tempdir/tempdir";
dir_symlink "$tempdir", $real_sys_tempdir;