Unverified Commit c4e95bc3 authored by boklm's avatar boklm
Browse files

TorBootstrap.pm: add Browser dir to LD_LIBRARY_PATH

After changes in commit 0d36f05505208e8c46ece532c9cb455cde31c417 in
tor-browser-bundle.git.

This is not really needed as only the browser require this, but Tor in
the bundle is also run with this LD_LIBRARY_PATH too, so we should test
the same.
parent 269d9849
...@@ -73,7 +73,7 @@ sub fetch { ...@@ -73,7 +73,7 @@ sub fetch {
sub tor_capture_exec { sub tor_capture_exec {
my ($tbbinfos) = shift; my ($tbbinfos) = shift;
my $ld_lib = $ENV{LD_LIBRARY_PATH}; my $ld_lib = $ENV{LD_LIBRARY_PATH};
$ENV{LD_LIBRARY_PATH} = $tbbinfos->{tordir}; $ENV{LD_LIBRARY_PATH} = "$tbbinfos->{tbbdir}:$tbbinfos->{tordir}";
my @res = capture_exec(@_); my @res = capture_exec(@_);
$ENV{LD_LIBRARY_PATH} = $ld_lib; $ENV{LD_LIBRARY_PATH} = $ld_lib;
return @res; return @res;
...@@ -133,7 +133,7 @@ sub start_tor { ...@@ -133,7 +133,7 @@ sub start_tor {
'__OwningControllerProcess', $$); '__OwningControllerProcess', $$);
$tbbinfos->{torpid} = fork; $tbbinfos->{torpid} = fork;
if ($tbbinfos->{torpid} == 0) { if ($tbbinfos->{torpid} == 0) {
$ENV{LD_LIBRARY_PATH} = $tbbinfos->{tordir}; $ENV{LD_LIBRARY_PATH} = "$tbbinfos->{tbbdir}:$tbbinfos->{tordir}";
my $logfile = "$tbbinfos->{'results-dir'}/$test->{name}.log"; my $logfile = "$tbbinfos->{'results-dir'}/$test->{name}.log";
open(STDOUT, '>', $logfile); open(STDOUT, '>', $logfile);
open(STDERR, '>', $logfile); open(STDERR, '>', $logfile);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment