testcases/lib: Add inject_randr15_outputinfo argument

Allow tests to specify a file name for inject_randr15's
--getoutputinfo_reply command-line parameter.

diff --git a/testcases/lib/SocketActivation.pm b/testcases/lib/SocketActivation.pm
index 0f307eb3366abc04c230f068ee050fd9347d6a70..5951fd2663c6bb9e415db13750da670a346af132 100644 (file)
--- a/testcases/lib/SocketActivation.pm
+++ b/testcases/lib/SocketActivation.pm
@@ -145,7 +145,12 @@ sub activate_i3 {
         if ($args{inject_randr15}) {
             # See comment in $args{strace} branch.
             $cmd = 'test.inject_randr15 --getmonitors_reply="' .
-                   $args{inject_randr15} . '" -- ' .
+                   $args{inject_randr15} . '" ' .
+                   ($args{inject_randr15_outputinfo}
+                    ? '--getoutputinfo_reply="' .
+                      $args{inject_randr15_outputinfo} . '" '
+                    : '') .
+                   '-- ' .
                    'sh -c "export LISTEN_PID=\$\$; ' . $cmd . '"';
         }
 

diff --git a/testcases/lib/i3test.pm.in b/testcases/lib/i3test.pm.in
index 18bebb52146ed0dba8e2471d565c1a1118f9520f..f9b3e9398e4165e35edb1d4ee7cc2dd8776ecfae 100644 (file)
--- a/testcases/lib/i3test.pm.in
+++ b/testcases/lib/i3test.pm.in
@@ -863,6 +863,7 @@ sub launch_with_config {
         dont_create_temp_dir => $args{dont_create_temp_dir},
         validate_config => $args{validate_config},
         inject_randr15 => $args{inject_randr15},
+        inject_randr15_outputinfo => $args{inject_randr15_outputinfo},
     );
 
     # If we called i3 with -C, we wait for it to exit and then return as