Skip to content

Commit

Permalink
Unreviewed, don't rely on File::Slurp. This fixes part #1 of Linux bo…
Browse files Browse the repository at this point in the history
…t breakage.

* Scripts/run-javascriptcore-tests:
(readAllLines):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@155101 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
[email protected] committed Sep 5, 2013
1 parent 50fa702 commit 01c8755
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
7 changes: 7 additions & 0 deletions Tools/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2013-09-05 Filip Pizlo <[email protected]>

Unreviewed, don't rely on File::Slurp. This fixes part #1 of Linux bot breakage.

* Scripts/run-javascriptcore-tests:
(readAllLines):

2013-09-04 Filip Pizlo <[email protected]>

jsc tests should have timeouts
Expand Down
19 changes: 16 additions & 3 deletions Tools/Scripts/run-javascriptcore-tests
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
# as well as other tests: testapi on Mac and LayoutTests/fast/js.

use strict;
use File::Slurp;
use FindBin;
use Getopt::Long qw(:config pass_through);
use List::Util qw(min max);
Expand Down Expand Up @@ -216,6 +215,20 @@ if ($numOldMozillaFailures) {
}
}

sub readAllLines
{
my ($filename) = @_;
my @array = ();
eval {
open FILE, $filename or die;
while (<FILE>) {
push @array, $_;
}
close FILE;
};
return @array;
}

sub printThingsFound
{
my ($number, $label, $pluralLabel, $verb) = @_;
Expand All @@ -228,8 +241,8 @@ sub printThingsFound
print " $verb.\n";
}

my @fastJSFailList = eval { read_file($fastJSResultsDir . "/failed") };
my @fastJSCrashList = eval { read_file($fastJSResultsDir . "/crashed") };
my @fastJSFailList = readAllLines($fastJSResultsDir . "/failed");
my @fastJSCrashList = readAllLines($fastJSResultsDir . "/crashed");
my $numJSFailures = @fastJSFailList;
my $numJSCrashes = @fastJSCrashList;

Expand Down

0 comments on commit 01c8755

Please sign in to comment.