Skip to content

Commit

Permalink
Require explicit option to use EvalServer
Browse files Browse the repository at this point in the history
Since the EvalServer is not in a good shape
(Raku/old-issue-tracker#6527) it makes more
sense to just start a new JVM for each test file. Using the new option
makes it possible to get the old behaviour.
  • Loading branch information
usev6 committed Feb 8, 2021
1 parent 8d331ec commit bad3621
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions t/harness5
Expand Up @@ -29,6 +29,7 @@ GetOptions(
'stress:1' => \my $do_stress,
'archive=s' => \my $archive,
'precompile' => \my $precompile,
'evalserver' => \my $evalserver,
'jvm' => \my $jvm,
'js' => \my $js,
'moar' => \my $moar,
Expand Down Expand Up @@ -135,7 +136,7 @@ if ($archive) {
if $ENV{SMOLDER_SUBMITTER};
}

if ($jvm) {
if ($jvm && $evalserver) {
unlink("TESTTOKEN");
$ENV{HARNESS_PERL} = "$^X .${slash}eval-client.pl TESTTOKEN run";

Expand All @@ -148,7 +149,7 @@ if ($jvm) {
if (eval "require $tap_harness_class;") {
my $run_with_perl = $precompile ? [$ENV{HARNESS_PERL}, 't/precompileandrun'] : [$ENV{HARNESS_PERL}];
my %harness_options = (
exec => $jvm ? [$^X, "./eval-client.pl", "TESTTOKEN", "run"] : $run_with_perl,
exec => $jvm && $evalserver ? [$^X, "./eval-client.pl", "TESTTOKEN", "run"] : $run_with_perl,
verbosity => 0+$Test::Harness::verbose,
jobs => $jobs,
ignore_exit => 1,
Expand Down Expand Up @@ -264,6 +265,7 @@ Options:
--archive=[archive] - write to an archive.
--randomize randomize the order in which test-files are processed.
--slow - spread tests marked "slow" equally over the run (default on non-Win)
--evalserver - use EvalServer. Only has effect for JVM backend
--moar/--jvm/--js - mutually exclusive. Use MoarVM/JVM/JS backend
--no-merge - pass STDERR from the tests through to the terminal's STDERR
--precompile - precompile tests before running them
Expand Down

0 comments on commit bad3621

Please sign in to comment.