complete-run: pass outdir (not only logpath) to activate_i3()

diff --git a/testcases/complete-run.pl b/testcases/complete-run.pl
index e7651022551efc238b9a2c63870968229e467b25..939ee6369724ca366972dfb52500cbe9bddd2582 100755 (executable)
--- a/testcases/complete-run.pl
+++ b/testcases/complete-run.pl
@@ -141,6 +141,7 @@ sub take_job {
             unix_socket_path => "/tmp/nested-$display-activation",
             display => $display,
             configfile => $tmpfile,
+            outdir => $outdir,
             logpath => $logpath,
             cv => $activate_cv
         );
@@ -189,7 +190,7 @@ sub take_job {
         my $output;
         open(my $spool, '>', \$output);
         my $parser = TAP::Parser->new({
-            exec => [ 'sh', '-c', qq|DISPLAY=$display LOGPATH="$logpath" /usr/bin/perl -Ilib $test| ],
+            exec => [ 'sh', '-c', qq|DISPLAY=$display LOGPATH="$logpath" OUTDIR="$outdir" /usr/bin/perl -Ilib $test| ],
             spool => $spool,
             merge => 1,
         });

diff --git a/testcases/lib/i3test.pm b/testcases/lib/i3test.pm
index 39fd7a94e05195cd6ee985ce7e16b62e3b95cc29..563837dfe6ca0769ef19301a3fbea83039bad570 100644 (file)
--- a/testcases/lib/i3test.pm
+++ b/testcases/lib/i3test.pm
@@ -433,6 +433,7 @@ sub launch_with_config {
         unix_socket_path => "$tmp_socket_path-activation",
         display => $ENV{DISPLAY},
         configfile => $tmpfile,
+        outdir => $ENV{OUTDIR},
         logpath => $ENV{LOGPATH},
         cv => $cv,
     );