Attachment 10106 Details for Bug 10696 – Additional patch for v4-0-test

[patch] Additional patch for v4-0-test

tmp40-2.diff (text/plain), 2.15 KB, created by Stefan Metzmacher on 2014-07-14 14:45:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2014-07-14 14:45:14 UTC

Size: 2.15 KB

patch

obsolete

>From 059861ffabfecb24f5571a81b6421714b1177eb7 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 10 Jul 2014 14:28:56 +0200
>Subject: [PATCH] selftest: teardown the environments also on getting SIGPIPE
>
>make test uses
>
>selftest.pl | subuntu-filter.py ...
>
>FAIL_IMMEDIATELY=1 lets subuntu-filter.py exit,
>which generates SIGPIPE in selftest.pl.
>
>We should handle this just like any other signal
>and teardown all environments.
>
>This should make the teardown process more reliable/verbose.
>
>Pair-Programmed-With: Michael Adam <obnox@samba.org>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Signed-off-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit b2803950fc439017680069813fc49255a3f0cbbf)
>---
> selftest/selftest.pl | 25 +++++++++++++++----------
> 1 file changed, 15 insertions(+), 10 deletions(-)
>
>diff --git a/selftest/selftest.pl b/selftest/selftest.pl
>index b516eef..a823652 100755
>--- a/selftest/selftest.pl
>+++ b/selftest/selftest.pl
>@@ -61,14 +61,6 @@ my $prefix = "./st";
> my @includes = ();
> my @excludes = ();
> 
>-sub pipe_handler {
>-	my $sig = shift @_;
>-	print STDERR "Exiting early because of SIGPIPE.\n";
>-	exit(1);
>-}
>-
>-$SIG{PIPE} = \&pipe_handler;
>-
> sub find_in_list($$)
> {
> 	my ($list, $fullname) = @_;
>@@ -721,12 +713,24 @@ my @exported_envvars = (
>         "GID_RFC2307TEST"
> );
> 
>-$SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub { 
>+sub sighandler($)
>+{
> 	my $signame = shift;
>+
>+	$SIG{INT} = $SIG{QUIT} = $SIG{TERM} = 'DEFAULT';
>+	$SIG{PIPE} = 'IGNORE';
>+
>+	open(STDOUT, ">&STDERR") or die "can't dup STDOUT to STDERR: $!";
>+
>+	print "$0: PID[$$]: Got SIG${signame} teardown environments.\n";
> 	teardown_env($_) foreach(keys %running_envs);
>-	die("Received signal $signame");
>+	system("pstree -p $$");
>+	print "$0: PID[$$]: Exiting...\n";
>+	exit(1);
> };
> 
>+$SIG{INT} = $SIG{QUIT} = $SIG{TERM} = $SIG{PIPE} = \&sighandler;
>+
> sub setup_env($$)
> {
> 	my ($name, $prefix) = @_;
>@@ -822,6 +826,7 @@ sub teardown_env($)
> {
> 	my ($envname) = @_;
> 	return if ($envname eq "none");
>+	print STDERR "teardown_env($envname)\n";
> 	my $env = get_running_env($envname);
> 	$env->{target}->teardown_env($env);
> 	delete $running_envs{$envname};
>-- 
>1.9.1
>

Flags:

obnox: review+

Actions: View

Attachments on bug 10696: 10080 | 10081 | 10105 | 10106