Commit0e51485

committed

Skip some permissions checks on Cygwin

These are checks that are already skipped on other Windows systems.Backpatch to all live branches, as appropriate.

1 parent096f213 commit0e51485Copy full SHA for 0e51485

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@`
`80`	`80`	`SKIP:`
`81`	`81`	`{`
`82`	`82`	`skip"unix-style permissions not supported on Windows", 2`
`83`		`-if ($windows_os);`
	`83`	`+if ($windows_os \|\|$Config::Config{osname}eq'cygwin');`
`84`	`84`
`85`	`85`	`# Init a new db with group access`
`86`	`86`	`my$datadir_group ="$tempdir/data_group";`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@`
`369`	`369`	`SKIP:`
`370`	`370`	`{`
`371`	`371`	`skip"unix-style permissions not supported on Windows", 1`
`372`		`-if ($windows_os);`
	`372`	`+if ($windows_os \|\|$Config::Config{osname}eq'cygwin');`
`373`	`373`
`374`	`374`	`ok(check_mode_recursive("$tempdir/backup1", 0750, 0640),`
`375`	`375`	`"check backup dir permissions");`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@`
`81`	`81`
`82`	`82`	`SKIP:`
`83`	`83`	`{`
`84`		`-skip"group access not supported on Windows", 3if ($windows_os);`
	`84`	`+skip"group access not supported on Windows", 3`
	`85`	`+if ($windows_os \|\|$Config::Config{osname}eq'cygwin');`
`85`	`86`
`86`	`87`	`system_or_bail'pg_ctl','stop','-D',"$tempdir/data";`
`87`	`88`

Lines changed: 1 addition & 1 deletion

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');`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,8 @@`
`103`	`103`	`SKIP:`
`104`	`104`	`{`
`105`	`105`	`skip"unix-style permissions not supported on Windows", 4`
`106`		`-if$scenario->{'skip_on_windows'} &&$windows_os;`
	`106`	`+if ($scenario->{'skip_on_windows'} &&`
	`107`	`+ ($windows_os \|\|$Config::Config{osname}eq'cygwin'));`
`107`	`108`
`108`	`109`	`# Take a backup and check that it verifies OK.`
`109`	`110`	`my$backup_path =$primary->backup_dir .'/' .$name;`

Comments

(0)