Changeset 62789 in webkit

Timestamp:

Jul 8, 2010 8:04:21 AM (14 years ago)

Author:

Adam Roben

Message:

Make Windows stop running tests from platform/mac

r62742 made a change (at my suggestion!) that caused us to start
looking for tests in platform/mac, rather than just looking for
expected results in platform/mac. This patch just undoes that part of
r62742.

Fixes <​http://webkit.org/b/41855> REGRESSION (r62742): Windows runs
tests from platform/mac, but shouldn't

Reviewed by Antti Koivisto and Anders Carlsson.

• Scripts/old-run-webkit-tests:

(top level): Removed "mac-snowleopard" and "mac" from @winPlatforms,
so we won't look in those directories for tests to run.
(expectedDirectoryForTest): Added back code from pre-r62742 to look in
platform/mac-snowleopard and platform/mac for expected results.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/old-run-webkit-tests (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-07-08  Adam Roben  <aroben@apple.com>
+
+        Make Windows stop running tests from platform/mac
+
+        r62742 made a change (at my suggestion!) that caused us to start
+        looking for tests in platform/mac, rather than just looking for
+        expected results in platform/mac. This patch just undoes that part of
+        r62742.
+
+        Fixes <http://webkit.org/b/41855> REGRESSION (r62742): Windows runs
+        tests from platform/mac, but shouldn't
+
+        Reviewed by Antti Koivisto and Anders Carlsson.
+
+        * Scripts/old-run-webkit-tests:
+        (top level): Removed "mac-snowleopard" and "mac" from @winPlatforms,
+        so we won't look in those directories for tests to run.
+        (expectedDirectoryForTest): Added back code from pre-r62742 to look in
+        platform/mac-snowleopard and platform/mac for expected results.
+
 2010-07-08  Antonio Gomes  <tonikitoo@webkit.org>
 

trunk/WebKitTools/Scripts/old-run-webkit-tests

@@ -186 +186 @@
 
 my @macPlatforms = ("mac-tiger", "mac-leopard", "mac-snowleopard", "mac");
-
-# When running Windows tests, if no results are found in platform/win (or any of the specific
-# directories for versions of Windows), then we also try mac-snowleopard and mac. 
-my @winPlatforms = ("win-xp", "win-vista", "win-7", "win", "mac-snowleopard", "mac");
+my @winPlatforms = ("win-xp", "win-vista", "win-7", "win");
 
 if (isAppleMacWebKit()) {
@@ -1564 +1561 @@
 
     my @directories = @platformResultHierarchy;
+    push @directories, map { catdir($platformBaseDirectory, $_) } qw(mac-snowleopard mac) if isCygwin();
     push @directories, $expectedDirectory;