Commit32c5dc0

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 parenta13c7ee commit32c5dc0Copy full SHA for 32c5dc0

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,7 @@`
`495`	`495`	`SKIP:`
`496`	`496`	`{`
`497`	`497`	`skip"unix-style permissions not supported on Windows", 1`
`498`		`-if ($windows_os);`
	`498`	`+if ($windows_os \|\|$Config::Config{osname}eq'cygwin');`
`499`	`499`
`500`	`500`	`ok(check_mode_recursive("$tempdir/backup1", 0750, 0640),`
`501`	`501`	`"check backup dir permissions");`

Lines changed: 2 additions & 1 deletion

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", 3if ($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`

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

Comments

(0)