Merge pull request #3433 from orestisf1993/janitorial

[i3/i3] / testcases / lib / StartXServer.pm

diff --git a/testcases/lib/StartXServer.pm b/testcases/lib/StartXServer.pm
index d3042c07195ead9543266a592036e49772b7dbc2..4c5bd6f54c74fc9358e6c7cbc4878de09ef3f2df 100644 (file)
--- a/testcases/lib/StartXServer.pm
+++ b/testcases/lib/StartXServer.pm
@@ -57,7 +57,7 @@ sub wait_for_x {
 =head2 start_xserver($parallel)
 
 Starts C<$parallel> (or number of cores * 2 if undef) Xephyr processes (see
-http://www.freedesktop.org/wiki/Software/Xephyr/) and returns two arrayrefs: a
+https://www.freedesktop.org/wiki/Software/Xephyr/) and returns two arrayrefs: a
 list of X11 display numbers to the Xephyr processes and a list of PIDs of the
 processes.
 
@@ -87,7 +87,7 @@ sub start_xserver {
 
     # First get the last used display number, then increment it by one.
     # Effectively falls back to 1 if no X server is running.
-    my ($displaynum) = map { /(\d+)$/ } reverse sort glob($x_socketpath . '*');
+    my ($displaynum) = reverse sort { $a <=> $b } map{ /(\d+)$/ } glob($x_socketpath . '*');
     $displaynum++;
 
     say "Starting $parallel Xephyr instances, starting at :$displaynum...";
@@ -105,7 +105,7 @@ sub start_xserver {
     for (1 .. $parallel) {
         my $socket = fork_xserver($keep_xserver_output, $displaynum,
                 'Xephyr', ":$displaynum", '-screen', '1280x800',
-                '-nolisten', 'tcp');
+                '-nolisten', 'tcp', '-name', "i3test");
         push(@displays, ":$displaynum");
         push(@sockets_waiting, $socket);
         $displaynum++;