exit_gracefully($i3_pid, "/tmp/nested-$ENV{DISPLAY}");
} else {
- kill(9, $i3_pid)
+ kill(-9, $i3_pid)
or $tester->BAIL_OUT("could not kill i3");
waitpid $i3_pid, 0;
my $pkg = caller;
$i3_autostart = delete($args{i3_autostart}) // 1;
+ my $i3_config = delete($args{i3_config}) // '-default';
- my $cv = launch_with_config('-default', dont_block => 1)
+ my $cv = launch_with_config($i3_config, dont_block => 1)
if $i3_autostart;
my $test_more_args = '';
if ($cache && defined($_cached_socket_path)) {
return $_cached_socket_path;
}
-
- my $atom = $x->atom(name => 'I3_SOCKET_PATH');
- my $cookie = $x->get_property(0, $x->get_root_window(), $atom->id, GET_PROPERTY_TYPE_ANY, 0, 256);
- my $reply = $x->get_property_reply($cookie->{sequence});
- my $socketpath = $reply->{value};
- if ($socketpath eq "/tmp/nested-$ENV{DISPLAY}") {
- $socketpath .= '-activation';
- }
+ my $socketpath = i3test::Util::get_socket_path($x);
$_cached_socket_path = $socketpath;
return $socketpath;
}
my ($fh, $tmpfile) = tempfile("i3-cfg-for-$ENV{TESTNAME}-XXXXX", UNLINK => 1);
+ say $fh "ipc-socket $tmp_socket_path"
+ unless $args{dont_add_socket_path};
+
if ($config ne '-default') {
- say $fh $config;
+ print $fh $config;
} else {
open(my $conf_fh, '<', '@abs_top_srcdir@/testcases/i3-test.config')
or $tester->BAIL_OUT("could not open default config: $!");
say $fh scalar <$conf_fh>;
}
- say $fh "ipc-socket $tmp_socket_path"
- unless $args{dont_add_socket_path};
-
close($fh);
my $cv = AnyEvent->condvar;