Commita475a2f

committed

Don't clobber test exit code at cleanup in LDAP/Kerberors tests

If the test script die()d before running the first test, the whole testwas interpreted as SKIPped rather than failed. The PostgreSQL::Clustermodule got this right.Backpatch to all supported versions.Discussion:https://www.postgresql.org/message-id/fb898a70-3a88-4629-88e9-f2375020061d@iki.fi

1 parente13b586 commita475a2fCopy full SHA for a475a2f

File tree

+10

-0

lines changed

+10

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,12 @@`
`203`	`203`
`204`	`204`	`END`
`205`	`205`	`{`
	`206`	`+# take care not to change the script's exit value`
	`207`	`+my$exit_code =$?;`
	`208`	`+`
`206`	`209`	kill'INT',`cat$kdc_pidfile`ifdefined($kdc_pidfile) &&-f$kdc_pidfile;
	`210`	`+`
	`211`	`+$? =$exit_code;`
`207`	`212`	`}`
`208`	`213`
`209`	`214`	`note"setting up PostgreSQL instance";`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -145,13 +145,18 @@ INIT`
`145`	`145`
`146`	`146`	`END`
`147`	`147`	`{`
	`148`	`+# take care not to change the script's exit value`
	`149`	`+my$exit_code =$?;`
	`150`	`+`
`148`	`151`	`foreachmy$server (@servers)`
`149`	`152`	`{`
`150`	`153`	`nextunless-f$server->{pidfile};`
`151`	`154`	`my$pid = slurp_file($server->{pidfile});`
`152`	`155`	`chomp$pid;`
`153`	`156`	`kill'INT',$pid;`
`154`	`157`	`}`
	`158`	`+`
	`159`	`+$? =$exit_code;`
`155`	`160`	`}`
`156`	`161`
`157`	`162`	`=pod`

Comments

(0)