Skip some permissions checks on Cygwin

adunstan · adunstan · commit f83908798f78 · 2024-06-13T07:38:48.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
@@ -98,7 +98,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
@@ -483,7 +483,7 @@
 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
@@ -79,7 +79,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
@@ -60,7 +60,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_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
@@ -108,7 +108,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 = $primary->backup_dir . '/' . $name;

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@`
`98`	`98`	`SKIP:`
`99`	`99`	`{`
`100`	`100`	`skip "unix-style permissions not supported on Windows", 2`
`101`		`- if ($windows_os);`
	`101`	`+ if ($windows_os \|\| $Config::Config{osname} eq 'cygwin');`
`102`	`102`
`103`	`103`	`# Init a new db with group access`
`104`	`104`	`my $datadir_group = "$tempdir/data_group";`
Original file line number	Diff line number	Diff line change
`@@ -483,7 +483,7 @@`
`483`	`483`	`SKIP:`
`484`	`484`	`{`
`485`	`485`	`skip "unix-style permissions not supported on Windows", 1`
`486`		`- if ($windows_os);`
	`486`	`+ if ($windows_os \|\| $Config::Config{osname} eq 'cygwin');`
`487`	`487`
`488`	`488`	`ok(check_mode_recursive("$tempdir/backup1", 0750, 0640),`
`489`	`489`	`"check backup dir permissions");`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,8 @@`
`79`	`79`
`80`	`80`	`SKIP:`
`81`	`81`	`{`
`82`		`- skip "group access not supported on Windows", 3 if ($windows_os);`
	`82`	`+ skip "group access not supported on Windows", 3`
	`83`	`+ if ($windows_os \|\| $Config::Config{osname} eq 'cygwin');`
`83`	`84`
`84`	`85`	`system_or_bail 'pg_ctl', 'stop', '-D', "$tempdir/data";`
`85`	`86`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ sub run_test`
`60`	`60`	`SKIP:`
`61`	`61`	`{`
`62`	`62`	`skip "unix-style permissions not supported on Windows", 1`
`63`		`- if ($windows_os);`
	`63`	`+ if ($windows_os \|\| $Config::Config{osname} eq 'cygwin');`
`64`	`64`
`65`	`65`	`ok(check_mode_recursive($node_primary->data_dir(), 0750, 0640),`
`66`	`66`	`'check PGDATA permissions');`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,8 @@`
`108`	`108`	`SKIP:`
`109`	`109`	`{`
`110`	`110`	`skip "unix-style permissions not supported on Windows", 4`
`111`		`- if $scenario->{'skip_on_windows'} && $windows_os;`
	`111`	`+ if ($scenario->{'skip_on_windows'} &&`
	`112`	`+ ($windows_os \|\| $Config::Config{osname} eq 'cygwin'));`
`112`	`113`
`113`	`114`	`# Take a backup and check that it verifies OK.`
`114`	`115`	`my $backup_path = $primary->backup_dir . '/' . $name;`