X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2Flocal-lib.git;a=blobdiff_plain;f=t%2Fshell.t;fp=t%2Fshell.t;h=a6b599bc81f2816ae941d6bed906df3e7ec11755;hp=047d49c57cd7c69d9d65e50cd8cc51e406794e0e;hb=94ff402610700889a8d31a011a4d4dcd4c8223eb;hpb=fb6115c230d4e3b8beed851e5ab743ae7589a815 diff --git a/t/shell.t b/t/shell.t index 047d49c..a6b599b 100644 --- a/t/shell.t +++ b/t/shell.t @@ -107,19 +107,24 @@ sub call_ll { local $ENV{SHELL} = $info->{shell}; + my $script + = `"$^X" $extra_lib -Mlocal::lib$option` . "\n" + . qq{$info->{perl} -Mt::lib::ENVDumper -e1\n}; + my $file = File::Temp->new( TEMPLATE => 'll-test-script-XXXXX', TMPDIR => 1, SUFFIX => '.'.$info->{ext}, ); - - $file->print(scalar `"$^X" $extra_lib -Mlocal::lib$option` . "\n"); - $file->print(qq{$info->{perl} -Mt::lib::ENVDumper -e1\n}); - $file->close; + print { $file } $script; + close $file; my $opt = $info->{opt} ? "$info->{opt} " : ''; - my $out = `"$info->{shell}" $opt"$file"`; + my $cmd = qq{"$info->{shell}" $opt"$file"}; + my $out = `$cmd`; if ($?) { + diag "script:\n$script"; + diag "running:\n$cmd"; die "failed with code: $?"; } my $VAR1;