Skip to content

Commit

Permalink
Revert "Merge pull request #3796 from vrurg/rakudo_2815"
Browse files Browse the repository at this point in the history
This reverts commit 847dd8d, reversing
changes made to 37d5831.

Proper fix follows.
  • Loading branch information
patrickbkr committed Jul 17, 2020
1 parent 15fae6d commit 1a0be01
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 1 addition & 3 deletions t/harness5
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
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

0 comments on commit 1a0be01

Please sign in to comment.