testcases: move Xdummy cleanup code to StartXDummy

diff --git a/testcases/complete-run.pl b/testcases/complete-run.pl
index 1cb6dab375d4487d29330ca43330b37042187142..d74da831c95639964545f13a8146415e8913bfec 100755 (executable)
--- a/testcases/complete-run.pl
+++ b/testcases/complete-run.pl
@@ -71,12 +71,8 @@ pod2usage(-verbose => 2, -exitcode => 0) if $help;
 @displays = map { s/ //g; $_ } @displays;
 
 # No displays specified, let’s start some Xdummy instances.
-if (@displays == 0) {
-    my ($displays, $pids) = start_xdummy($parallel);
-    @displays = @$displays;
+@displays = start_xdummy($parallel) if @displays == 0;
 
-    push our @CLEANUP, sub { kill(15, $_) for @$pids };
-}
 
 # connect to all displays for two reasons:
 # 1: check if the display actually works

diff --git a/testcases/lib/StartXDummy.pm b/testcases/lib/StartXDummy.pm
index 0e81dd16c356a804c6e7f4962e92e80193804bf1..2f3cfeb654df49d5bbac39d8e40d853b71e497e1 100644 (file)
--- a/testcases/lib/StartXDummy.pm
+++ b/testcases/lib/StartXDummy.pm
@@ -65,7 +65,7 @@ sub start_xdummy {
             exec './Xdummy', ":$displaynum", '-config', '/dev/null';
             exit 1;
         }
-        push(@childpids, $pid);
+        push(@main::CLEANUP, sub { kill(15, $pid) });
         push(@displays, ":$displaynum");
         push(@sockets_waiting, $x_socketpath . $displaynum);
         $displaynum++;
@@ -79,7 +79,7 @@ sub start_xdummy {
         sleep 0.1;
     }
 
-    return \@displays, \@childpids;
+    return @displays;
 }
 
 1