Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rakudo home env precedence #3797

Merged
merged 2 commits into from
Jul 17, 2020
Merged

Rakudo home env precedence #3797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a0be01
Revert "Merge pull request #3796 from vrurg/rakudo_2815"
patrickbkr Jul 17, 2020
d563072
RAKUDO_HOME env var should override a static Rakudo home
patrickbkr Jul 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Perl6/Compiler.nqp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@ class Perl6::Compiler is HLL::Compiler {
?? self.config<prefix>
!! nqp::substr($execname, 0, nqp::rindex($execname, $sep, nqp::rindex($execname, $sep) - 1));

$!rakudo-home := self.config<static-rakudo-home>
|| nqp::getenvhash()<RAKUDO_HOME>
$!rakudo-home := nqp::getenvhash()<RAKUDO_HOME>
// nqp::getenvhash()<PERL6_HOME>
// $install-dir ~ '/share/perl6';
// self.config<static-rakudo-home>
|| $install-dir ~ '/share/perl6';
if nqp::substr($!rakudo-home, nqp::chars($!rakudo-home) - 1) eq $sep {
$!rakudo-home := nqp::substr($!rakudo-home, 0, nqp::chars($!rakudo-home) - 1);
}
Expand Down
4 changes: 1 addition & 3 deletions t/harness5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,9 @@ GetOptions(

my @pass_through_options = grep m/^--?[^-]/, @ARGV;
my @files = grep m/^[^-]/, @ARGV;
my $build_rakudo_repo = "inst#$FindBin::Bin/../gen/build_rakudo_home/site";

$ENV{'HARNESS_PERL'} = ".${slash}rakudo-" . ($js ? "js" : $moar ? "m" : $jvm ? "j" : "m");
$ENV{'PERL6LIB'} = "./lib";
$ENV{RAKULIB} = $build_rakudo_repo;

my @slow;
if ($list_file) {
Expand All @@ -54,7 +52,7 @@ if ($list_file) {
if (!$perl5) {
print "Inline::Perl5 not installed: not running Perl 5 integration tests\n";
print "You can install Inline::Perl5 into the build directory with\n\n";
print " zef --install-to=$build_rakudo_repo install Inline::Perl5\n\n";
print " zef --install-to=inst#$FindBin::Bin/../gen/build_rakudo_home/site install Inline::Perl5\n\n";
}

open(my $f, '<', $list_file)
Expand Down
4 changes: 1 addition & 3 deletions t/harness6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ constant FULL_ROAST_TEST_LIST_FILE = 't/spectest.data';
constant ROAST_VERSION_FILE = 't/spec/VERSION';

my $vm = $*VM.name;
my $build_rakudo_repo = "inst#{$*PROGRAM.parent}/../gen/build_rakudo_home/site";
%*ENV<RAKULIB> = $build_rakudo_repo;

sub MAIN(
Str :$tests-from-file is copy = Str,
Expand All @@ -51,7 +49,7 @@ sub MAIN(
say 'Inline::Perl5 not installed: not running Perl 5 integration tests';
say 'You can install Inline::Perl5 into the build directory with';
say '';
say " zef --install-to=$build_rakudo_repo install Inline::Perl5";
say " zef --install-to=inst#{$*PROGRAM.parent}/../gen/build_rakudo_home/site install Inline::Perl5";
say '';
}

Expand Down