Diff
Modified: trunk/Tools/ChangeLog (91873 => 91874)
--- trunk/Tools/ChangeLog 2011-07-27 22:10:01 UTC (rev 91873)
+++ trunk/Tools/ChangeLog 2011-07-27 22:16:41 UTC (rev 91874)
@@ -1,5 +1,20 @@
2011-07-27 Dimitri Glazkov <[email protected]>
+ Allow TestConfigurationConverter report conversion errors.
+ https://bugs.webkit.org/show_bug.cgi?id=65287
+
+ Also, fix a few miscellaneous testing issues.
+
+ Reviewed by Adam Barth.
+
+ * Scripts/webkitpy/layout_tests/models/test_configuration.py: Added a way to report unknown modifier errors.
+ * Scripts/webkitpy/layout_tests/models/test_configuration_unittest.py: Added a test for reporting errors.
+ * Scripts/webkitpy/layout_tests/port/chromium_unittest.py: Fixed an error where an invalid TestConfiguration instance
+ was created. 'default' is not a valid build type.
+ * Scripts/webkitpy/layout_tests/port/test.py: Ditto. '' is not a valid version.
+
+2011-07-27 Dimitri Glazkov <[email protected]>
+
Teach all ports about their test configurations.
https://bugs.webkit.org/show_bug.cgi?id=65278
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py (91873 => 91874)
--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py 2011-07-27 22:10:01 UTC (rev 91873)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py 2011-07-27 22:16:41 UTC (rev 91874)
@@ -102,7 +102,7 @@
expanded_specifiers = self._configuration_macros.get(specifier)
return expanded_specifiers or [specifier]
- def to_config_set(self, specifier_set):
+ def to_config_set(self, specifier_set, error_list=None):
"""Convert a list of specifiers into a set of TestConfiguration instances."""
if len(specifier_set) == 0:
return self._all_test_configurations
@@ -113,6 +113,8 @@
for expanded_specifier in self._expand_macros(specifier):
configurations = self._specifier_to_configuration_set.get(expanded_specifier)
if not configurations:
+ if error_list is not None:
+ error_list.append("Unrecognized modifier '" + expanded_specifier + "'")
return set()
category = self._specifier_to_category[expanded_specifier]
matching_sets.setdefault(category, set()).update(configurations)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_configuration_unittest.py (91873 => 91874)
--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_configuration_unittest.py 2011-07-27 22:10:01 UTC (rev 91873)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_configuration_unittest.py 2011-07-27 22:16:41 UTC (rev 91874)
@@ -114,6 +114,12 @@
self.assertEquals(converter.to_config_set(set(['xp', 'foo'])), set())
+ errors = []
+ self.assertEquals(converter.to_config_set(set(['xp', 'foo']), errors), set())
+ self.assertEquals(errors, ["Unrecognized modifier 'foo'"])
+
+ self.assertEquals(converter.to_config_set(set(['xp', 'x86_64'])), set())
+
configs_to_match = set([
TestConfiguration(None, 'xp', 'x86', 'release', 'gpu'),
TestConfiguration(None, 'xp', 'x86', 'release', 'cpu'),
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py (91873 => 91874)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py 2011-07-27 22:10:01 UTC (rev 91873)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py 2011-07-27 22:16:41 UTC (rev 91874)
@@ -178,6 +178,7 @@
def test_skipped_layout_tests(self):
mock_options = mocktool.MockOptions()
+ mock_options.configuration = 'release'
port = ChromiumPortTest.TestLinuxPort(options=mock_options)
fake_test = 'fast/js/not-good.js'
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py (91873 => 91874)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py 2011-07-27 22:10:01 UTC (rev 91873)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py 2011-07-27 22:16:41 UTC (rev 91874)
@@ -283,7 +283,7 @@
'test-win-vista': 'vista',
'test-mac-leopard': 'leopard',
'test-mac-snowleopard': 'snowleopard',
- 'test-linux-x86_64': '',
+ 'test-linux-x86_64': 'lucid',
}
self._version = version_map[port_name]
