testcases: move Xdummy cleanup code to StartXDummy

2011-11-27 18:21:41 +01:00
parent 43b8b8356d
commit 55c474d864
2 changed files with 3 additions and 7 deletions
--- 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