Commit3d5a9bb

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 parent1843a27 commit3d5a9bbCopy full SHA for 3d5a9bb

File tree

+11

-1

lines changed

+11

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,12 @@`
`188`	`188`
`189`	`189`	`END`
`190`	`190`	`{`
`191`		-kill'INT',`cat$kdc_pidfile`if-f$kdc_pidfile;
	`191`	`+# take care not to change the script's exit value`
	`192`	`+my$exit_code =$?;`
	`193`	`+`
	`194`	+kill'INT',`cat$kdc_pidfile`ifdefined($kdc_pidfile) &&-f$kdc_pidfile;
	`195`	`+`
	`196`	`+$? =$exit_code;`
`192`	`197`	`}`
`193`	`198`
`194`	`199`	`note"setting up PostgreSQL instance";`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,12 @@`
`150`	`150`
`151`	`151`	`END`
`152`	`152`	`{`
	`153`	`+# take care not to change the script's exit value`
	`154`	`+my$exit_code =$?;`
	`155`	`+`
`153`	`156`	kill'INT',`cat$slapd_pidfile`if-f$slapd_pidfile;
	`157`	`+`
	`158`	`+$? =$exit_code;`
`154`	`159`	`}`
`155`	`160`
`156`	`161`	`append_to_file($ldap_pwfile,$ldap_rootpw);`

Comments

(0)