X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=testcases%2Ft%2F235-check-config-no-x.t;h=ef6211420a835476628b0af7c7091405dce52b64;hb=cb73fd5e31eefb3243d70db4026253e7bcafb060;hp=614d6b3a8896a4a8b1bcc30101ccfa89ab4a19b3;hpb=3c5df50c54ab6451098c2175a21470312952000e;p=i3%2Fi3

diff --git a/testcases/t/235-check-config-no-x.t b/testcases/t/235-check-config-no-x.t
index 614d6b3a..ef621142 100644
--- a/testcases/t/235-check-config-no-x.t
+++ b/testcases/t/235-check-config-no-x.t
@@ -2,13 +2,13 @@
 # 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
@@ -20,11 +20,13 @@
 use i3test i3_autostart => 0;
 use File::Temp qw(tempfile);
 
+my ($cfg, $ret, $out);
+
 sub check_config {
     my ($config) = @_;
     my ($fh, $tmpfile) = tempfile(UNLINK => 1);
     print $fh $config;
-    my $output = qx(DISPLAY= ../i3 -C -c $tmpfile 2>&1);
+    my $output = qx(DISPLAY= i3 -C -c $tmpfile 2>&1);
     my $retval = $?;
     $fh->flush;
     close($fh);
@@ -35,12 +37,12 @@ sub check_config {
 # 1: test with a bogus configuration file
 ################################################################################
 
-my $cfg = <<EOT;
+$cfg = <<EOT;
 # i3 config file (v4)
 i_am_an_unknown_config option
 EOT
 
-my ($ret, $out) = check_config($cfg);
+($ret, $out) = check_config($cfg);
 is($ret, 1, "exit code == 1");
 like($out, qr/ERROR: *CONFIG: *[Ee]xpected.*tokens/, 'bogus config file');
 
@@ -48,12 +50,12 @@ like($out, qr/ERROR: *CONFIG: *[Ee]xpected.*tokens/, 'bogus config file');
 # 2: test with a valid configuration file
 ################################################################################
 
-my $cfg = <<EOT;
+$cfg = <<EOT;
 # i3 config file (v4)
 font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 EOT
 
-my ($ret, $out) = check_config($cfg);
+($ret, $out) = check_config($cfg);
 is($ret, 0, "exit code == 0");
 is($out, "", 'valid config file');