Commitf700e7d

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 parent9e04934 commitf700e7dCopy full SHA for f700e7d

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

Lines changed: 5 additions & 0 deletions

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

Comments

(0)