bike/gbootroot
1
0
Fork 0
mirror of https://github.com/fspc/gbootroot.git synced 2025-03-12 07:43:22 -04:00
Code Issues Projects Releases Wiki Activity

Hopefully, this solves another @INC bug.

Browse Source
This commit is contained in:
freesource 2003-02-24 17:50:35 +00:00
parent ad86310594
commit 29d2468498
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
expect_uml
View File

@ -28,9 +28,11 @@ BEGIN {
my $fhs = grep(/\/usr\/share\/perl5/,@INC); my $fhs = grep(/\/usr\/share\/perl5/,@INC);
unshift(@INC,"."); # better make sure we mean . when we mean .
if ($fhs == 0) { if ($fhs == 0) {
unshift(@INC,"/usr/share/perl5"); unshift(@INC,"/usr/share/perl5");
unshift(@INC,"."); # better make sure we mean . when we mean .
} }

3
gbootroot
View File

@ -220,9 +220,10 @@ BEGIN {
my $fhs = grep(/\/usr\/share\/perl5/,@INC); my $fhs = grep(/\/usr\/share\/perl5/,@INC);
unshift(@INC,"."); # better make sure we mean . when we mean .
if ($fhs == 0) { if ($fhs == 0) {
unshift(@INC,"/usr/share/perl5"); unshift(@INC,"/usr/share/perl5");
unshift(@INC,"."); # better make sure we mean . when we mean .
} }

18
yard_chrooted_tests
View File

@ -30,10 +30,14 @@
## ##
############################################################################## ##############################################################################
BEGIN { BEGIN {
my $fhs = grep(/\/usr\/share\/perl5/,@INC); my $fhs = grep(/\/usr\/share\/perl5/,@INC);
unshift(@INC,"."); # better make sure we mean . when we mean .
if ($fhs == 0) { if ($fhs == 0) {
unshift(@INC,"/usr/share/perl5"); unshift(@INC,"/usr/share/perl5");
} }
@ -49,8 +53,20 @@ BEGIN {
$ENV{'PATH'} = "/usr/sbin:" . $ENV{'PATH'}; $ENV{'PATH'} = "/usr/sbin:" . $ENV{'PATH'};
} }
}
my $pwd = `pwd`; chomp $pwd;
my $tools = grep(/$pwd\/user-mode-linux\/usr\/bin/,$ENV{'PATH'});
if ($tools == 0) {
$ENV{'PATH'} = "$pwd/user-mode-linux/usr/bin:" . $ENV{'PATH'};
}
$tools = grep(/$pwd\/user-mode-linux\/usr\/lib\/uml/,$ENV{'PATH'});
if ($tools == 0) {
$ENV{'PATH'} = "$pwd/user-mode-linux/usr/lib\/uml:" . $ENV{'PATH'};
}
}
use strict; use strict;
use BootRoot::Yard; use BootRoot::Yard;