Title: [124862] trunk/Tools
- Revision
- 124862
- Author
- kbal...@webkit.org
- Date
- 2012-08-07 00:45:37 -0700 (Tue, 07 Aug 2012)
Log Message
[NRWT] runs platform specific tests that it shouldn't with --force
https://bugs.webkit.org/show_bug.cgi?id=91089
Reviewed by Dirk Pranke.
Ignore other platform's directories from platform/.
* Scripts/webkitpy/layout_tests/port/base.py:
(Port._expanded_paths):
* Scripts/webkitpy/layout_tests/port/test.py:
* Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
(MainTest.test_platform_tests_are_found):
Updated integration test in accordance to the new behavior.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (124861 => 124862)
--- trunk/Tools/ChangeLog 2012-08-07 07:41:57 UTC (rev 124861)
+++ trunk/Tools/ChangeLog 2012-08-07 07:45:37 UTC (rev 124862)
@@ -1,3 +1,19 @@
+2012-08-06 Balazs Kelemen <kbal...@webkit.org>
+
+ [NRWT] runs platform specific tests that it shouldn't with --force
+ https://bugs.webkit.org/show_bug.cgi?id=91089
+
+ Reviewed by Dirk Pranke.
+
+ Ignore other platform's directories from platform/.
+
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ (Port._expanded_paths):
+ * Scripts/webkitpy/layout_tests/port/test.py:
+ * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+ (MainTest.test_platform_tests_are_found):
+ Updated integration test in accordance to the new behavior.
+
2012-08-06 Gyuyoung Kim <gyuyoung....@samsung.com>
[EFL] Enable link prefetch
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (124861 => 124862)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-08-07 07:41:57 UTC (rev 124861)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-08-07 07:45:37 UTC (rev 124862)
@@ -567,7 +567,7 @@
expanded_paths.append(path)
if self.test_isdir(path) and not path.startswith('platform'):
for platform_dir in all_platform_dirs:
- if fs.isdir(fs.join(platform_dir, path)):
+ if fs.isdir(fs.join(platform_dir, path)) and platform_dir in self.baseline_search_path():
expanded_paths.append(self.relative_test_filename(fs.join(platform_dir, path)))
return expanded_paths
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py (124861 => 124862)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py 2012-08-07 07:41:57 UTC (rev 124861)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py 2012-08-07 07:45:37 UTC (rev 124862)
@@ -219,6 +219,10 @@
tests.add('websocket/tests/passes/text.html')
+ # For testing test are properly included from platform directories.
+ tests.add('platform/test-mac-leopard/http/test.html')
+ tests.add('platform/test-win-win7/http/test.html')
+
# For --no-http tests, test that platform specific HTTP tests are properly skipped.
tests.add('platform/test-snow-leopard/http/test.html')
tests.add('platform/test-snow-leopard/websocket/test.html')
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (124861 => 124862)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-08-07 07:41:57 UTC (rev 124861)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-08-07 07:45:37 UTC (rev 124862)
@@ -882,8 +882,9 @@
self.assertTrue(MainTest.has_test_of_type(batch_tests_run_http, 'websocket'))
def test_platform_tests_are_found(self):
- tests_run = get_tests_run(['http'], tests_included=True, flatten_batches=True)
- self.assertTrue('platform/test-snow-leopard/http/test.html' in tests_run)
+ tests_run = get_tests_run(['--platform', 'test-mac-leopard', 'http'], tests_included=True, flatten_batches=True)
+ self.assertTrue('platform/test-mac-leopard/http/test.html' in tests_run)
+ self.assertFalse('platform/test-win-win7/http/test.html' in tests_run)
def test_output_diffs(self):
# Test to ensure that we don't generate -wdiff.html or -pretty.html if wdiff and PrettyPatch
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
