mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-28 00:21:50 +02:00
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 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
This commit is contained in:
parent
854dd250ee
commit
dfe402f955
@ -203,7 +203,12 @@ system_or_bail $krb5kdc, '-P', $kdc_pidfile;
|
||||
|
||||
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";
|
||||
|
@ -145,6 +145,9 @@ INIT
|
||||
|
||||
END
|
||||
{
|
||||
# take care not to change the script's exit value
|
||||
my $exit_code = $?;
|
||||
|
||||
foreach my $server (@servers)
|
||||
{
|
||||
next unless -f $server->{pidfile};
|
||||
@ -152,6 +155,8 @@ END
|
||||
chomp $pid;
|
||||
kill 'INT', $pid;
|
||||
}
|
||||
|
||||
$? = $exit_code;
|
||||
}
|
||||
|
||||
=pod
|
||||
|
Loading…
Reference in New Issue
Block a user