From 0e51485392c0c457de0709181a3d2bfdba6f3fb6 Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Thu, 13 Jun 2024 07:38:48 -0400 Subject: [PATCH] Skip some permissions checks on Cygwin These are checks that are already skipped on other Windows systems. Backpatch to all live branches, as appropriate. --- src/bin/initdb/t/001_initdb.pl | 2 +- src/bin/pg_basebackup/t/010_pg_basebackup.pl | 2 +- src/bin/pg_ctl/t/001_start_stop.pl | 3 ++- src/bin/pg_rewind/t/002_databases.pl | 2 +- src/bin/pg_verifybackup/t/003_corruption.pl | 3 ++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/bin/initdb/t/001_initdb.pl b/src/bin/initdb/t/001_initdb.pl index 635ff79b475..2565957efdc 100644 --- a/src/bin/initdb/t/001_initdb.pl +++ b/src/bin/initdb/t/001_initdb.pl @@ -80,7 +80,7 @@ command_fails([ 'initdb', $datadir ], 'existing data directory'); SKIP: { skip "unix-style permissions not supported on Windows", 2 - if ($windows_os); + if ($windows_os || $Config::Config{osname} eq 'cygwin'); # Init a new db with group access my $datadir_group = "$tempdir/data_group"; diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl index e23ac607aae..476db8ad68f 100644 --- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl +++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl @@ -369,7 +369,7 @@ SKIP: SKIP: { skip "unix-style permissions not supported on Windows", 1 - if ($windows_os); + if ($windows_os || $Config::Config{osname} eq 'cygwin'); ok(check_mode_recursive("$tempdir/backup1", 0750, 0640), "check backup dir permissions"); diff --git a/src/bin/pg_ctl/t/001_start_stop.pl b/src/bin/pg_ctl/t/001_start_stop.pl index d656a7fe183..cdd043fa2f2 100644 --- a/src/bin/pg_ctl/t/001_start_stop.pl +++ b/src/bin/pg_ctl/t/001_start_stop.pl @@ -81,7 +81,8 @@ $logFileName = "$tempdir/data/perm-test-640.log"; SKIP: { - skip "group access not supported on Windows", 3 if ($windows_os); + skip "group access not supported on Windows", 3 + if ($windows_os || $Config::Config{osname} eq 'cygwin'); system_or_bail 'pg_ctl', 'stop', '-D', "$tempdir/data"; diff --git a/src/bin/pg_rewind/t/002_databases.pl b/src/bin/pg_rewind/t/002_databases.pl index 72c4b225a7f..28a001ec622 100644 --- a/src/bin/pg_rewind/t/002_databases.pl +++ b/src/bin/pg_rewind/t/002_databases.pl @@ -60,7 +60,7 @@ template1 SKIP: { skip "unix-style permissions not supported on Windows", 1 - if ($windows_os); + if ($windows_os || $Config::Config{osname} eq 'cygwin'); ok(check_mode_recursive($node_primary->data_dir(), 0750, 0640), 'check PGDATA permissions'); diff --git a/src/bin/pg_verifybackup/t/003_corruption.pl b/src/bin/pg_verifybackup/t/003_corruption.pl index 867c1029105..709c2afe5bb 100644 --- a/src/bin/pg_verifybackup/t/003_corruption.pl +++ b/src/bin/pg_verifybackup/t/003_corruption.pl @@ -103,7 +103,8 @@ for my $scenario (@scenario) SKIP: { skip "unix-style permissions not supported on Windows", 4 - if $scenario->{'skip_on_windows'} && $windows_os; + if ($scenario->{'skip_on_windows'} && + ($windows_os || $Config::Config{osname} eq 'cygwin')); # Take a backup and check that it verifies OK. my $backup_path = $primary->backup_dir . '/' . $name; -- 2.39.5