Title: [97887] trunk/Tools
- Revision
- 97887
- Author
- [email protected]
- Date
- 2011-10-19 15:40:18 -0700 (Wed, 19 Oct 2011)
Log Message
new-run-webkit-tests -2 was crashing due to both "java" and "java/" being listed in Skipped files.
Make NRWT normalize directory names in Skipped files during parsing.
Unreviewed. Very simple (tested) change.
* Scripts/webkitpy/layout_tests/port/mac_unittest.py:
* Scripts/webkitpy/layout_tests/port/webkit.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (97886 => 97887)
--- trunk/Tools/ChangeLog 2011-10-19 22:37:17 UTC (rev 97886)
+++ trunk/Tools/ChangeLog 2011-10-19 22:40:18 UTC (rev 97887)
@@ -1,3 +1,13 @@
+2011-10-19 Eric Seidel <[email protected]>
+
+ new-run-webkit-tests -2 was crashing due to both "java" and "java/" being listed in Skipped files.
+ Make NRWT normalize directory names in Skipped files during parsing.
+
+ Unreviewed. Very simple (tested) change.
+
+ * Scripts/webkitpy/layout_tests/port/mac_unittest.py:
+ * Scripts/webkitpy/layout_tests/port/webkit.py:
+
2011-10-19 David Levin <[email protected]>
watchlist: Should be more robust to bad regex.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py (97886 => 97887)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py 2011-10-19 22:37:17 UTC (rev 97886)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py 2011-10-19 22:40:18 UTC (rev 97887)
@@ -60,11 +60,15 @@
# see bug <rdar://problem/5646437> REGRESSION (r28015): svg/batik/text/smallFonts fails
svg/batik/text/smallFonts.svg
+
+# Java tests don't work on WK2
+java/
"""
example_skipped_tests = [
"fast/events/mouseout-on-window.html",
"fast/events/attempt-scroll-with-no-scrollbars.html",
"svg/batik/text/smallFonts.svg",
+ "java",
]
def test_tests_from_skipped_file_contents(self):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (97886 => 97887)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-10-19 22:37:17 UTC (rev 97886)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-10-19 22:40:18 UTC (rev 97887)
@@ -298,6 +298,7 @@
tests_to_skip = []
for line in skipped_file_contents.split('\n'):
line = line.strip()
+ line = line.rstrip('/') # Best to normalize directory names to not include the trailing slash.
if line.startswith('#') or not len(line):
continue
tests_to_skip.append(line)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
