diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2024-06-13 07:38:48 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2024-06-13 08:10:16 -0400 |
| commit | ca947649208ce7343c54c8f92e67ea9274be812c (patch) | |
| tree | d0c1bbd4a0b2428757093f471866127e1c868ebc | |
| parent | 9256bf6eb35a06d5d78db1c3cae7e23225038172 (diff) | |
| download | postgresql-ca947649208ce7343c54c8f92e67ea9274be812c.tar.gz postgresql-ca947649208ce7343c54c8f92e67ea9274be812c.zip | |
Skip some permissions checks on Cygwin
These are checks that are already skipped on other Windows systems.
Backpatch to all live branches, as appropriate.
| -rw-r--r-- | src/bin/initdb/t/001_initdb.pl | 2 | ||||
| -rw-r--r-- | src/bin/pg_basebackup/t/010_pg_basebackup.pl | 15 | ||||
| -rw-r--r-- | src/bin/pg_ctl/t/001_start_stop.pl | 3 | ||||
| -rw-r--r-- | src/bin/pg_rewind/t/002_databases.pl | 2 |
4 files changed, 15 insertions, 7 deletions
diff --git a/src/bin/initdb/t/001_initdb.pl b/src/bin/initdb/t/001_initdb.pl index 8387b945d36..9fbecd6bcd4 100644 --- a/src/bin/initdb/t/001_initdb.pl +++ b/src/bin/initdb/t/001_initdb.pl @@ -77,7 +77,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 d0ba2ebf9b7..aea8be1f840 100644 --- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl +++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl @@ -218,7 +218,8 @@ SKIP: # skip on Windows. SKIP: { - skip "symlinks not supported on Windows", 18 if ($windows_os); + skip "symlinks not supported on Windows", 18 + if ($windows_os); # Move pg_replslot out of $pgdata and create a symlink to it. $node->stop; @@ -304,9 +305,15 @@ SKIP: "tablespace symlink was updated"); closedir $dh; - # Group access should be enabled on all backup files - ok(check_mode_recursive("$tempdir/backup1", 0750, 0640), - "check backup dir permissions"); + SKIP: + { + skip "unix-style permissions not supported on Windows", 1 + if ($Config::Config{osname} eq 'cygwin'); + + # Group access should be enabled on all backup files + ok(check_mode_recursive("$tempdir/backup1", 0750, 0640), + "check backup dir permissions"); + } # Unlogged relation forks other than init should not be copied my ($tblspc1UnloggedBackupPath) = diff --git a/src/bin/pg_ctl/t/001_start_stop.pl b/src/bin/pg_ctl/t/001_start_stop.pl index a67a7eed4fc..263e8288a54 100644 --- a/src/bin/pg_ctl/t/001_start_stop.pl +++ b/src/bin/pg_ctl/t/001_start_stop.pl @@ -78,7 +78,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 f1eb4fe1d2b..0a794b3a1b7 100644 --- a/src/bin/pg_rewind/t/002_databases.pl +++ b/src/bin/pg_rewind/t/002_databases.pl @@ -57,7 +57,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_master->data_dir(), 0750, 0640), 'check PGDATA permissions'); |