diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
| commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
| tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /WebKitTools/Scripts/old-run-webkit-tests | |
| parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
| download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 | |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'WebKitTools/Scripts/old-run-webkit-tests')
| -rwxr-xr-x | WebKitTools/Scripts/old-run-webkit-tests | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/WebKitTools/Scripts/old-run-webkit-tests b/WebKitTools/Scripts/old-run-webkit-tests index b46c129..97ef3dc 100755 --- a/WebKitTools/Scripts/old-run-webkit-tests +++ b/WebKitTools/Scripts/old-run-webkit-tests @@ -2159,7 +2159,14 @@ sub readSkippedFiles($) { my ($constraintPath) = @_; - foreach my $level (@platformTestHierarchy) { + my @skippedFileDirectories = @platformTestHierarchy; + + # Because nearly all of the skipped tests for WebKit 2 on Mac are due to + # cross-platform issues, Windows will use both the Mac and Windows skipped + # lists to avoid maintaining separate lists. + push(@skippedFileDirectories, catdir($platformBaseDirectory, "mac-wk2")) if $platform eq "win-wk2"; + + foreach my $level (@skippedFileDirectories) { if (open SKIPPED, "<", "$level/Skipped") { if ($verbose) { my ($dir, $name) = splitpath($level); |