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

hlinnaka · hlinnaka · commit dfe402f955be · 2024-04-07T20:22:06.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
@@ -203,7 +203,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/LdapServer.pm b/src/test/ldap/LdapServer.pm
@@ -145,13 +145,18 @@ INIT
 
 END
 {
+	# take care not to change the script's exit value
+	my $exit_code = $?;
+
 	foreach my $server (@servers)
 	{
 		next unless -f $server->{pidfile};
 		my $pid = slurp_file($server->{pidfile});
 		chomp $pid;
 		kill 'INT', $pid;
 	}
+
+	$? = $exit_code;
 }
 
 =pod

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,12 @@`
`203`	`203`
`204`	`204`	`END`
`205`	`205`	`{`
`206`		- kill 'INT', `cat $kdc_pidfile` if -f $kdc_pidfile;
	`206`	`+ # take care not to change the script's exit value`
	`207`	`+ my $exit_code = $?;`
	`208`	`+`
	`209`	+ kill 'INT', `cat $kdc_pidfile` if defined($kdc_pidfile) && -f $kdc_pidfile;
	`210`	`+`
	`211`	`+ $? = $exit_code;`
`207`	`212`	`}`
`208`	`213`
`209`	`214`	`note "setting up PostgreSQL instance";`
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`	`foreach my $server (@servers)`
`149`	`152`	`{`
`150`	`153`	`next unless -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`