From dd8bb3de4f353a81954234999f1fea748aee2ea9 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 11 Aug 2010 14:44:44 +0100 Subject: Merge WebKit at r65072 : Initial merge by git. Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585 --- WebKitTools/Scripts/old-run-webkit-tests | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'WebKitTools/Scripts/old-run-webkit-tests') 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); -- cgit v1.1