Commita9c20c8

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 parentc8df46b commita9c20c8Copy full SHA for a9c20c8

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
`@@ -184,7 +184,12 @@`
`184`	`184`
`185`	`185`	`END`
`186`	`186`	`{`
`187`		-kill'INT',`cat$kdc_pidfile`if-f$kdc_pidfile;
	`187`	`+# take care not to change the script's exit value`
	`188`	`+my$exit_code =$?;`
	`189`	`+`
	`190`	+kill'INT',`cat$kdc_pidfile`ifdefined($kdc_pidfile) &&-f$kdc_pidfile;
	`191`	`+`
	`192`	`+$? =$exit_code;`
`188`	`193`	`}`
`189`	`194`
`190`	`195`	`note"setting up PostgreSQL instance";`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,12 @@`
`163`	`163`
`164`	`164`	`END`
`165`	`165`	`{`
	`166`	`+# take care not to change the script's exit value`
	`167`	`+my$exit_code =$?;`
	`168`	`+`
`166`	`169`	kill'INT',`cat$slapd_pidfile`if-f$slapd_pidfile;
	`170`	`+`
	`171`	`+$? =$exit_code;`
`167`	`172`	`}`
`168`	`173`
`169`	`174`	`append_to_file($ldap_pwfile,$ldap_rootpw);`

Comments

(0)