make chromium layout tests not depend on platform/win, platform/mac-leopard, or platf...

https://bugs.webkit.org/show_bug.cgi?id=83401

Reviewed by Adam Barth.

Last patch in the series - no longer look in mac-leopard,
mac-snowleopard, or mac-lion.

* Scripts/webkitpy/layout_tests/port/chromium_mac.py:
(ChromiumMacPort):
* TestResultServer/static-dashboards/flakiness_dashboard.html:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113804 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 02c0981..58da37c 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,19 @@
 2012-04-10  Dirk Pranke  <dpranke@chromium.org>
 
+        make chromium layout tests not depend on platform/win, platform/mac-leopard, or platform/mac-snowleopard
+        https://bugs.webkit.org/show_bug.cgi?id=83401
+
+        Reviewed by Adam Barth.
+
+        Last patch in the series - no longer look in mac-leopard,
+        mac-snowleopard, or mac-lion.
+
+        * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
+        (ChromiumMacPort):
+        * TestResultServer/static-dashboards/flakiness_dashboard.html:
+
+2012-04-10  Dirk Pranke  <dpranke@chromium.org>
+
         webkit-patch: add a print-expectations command
         https://bugs.webkit.org/show_bug.cgi?id=83347
 

diff --git a/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py b/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
index 3f24a64..82a637f 100644 (file)
--- a/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
+++ b/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
@@ -99,10 +99,10 @@ class BaselineOptimizerTest(unittest.TestCase):
 
     def test_chromium_mac_redundant_with_apple_mac(self):
         self._assertOptimization({
-            'LayoutTests/platform/chromium-mac-snowleopard': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
-            'LayoutTests/platform/mac-snowleopard': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
+            'LayoutTests/platform/chromium-mac': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
+            'LayoutTests/platform/mac': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
         }, {
-            'LayoutTests/platform/mac-snowleopard': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
+            'LayoutTests/platform/mac': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
         })
 
     def test_mac_future(self):

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py
index 3a7c4a0..e1cafcc 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py
@@ -48,23 +48,17 @@ class ChromiumMacPort(chromium.ChromiumPort):
             'chromium-mac-snowleopard',
             'chromium-mac',
             'chromium',
-            'mac-leopard',
-            'mac-snowleopard',
-            'mac-lion',
             'mac',
         ],
         'snowleopard': [
             'chromium-mac-snowleopard',
             'chromium-mac',
             'chromium',
-            'mac-snowleopard',
-            'mac-lion',
             'mac',
         ],
         'lion': [
             'chromium-mac',
             'chromium',
-            'mac-lion',
             'mac',
         ],
         'future': [

diff --git a/Tools/TestResultServer/static-dashboards/flakiness_dashboard.html b/Tools/TestResultServer/static-dashboards/flakiness_dashboard.html
index e022d53..9ffaba4 100644 (file)
--- a/Tools/TestResultServer/static-dashboards/flakiness_dashboard.html
+++ b/Tools/TestResultServer/static-dashboards/flakiness_dashboard.html
@@ -2538,8 +2538,8 @@ var g_fallbacksMap = {};
 g_fallbacksMap['WIN-XP'] = ['chromium-win-xp', 'chromium-win-vista', 'chromium-win', 'chromium', 'mac'];
 g_fallbacksMap['WIN-VISTA'] = ['chromium-win-vista', 'chromium-win', 'chromium', 'mac'];
 g_fallbacksMap['WIN-7'] = ['chromium-win', 'chromium', 'mac'];
-g_fallbacksMap['MAC-LEOPARD'] = ['chromium-mac-leopard', 'chromium-mac-snowleopard', 'chromium-mac', 'chromium', 'mac-leopard', 'mac-snowleopard', 'mac'];
-g_fallbacksMap['MAC-SNOWLEOPARD'] = ['chromium-mac-snowleopard', 'chromium-mac', 'chromium', 'mac-snowleopard', 'mac'];
+g_fallbacksMap['MAC-LEOPARD'] = ['chromium-mac-leopard', 'chromium-mac-snowleopard', 'chromium-mac', 'chromium', 'mac'];
+g_fallbacksMap['MAC-SNOWLEOPARD'] = ['chromium-mac-snowleopard', 'chromium-mac', 'chromium', 'mac'];
 g_fallbacksMap['MAC-LION'] = ['chromium-mac', 'chromium', 'mac'];
 g_fallbacksMap['LINUX-32'] = ['chromium-linux-x86', 'chromium-linux', 'chromium-win', 'chromium', 'mac'];
 g_fallbacksMap['LINUX-64'] = ['chromium-linux', 'chromium-win', 'chromium', 'mac'];