From c7e8bcfdc980579cd626be9cc4be040df5a7c7c1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 2 Sep 2007 17:13:56 +0000
Subject: r24899: Register signal handler that tears down environment. (This
 used to be commit fa89d228dd1988a74eea107ac8c2773cff7b9df1)

---
 source4/selftest/selftest.pl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'source4/selftest')

diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl
index 9f16db0114..5b5c0146ad 100755
--- a/source4/selftest/selftest.pl
+++ b/source4/selftest/selftest.pl
@@ -615,6 +615,12 @@ my @exported_envvars = (
 	"WINBINDD_SOCKET_DIR"
 );
 
+$SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub { 
+	my $signame = shift;
+	teardown_env($_) foreach(keys %running_envs);
+	die("Received signal $signame");
+};
+
 sub setup_env($)
 {
 	my ($envname) = @_;
@@ -633,6 +639,8 @@ sub setup_env($)
 
 	return undef unless defined($testenv_vars);
 
+	$running_envs{$envname} = $testenv_vars;
+
 	SocketWrapper::set_default_iface(6);
 	write_clientconf($conffile, $testenv_vars);
 
@@ -644,7 +652,6 @@ sub setup_env($)
 		}
 	}
 
-	$running_envs{$envname} = $testenv_vars;
 	return $testenv_vars;
 }
 
-- 
cgit