Commit1800214

committed

Merge branch 'REL9_5_STABLE' into PGPRO9_5

Merge tap test fixes

2 parents210f91c +0887382 commit1800214Copy full SHA for 1800214

File tree

-0

lines changed

-0

lines changed

Lines changed: 1 addition & 0 deletions

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -122,5 +122,8 @@ ssl/root+client.crl: ssl/root.crl ssl/client.crl`
`122`	`122`	`sslfiles-clean:`
`123`	`123`	`rm -f$(SSLFILES) ssl/client_ca.srl ssl/server_ca.srl ssl/client_ca-certindex* ssl/server_ca-certindex* ssl/root_ca-certindex* ssl/root_ca.srl ssl/temp_ca.crt ssl/temp_ca_signed.crt`
`124`	`124`
	`125`	`+cleandistcleanmaintainer-clean:`
	`126`	`+rm -rf tmp_check`
	`127`	`+`
`125`	`128`	`check:`
`126`	`129`	`$(prove_check)`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ if exist src\test\regress\autoinc.dll del /q src\test\regress\autoinc.dll`
`92`	`92`	`ifexist src\bin\initdb\tmp_checkrd /s /q src\bin\initdb\tmp_check`
`93`	`93`	`ifexist src\bin\pg_basebackup\tmp_checkrd /s /q src\bin\pg_basebackup\tmp_check`
`94`	`94`	`ifexist src\bin\pg_config\tmp_checkrd /s /q src\bin\pg_config\tmp_check`
	`95`	`+ifexist src\bin\pg_controldata\tmp_checkrd /s /q src\bin\pg_controldata\tmp_check`
`95`	`96`	`ifexist src\bin\pg_ctl\tmp_checkrd /s /q src\bin\pg_ctl\tmp_check`
`96`	`97`	`ifexist src\bin\pg_rewind\tmp_checkrd /s /q src\bin\pg_rewind\tmp_check`
`97`	`98`	`ifexist src\bin\pgbench\tmp_checkrd /s /q src\bin\pgbench\tmp_check`

Comments

(0)