fixing redeclaration warnings in testcases

diff --git a/testcases/t/113-urgent.t b/testcases/t/113-urgent.t
index 9c1507e679e21217e92abab9a864b2f3ce95289b..1e2644ad96ed334437042825293b50df54660753 100644 (file)
--- a/testcases/t/113-urgent.t
+++ b/testcases/t/113-urgent.t
@@ -304,7 +304,7 @@ for ($type = 1; $type <= 2; $type++) {
     cmd 'move right';
     cmd '[id="' . $w3->id . '"] focus';
     sync_with_i3;
-    my $ws = get_ws($tmp);
+    $ws = get_ws($tmp);
     ok(!$ws->{urgent}, 'urgent flag not set on workspace');
 
 ##############################################################################

diff --git a/testcases/t/156-fullscreen-focus.t b/testcases/t/156-fullscreen-focus.t
index cfa2405e4b3e124021fcba5f28550c5aba18d74e..9c396f40fadfc0a438e5a9c13f3978bb77d0bb8f 100644 (file)
--- a/testcases/t/156-fullscreen-focus.t
+++ b/testcases/t/156-fullscreen-focus.t
@@ -340,8 +340,8 @@ is_num_fullscreen($tmp, 0, 'no fullscreen windows');
 kill_all_windows;
 
 $tmp = fresh_workspace;
-my $first = open_floating_window;
-my $second = open_window;
+$first = open_floating_window;
+$second = open_window;
 cmd 'fullscreen';
 is($x->input_focus, $second->id, 'fullscreen window focused');
 is_num_fullscreen($tmp, 1, '1 fullscreen window');
@@ -356,8 +356,8 @@ is_num_fullscreen($tmp, 0, 'no fullscreen windows');
 kill_all_windows;
 
 $tmp = fresh_workspace;
-my $first = open_window;
-my $second = open_floating_window;
+$first = open_window;
+$second = open_floating_window;
 cmd 'fullscreen';
 is($x->input_focus, $second->id, 'fullscreen window focused');
 is_num_fullscreen($tmp, 1, '1 fullscreen window');
@@ -376,10 +376,10 @@ is_num_fullscreen($tmp, 0, 'no fullscreen windows');
 kill_all_windows;
 
 $tmp = fresh_workspace;
-my $first = open_window;
+$first = open_window;
 
 $tmp2 = fresh_workspace;
-my $second = open_window;
+$second = open_window;
 cmd 'fullscreen';
 is($x->input_focus, $second->id, 'fullscreen window focused');
 is_num_fullscreen($tmp2, 1, '1 fullscreen window');

diff --git a/testcases/t/185-scratchpad.t b/testcases/t/185-scratchpad.t
index f94bd75b61c6a85c658c8812fec0765652707c61..147890e1f9a20742842ebf5d16e4f37ca24315cc 100644 (file)
--- a/testcases/t/185-scratchpad.t
+++ b/testcases/t/185-scratchpad.t
@@ -429,7 +429,7 @@ does_i3_live;
 ################################################################################
 
 clear_scratchpad;
-my $ws = fresh_workspace;
+$ws = fresh_workspace;
 
 open_window;
 my $scratch = get_focused($ws);

diff --git a/testcases/t/189-floating-constraints.t b/testcases/t/189-floating-constraints.t
index ea4c08de0ddfdcaf33d865366a516cc961958e12..6b082bfdcb1bab61bbe2a108fd8bc9e47ccb3272 100644 (file)
--- a/testcases/t/189-floating-constraints.t
+++ b/testcases/t/189-floating-constraints.t
@@ -190,7 +190,7 @@ exit_gracefully($pid);
 # 7: check floating_maximum_size with cmd_size
 ################################################################################
 
-my $config = <<EOT;
+$config = <<EOT;
 # i3 config file (v4)
 font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 
@@ -201,12 +201,12 @@ EOT
 
 $pid = launch_with_config($config);
 
-my $window = open_floating_window(rect => [ 0, 0, 90, 80 ]);
+$window = open_floating_window(rect => [ 0, 0, 90, 80 ]);
 cmd 'border none';
 
 cmd 'resize set 101 91';
 sync_with_i3;
-my $rect = $window->rect;
+$rect = $window->rect;
 is($rect->{width}, 100, 'width did not exceed maximum width');
 is($rect->{height}, 90, 'height did not exceed maximum height');
 

diff --git a/testcases/t/195-net-active-window.t b/testcases/t/195-net-active-window.t
index aee1e03a69d3288e7d2facaa0967923b6cfefb43..18245dfc2149b22bbcbbfef39b5fb5cac473afef 100644 (file)
--- a/testcases/t/195-net-active-window.t
+++ b/testcases/t/195-net-active-window.t
@@ -137,7 +137,7 @@ is($x->input_focus, $win3->id, 'window 3 still focused');
 # is received.
 ################################################################################
 
-my $scratch = open_window;
+$scratch = open_window;
 
 is($x->input_focus, $scratch->id, 'to-scratchpad window has focus');
 

diff --git a/testcases/t/240-focus-on-window-activation.t b/testcases/t/240-focus-on-window-activation.t
index cd3989c4257a89fcf88491ba3cf183ef4ffc11ed..57060753978ac6f5c99085109e43b2c00a96df43 100644 (file)
--- a/testcases/t/240-focus-on-window-activation.t
+++ b/testcases/t/240-focus-on-window-activation.t
@@ -111,7 +111,7 @@ EOT
 
 $pid = launch_with_config($config);
 
-my $ws = fresh_workspace;
+$ws = fresh_workspace;
 $first = open_window;
 $second = open_window;
 
@@ -165,7 +165,7 @@ EOT
 
 $pid = launch_with_config($config);
 
-my $ws = fresh_workspace;
+$ws = fresh_workspace;
 $first = open_window;
 $second = open_window;
 

diff --git a/testcases/t/252-floating-size.t b/testcases/t/252-floating-size.t
index ac0c48d03d81a8ba31209197df47dd9c601426c0..2c8edf397084f2226a62ce56c4da6a8ffb17e3da 100644 (file)
--- a/testcases/t/252-floating-size.t
+++ b/testcases/t/252-floating-size.t
@@ -79,8 +79,8 @@ cmp_ok($content[0]->{rect}->{height}, '==', $expected_height, "height changed to
 ################################################################################
 
 cmd 'resize set 44 ppt 111 px';
-my $expected_width = int(0.44 * 1333);
-my $expected_height = 111;
+$expected_width = int(0.44 * 1333);
+$expected_height = 111;
 
 @content = @{get_ws($tmp)->{floating_nodes}};
 cmp_ok($content[0]->{rect}->{x}, '==', $oldrect->{x}, 'x untouched');
@@ -89,8 +89,8 @@ cmp_ok($content[0]->{rect}->{width}, '==', $expected_width, "width changed to $e
 cmp_ok($content[0]->{rect}->{height}, '==', $expected_height, "height changed to $expected_height px");
 
 cmd 'resize set 222 px 100 ppt';
-my $expected_width = 222;
-my $expected_height = 999;
+$expected_width = 222;
+$expected_height = 999;
 
 @content = @{get_ws($tmp)->{floating_nodes}};
 cmp_ok($content[0]->{rect}->{x}, '==', $oldrect->{x}, 'x untouched');

diff --git a/testcases/t/504-move-workspace-to-output.t b/testcases/t/504-move-workspace-to-output.t
index 86bad5e505a1b2bb8c6f68834c2cd17f52d8310b..4ec33f6632e0de0bde9b3221a17cef30a1cc09a3 100644 (file)
--- a/testcases/t/504-move-workspace-to-output.t
+++ b/testcases/t/504-move-workspace-to-output.t
@@ -187,10 +187,10 @@ ok($ws1 ~~ @$x0, 'ws1 on fake-0');
 my $__i3_scratch = get_ws('__i3_scratch');
 is(scalar @{$__i3_scratch->{floating_nodes}}, 0, 'scratchpad is empty');
 
-my $ws0 = fresh_workspace(output => 0);
+$ws0 = fresh_workspace(output => 0);
 open_window(wm_class => 'a');
 
-my $ws1 = fresh_workspace(output => 1);
+$ws1 = fresh_workspace(output => 1);
 open_window(wm_class => 'b');
 my $scratchpad_window = open_window(wm_class => 'c');
 cmd 'move to scratchpad';