Skip some permissions checks on Cygwin

adunstan · adunstan · commit 57625308f62d · 2024-06-13T08:07:20.000-04:00
These are checks that are already skipped on other Windows systems.

Backpatch to all live branches, as appropriate.
diff --git a/src/bin/initdb/t/001_initdb.pl b/src/bin/initdb/t/001_initdb.pl
@@ -77,7 +77,7 @@
 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
@@ -221,7 +221,8 @@
 # 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;
@@ -307,9 +308,15 @@
 		"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
@@ -78,7 +78,8 @@
 
 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
@@ -57,7 +57,7 @@ sub run_test
   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');
diff --git a/src/bin/pg_verifybackup/t/003_corruption.pl b/src/bin/pg_verifybackup/t/003_corruption.pl
@@ -100,7 +100,8 @@
   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    = $master->backup_dir . '/' . $name;

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@`
`77`	`77`	`SKIP:`
`78`	`78`	`{`
`79`	`79`	`skip "unix-style permissions not supported on Windows", 2`
`80`		`- if ($windows_os);`
	`80`	`+ if ($windows_os \|\| $Config::Config{osname} eq 'cygwin');`
`81`	`81`
`82`	`82`	`# Init a new db with group access`
`83`	`83`	`my $datadir_group = "$tempdir/data_group";`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,8 @@`
`78`	`78`
`79`	`79`	`SKIP:`
`80`	`80`	`{`
`81`		`- skip "group access not supported on Windows", 3 if ($windows_os);`
	`81`	`+ skip "group access not supported on Windows", 3`
	`82`	`+ if ($windows_os \|\| $Config::Config{osname} eq 'cygwin');`
`82`	`83`
`83`	`84`	`system_or_bail 'pg_ctl', 'stop', '-D', "$tempdir/data";`
`84`	`85`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ sub run_test`
`57`	`57`	`SKIP:`
`58`	`58`	`{`
`59`	`59`	`skip "unix-style permissions not supported on Windows", 1`
`60`		`- if ($windows_os);`
	`60`	`+ if ($windows_os \|\| $Config::Config{osname} eq 'cygwin');`
`61`	`61`
`62`	`62`	`ok(check_mode_recursive($node_master->data_dir(), 0750, 0640),`
`63`	`63`	`'check PGDATA permissions');`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,8 @@`
`100`	`100`	`SKIP:`
`101`	`101`	`{`
`102`	`102`	`skip "unix-style permissions not supported on Windows", 4`
`103`		`- if $scenario->{'skip_on_windows'} && $windows_os;`
	`103`	`+ if ($scenario->{'skip_on_windows'} &&`
	`104`	`+ ($windows_os \|\| $Config::Config{osname} eq 'cygwin'));`
`104`	`105`
`105`	`106`	`# Take a backup and check that it verifies OK.`
`106`	`107`	`my $backup_path = $master->backup_dir . '/' . $name;`