Diff
Modified: trunk/Tools/ChangeLog (139559 => 139560)
--- trunk/Tools/ChangeLog 2013-01-13 04:30:39 UTC (rev 139559)
+++ trunk/Tools/ChangeLog 2013-01-13 07:59:42 UTC (rev 139560)
@@ -1,5 +1,24 @@
2013-01-12 Nico Weber <[email protected]>
+ nrwt/chromium: Don't prefer chromium over webkit build directories
+ https://bugs.webkit.org/show_bug.cgi?id=105597
+
+ Reviewed by Dirk Pranke.
+
+ Rely on the new timestamp logic instead. Requested by dpranke in
+ https://bugs.webkit.org/show_bug.cgi?id=105498
+
+ * Scripts/webkitpy/layout_tests/port/chromium.py:
+ (ChromiumPort._static_build_path):
+ * Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py:
+ (ChromiumLinuxPortTest.test_build_path):
+ * Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py:
+ (ChromiumMacPortTest.test_build_path):
+ * Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py:
+ (ChromiumWinTest.test_build_path):
+
+2013-01-12 Nico Weber <[email protected]>
+
Use ninja by default on Linux for build-webkit --chromium, bot edition
https://bugs.webkit.org/show_bug.cgi?id=104434
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py (139559 => 139560)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2013-01-13 04:30:39 UTC (rev 139559)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2013-01-13 07:59:42 UTC (rev 139560)
@@ -90,9 +90,6 @@
path = filesystem.join(base_dir, *comps)
if filesystem.exists(path):
hits.append((filesystem.mtime(path), path))
- if hits:
- hits.sort(reverse=True)
- return hits[0][1] # Return the newest file found.
for directory in cls.DEFAULT_BUILD_DIRECTORIES:
base_dir = filesystem.join(webkit_base, directory, configuration)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py (139559 => 139560)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py 2013-01-13 04:30:39 UTC (rev 139559)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py 2013-01-13 07:59:42 UTC (rev 139560)
@@ -99,10 +99,6 @@
options = MockOptions(configuration='Release', build_directory='foo')
self.assert_build_path(options, ['/mock-checkout/Source/WebKit/chromium/out/Release'], 'foo/Release')
- # Test that we look in a chromium directory before the webkit directory.
- options = MockOptions(configuration='Release', build_directory=None)
- self.assert_build_path(options, ['/mock-checkout/Source/WebKit/chromium/out/Release', '/mock-checkout/out/Release'], '/mock-checkout/Source/WebKit/chromium/out/Release')
-
# Test that we prefer the legacy dir over the new dir.
options = MockOptions(configuration='Release', build_directory=None)
self.assert_build_path(options, ['/mock-checkout/Source/WebKit/chromium/sconsbuild/Release', '/mock-checkout/Source/WebKit/chromium/out/Release'], '/mock-checkout/Source/WebKit/chromium/sconsbuild/Release')
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py (139559 => 139560)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py 2013-01-13 04:30:39 UTC (rev 139559)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py 2013-01-13 07:59:42 UTC (rev 139560)
@@ -87,10 +87,6 @@
options = MockOptions(configuration='Release', build_directory='foo')
self.assert_build_path(options, ['/mock-checkout/Source/WebKit/chromium/out/Release'], 'foo/Release')
- # Test that we look in a chromium directory before the webkit directory.
- options = MockOptions(configuration='Release', build_directory=None)
- self.assert_build_path(options, ['/mock-checkout/Source/WebKit/chromium/out/Release', '/mock-checkout/out/Release'], '/mock-checkout/Source/WebKit/chromium/out/Release')
-
# Test that we prefer the legacy dir over the new dir.
options = MockOptions(configuration='Release', build_directory=None)
self.assert_build_path(options, ['/mock-checkout/Source/WebKit/chromium/xcodebuild/Release', '/mock-checkout/Source/WebKit/chromium/out/Release'], '/mock-checkout/Source/WebKit/chromium/xcodebuild/Release')
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py (139559 => 139560)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py 2013-01-13 04:30:39 UTC (rev 139559)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py 2013-01-13 07:59:42 UTC (rev 139560)
@@ -106,10 +106,6 @@
options = MockOptions(configuration='Release', build_directory='foo')
self.assert_build_path(options, ['/mock-checkout/Source/WebKit/chromium/out/Release'], 'foo/Release')
- # Test that we look in a chromium directory before the webkit directory.
- options = MockOptions(configuration='Release', build_directory=None)
- self.assert_build_path(options, ['/mock-checkout/Source/WebKit/chromium/out/Release', '/mock-checkout/out/Release'], '/mock-checkout/Source/WebKit/chromium/out/Release')
-
# Test that we prefer the legacy dir over the new dir.
options = MockOptions(configuration='Release', build_directory=None)
self.assert_build_path(options, ['/mock-checkout/Source/WebKit/chromium/build/Release', '/mock-checkout/Source/WebKit/chromium/out'], '/mock-checkout/Source/WebKit/chromium/build/Release')
