die "could not fork()";
}
if ($pid == 0) {
+ # Start a process group so that in the parent, we can kill the entire
+ # process group and immediately kill i3bar and any other child
+ # processes.
+ setpgrp;
+
$ENV{LISTEN_PID} = $$;
$ENV{LISTEN_FDS} = 1;
delete $ENV{DESKTOP_STARTUP_ID};
+ delete $ENV{I3SOCK};
+ # $SHELL could be set to fish, which will horribly break running shell
+ # commands via i3’s exec feature. This happened e.g. when having
+ # “set-option -g default-shell "/usr/bin/fish"” in ~/.tmux.conf
+ delete $ENV{SHELL};
+ unless ($args{dont_create_temp_dir}) {
+ $ENV{XDG_RUNTIME_DIR} = '/tmp/i3-testsuite/';
+ mkdir $ENV{XDG_RUNTIME_DIR};
+ }
$ENV{DISPLAY} = $args{display};
- $ENV{PATH} = join(':',
- '../i3-nagbar',
- '../i3-msg',
- '../i3-config-wizard',
- '../i3bar',
- '..',
- $ENV{PATH}
- );
# We are about to exec, but we did not modify $^F to include $socket
# when creating the socket (because the file descriptor could have a
# the interactive signalhandler to make it crash immediately instead.
# Also disable logging to SHM since we redirect the logs anyways.
# Force Xinerama because we use Xdmx for multi-monitor tests.
- my $i3cmd = abs_path("../i3") . q| -V -d all --disable-signalhandler| .
- q| --shmlog-size=0 --force-xinerama|;
+ my $i3cmd = q|i3 --shmlog-size=0 --disable-signalhandler|;
+ if (!defined($args{inject_randr15})) {
+ $i3cmd .= q| --force-xinerama|;
+ }
+ if (!$args{validate_config}) {
+ # We only set logging if i3 is actually started, but not if we only
+ # validate the config file. This is to keep logging to a minimum as
+ # such a test will likely want to inspect the log file.
+ $i3cmd .= q| -V -d all|;
+ }
# For convenience:
my $outdir = $args{outdir};
$i3cmd .= ' -L ' . abs_path('restart-state.golden');
}
+ if ($args{validate_config}) {
+ $i3cmd .= ' -C';
+ }
+
if ($args{valgrind}) {
$i3cmd =
- qq|valgrind -v --log-file="$outdir/valgrind-for-$test.log" | .
+ qq|valgrind --log-file="$outdir/valgrind-for-$test.log" | .
+ qq|--suppressions="./valgrind.supp" | .
qq|--leak-check=full --track-origins=yes --num-callers=20 | .
qq|--tool=memcheck -- $i3cmd|;
}
'sh -c "export LISTEN_PID=\$\$; ' . $cmd . '"';
}
+ if ($args{xtrace}) {
+ my $out = "$outdir/xtrace-for-$test.log";
+
+ # See comment in $args{strace} branch.
+ $cmd = qq|xtrace -n -o "$out" -- | .
+ 'sh -c "export LISTEN_PID=\$\$; ' . $cmd . '"';
+ }
+
+ if ($args{inject_randr15}) {
+ # See comment in $args{strace} branch.
+ $cmd = 'test.inject_randr15 --getmonitors_reply="' .
+ $args{inject_randr15} . '" ' .
+ ($args{inject_randr15_outputinfo}
+ ? '--getoutputinfo_reply="' .
+ $args{inject_randr15_outputinfo} . '" '
+ : '') .
+ '-- ' .
+ 'sh -c "export LISTEN_PID=\$\$; ' . $cmd . '"';
+ }
+
# We need to use the shell due to using output redirections.
exec '/bin/sh', '-c', $cmd;
# descriptor on the listening socket.
$socket->close;
+ if ($args{validate_config}) {
+ $args{cv}->send(1);
+ return $pid;
+ }
+
# We now connect (will succeed immediately) and send a request afterwards.
# As soon as the reply is there, i3 is considered ready.
my $cl = IO::Socket::UNIX->new(Peer => $args{unix_socket_path});