i3-dump-log: enable shmlog on demand

[i3/i3] / testcases / t / 207-shmlog.t

diff --git a/testcases/t/207-shmlog.t b/testcases/t/207-shmlog.t
index b63a74996aead7d0bc31d7d581a42e3ebdfb7cb8..c2b2ebaa3c1294c5c0b2652b004799062a7250ab 100644 (file)
--- a/testcases/t/207-shmlog.t
+++ b/testcases/t/207-shmlog.t
@@ -2,19 +2,19 @@
 # vim:ts=4:sw=4:expandtab
 #
 # Please read the following documents before working on tests:
-# • http://build.i3wm.org/docs/testsuite.html
+# • https://build.i3wm.org/docs/testsuite.html
 #   (or docs/testsuite)
 #
-# • http://build.i3wm.org/docs/lib-i3test.html
+# • https://build.i3wm.org/docs/lib-i3test.html
 #   (alternatively: perldoc ./testcases/lib/i3test.pm)
 #
-# • http://build.i3wm.org/docs/ipc.html
+# • https://build.i3wm.org/docs/ipc.html
 #   (or docs/ipc)
 #
 # • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
 #   (unless you are already familiar with Perl)
 #
-use i3test i3_autostart => 0;
+use i3test;
 use IPC::Run qw(run);
 use File::Temp;
 
@@ -22,18 +22,12 @@ use File::Temp;
 # 1: test that shared memory logging does not work yet
 ################################################################################
 
-my $config = <<EOT;
-# i3 config file (v4)
-font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-EOT
-
-# NB: launch_with_config sets --shmlog-size=0 because the logfile gets
-# redirected via stdout redirection anyways.
-my $pid = launch_with_config($config);
+# NB: launch_with_config (called in i3test) sets --shmlog-size=0 because the
+# logfile gets redirected via stdout redirection anyways.
 
 my $stdout;
 my $stderr;
-run [ '../i3-dump-log/i3-dump-log' ],
+run [ 'i3-dump-log' ],
     '>', \$stdout,
     '2>', \$stderr;
 
@@ -49,7 +43,7 @@ cmd 'shmlog on';
 my $random_nop = mktemp('nop.XXXXXX');
 cmd "nop $random_nop";
 
-run [ '../i3-dump-log/i3-dump-log' ],
+run [ 'i3-dump-log' ],
     '>', \$stdout,
     '2>', \$stderr;
 
@@ -60,9 +54,9 @@ like($stderr, qr#^$#, 'stderr empty');
 # 3: change size of the shared memory log buffer and verify old content is gone
 ################################################################################
 
-cmd 'shmlog ' . (23 * 1024 * 1024);
+cmd 'shmlog ' . (1 * 1024 * 1024);
 
-run [ '../i3-dump-log/i3-dump-log' ],
+run [ 'i3-dump-log' ],
     '>', \$stdout,
     '2>', \$stderr;
 
@@ -75,13 +69,11 @@ like($stderr, qr#^$#, 'stderr empty');
 
 cmd 'shmlog off';
 
-run [ '../i3-dump-log/i3-dump-log' ],
+run [ 'i3-dump-log' ],
     '>', \$stdout,
     '2>', \$stderr;
 
 like($stderr, qr#^i3-dump-log: ERROR: i3 is running, but SHM logging is not enabled\.#,
     'shm logging not enabled');
 
-exit_gracefully($pid);
-
 done_testing;