Skip to content

Commit

Permalink
Revert "Smartify harness automatic job number calculation"
Browse files Browse the repository at this point in the history
This reverts commit 6f36b02.

Try to eliminate potential Travis Linux failures suspect.
  • Loading branch information
zoffixznet committed Jan 9, 2018
1 parent 31c2f53 commit 18e3468
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
11 changes: 3 additions & 8 deletions t/harness5
Expand Up @@ -24,7 +24,7 @@ GetOptions(
'tests-from-file=s' => \my $list_file,
'fudge' => \my $do_fudge,
'verbosity=i' => \$Test::Harness::verbose,
'jobs=i' => \my $jobs,
'jobs:1' => \(my $jobs = $ENV{TEST_JOBS} || 6),
'quick:1' => \my $do_quick,
'stress:1' => \my $do_stress,
'archive=s' => \my $archive,
Expand All @@ -39,13 +39,8 @@ GetOptions(
my @pass_through_options = grep m/^--?[^-]/, @ARGV;
my @files = grep m/^[^-]/, @ARGV;

$ENV{HARNESS_PERL} = ".${slash}perl6-" . ($moar ? "m" : $jvm ? "j" : "m");
$ENV{PERL6LIB} = "lib";

$jobs ||= $ENV{TEST_JOBS}
|| sprintf("%d", 1.3 * qx/$ENV{HARNESS_PERL} -e Kernel.cpu-cores.print/)
|| 6;
print "Using $jobs test jobs\n";
$ENV{'HARNESS_PERL'} = ".${slash}perl6-" . ($moar ? "m" : $jvm ? "j" : "m");
$ENV{'PERL6LIB'} = "lib";

my @slow;
if ($list_file) {
Expand Down
3 changes: 1 addition & 2 deletions t/harness6
Expand Up @@ -29,7 +29,7 @@ sub MAIN(
Str :$tests-from-file is copy = Str,
Bool :$fudge = False,
Int :$verbosity = (%*ENV<TEST_VERBOSE> // 0).Int,
Int :$jobs = (%*ENV<TEST_JOBS> || Int(1.3 * Kernel.cpu-cores) || 6).Int,
Int :$jobs = (%*ENV<TEST_JOBS> // 1).Int,
Bool :$quick = False,
Bool :$stress = False,
Bool :$randomize = False,
Expand All @@ -38,7 +38,6 @@ sub MAIN(
Str :$perl5path = 'perl',
*@files,
) {
say "Using $jobs test jobs";
my @slow;
with $tests-from-file {
$tests-from-file .= &convert-to-versioned-file;
Expand Down

0 comments on commit 18e3468

Please sign in to comment.