nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Michael Stapelberg 2011-11-07 20:52:14 +00:00
parent af335f0403
commit 389fdcf79f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
testcases/complete-run.pl
View File

@ -141,6 +141,7 @@ sub take_job {
unix_socket_path => "/tmp/nested-$display-activation", unix_socket_path => "/tmp/nested-$display-activation",
display => $display, display => $display,
configfile => $tmpfile, configfile => $tmpfile,
outdir => $outdir,
logpath => $logpath, logpath => $logpath,
cv => $activate_cv cv => $activate_cv
); );
@ -189,7 +190,7 @@ sub take_job {
my $output; my $output;
open(my $spool, '>', \$output); open(my $spool, '>', \$output);
my $parser = TAP::Parser->new({ 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, spool => $spool,
merge => 1, merge => 1,
}); });

1
testcases/lib/i3test.pm
View File

@ -433,6 +433,7 @@ sub launch_with_config {
unix_socket_path => "$tmp_socket_path-activation", unix_socket_path => "$tmp_socket_path-activation",
display => $ENV{DISPLAY}, display => $ENV{DISPLAY},
configfile => $tmpfile, configfile => $tmpfile,
outdir => $ENV{OUTDIR},
logpath => $ENV{LOGPATH}, logpath => $ENV{LOGPATH},
cv => $cv, cv => $cv,
); );