From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 7 Nov 2011 20:52:14 +0000 (+0000)
Subject: complete-run: pass outdir (not only logpath) to activate_i3()
X-Git-Tag: 4.1~28^2~10
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=389fdcf79ff4d0b5cc403f3ccda14ae0d0af0c16;p=i3%2Fi3

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

diff --git a/testcases/complete-run.pl b/testcases/complete-run.pl
index e7651022..939ee636 100755
--- 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 39fd7a94..563837df 100644
--- 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,
     );