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

hlinnaka · hlinnaka · commit 0d95711ae0d3 · 2024-04-07T20:25:14.000+03:00
If the test script die()d before running the first test, the whole test was interpreted as SKIPped rather than failed. The PostgreSQL::Cluster module got this right. Backpatch to all supported versions. Discussion: https://www.postgresql.org/message-id/fb898a70-3a88-4629-88e9-f2375020061d@iki.fi
diff --git a/src/test/kerberos/t/001_auth.pl b/src/test/kerberos/t/001_auth.pl
@@ -180,7 +180,12 @@
 
 END
 {
-	kill 'INT', `cat $kdc_pidfile` if -f $kdc_pidfile;
+	# take care not to change the script's exit value
+	my $exit_code = $?;
+
+	kill 'INT', `cat $kdc_pidfile` if defined($kdc_pidfile) && -f $kdc_pidfile;
+
+	$? = $exit_code;
 }
 
 note "setting up PostgreSQL instance";
diff --git a/src/test/ldap/t/001_auth.pl b/src/test/ldap/t/001_auth.pl
@@ -147,7 +147,12 @@
 
 END
 {
+	# take care not to change the script's exit value
+	my $exit_code = $?;
+
 	kill 'INT', `cat $slapd_pidfile` if -f $slapd_pidfile;
+
+	$? = $exit_code;
 }
 
 append_to_file($ldap_pwfile, $ldap_rootpw);

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` if defined($kdc_pidfile) && -f $kdc_pidfile;
	`187`	`+`
	`188`	`+ $? = $exit_code;`
`184`	`189`	`}`
`185`	`190`
`186`	`191`	`note "setting up PostgreSQL instance";`
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);`