Title: [125299] trunk/Tools
- Revision
- 125299
- Author
- [email protected]
- Date
- 2012-08-10 10:52:56 -0700 (Fri, 10 Aug 2012)
Log Message
[Chromium-Android][NRWT] Executable might not be pushed correctly when there are multiple builds
https://bugs.webkit.org/show_bug.cgi?id=93688
Reviewed by Dirk Pranke.
There might be other better methods, but this change is the smallest.
I think the chance of equal timestamp can be ignored because we flock
to avoid concurrent linkers.
* Scripts/webkitpy/layout_tests/port/chromium_android.py:
(ChromiumAndroidDriver._push_executable): Changed '<' to '!=' to compare the timestamp.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (125298 => 125299)
--- trunk/Tools/ChangeLog 2012-08-10 17:42:57 UTC (rev 125298)
+++ trunk/Tools/ChangeLog 2012-08-10 17:52:56 UTC (rev 125299)
@@ -1,3 +1,17 @@
+2012-08-10 Xianzhu Wang <[email protected]>
+
+ [Chromium-Android][NRWT] Executable might not be pushed correctly when there are multiple builds
+ https://bugs.webkit.org/show_bug.cgi?id=93688
+
+ Reviewed by Dirk Pranke.
+
+ There might be other better methods, but this change is the smallest.
+ I think the chance of equal timestamp can be ignored because we flock
+ to avoid concurrent linkers.
+
+ * Scripts/webkitpy/layout_tests/port/chromium_android.py:
+ (ChromiumAndroidDriver._push_executable): Changed '<' to '!=' to compare the timestamp.
+
2012-08-09 Xianzhu Wang <[email protected]>
[Chromium-Android] Skip layout tests directories that are not applicable
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py (125298 => 125299)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py 2012-08-10 17:42:57 UTC (rev 125298)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py 2012-08-10 17:52:56 UTC (rev 125299)
@@ -379,7 +379,7 @@
os.stat(forwarder_host_path).st_mtime)))
device_stamp = int(float(self._run_adb_command([
'shell', 'cat %s 2>/dev/null || echo 0' % DEVICE_DRT_STAMP_PATH])))
- if device_stamp < host_stamp:
+ if device_stamp != host_stamp:
_log.debug('Pushing executable')
self._push_to_device(forwarder_host_path, DEVICE_FORWARDER_PATH)
self._run_adb_command(['uninstall', DRT_APP_PACKAGE])
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
