Title: [134261] trunk/Tools
- Revision
- 134261
- Author
- [email protected]
- Date
- 2012-11-12 11:12:12 -0800 (Mon, 12 Nov 2012)
Log Message
[Chromium-Android] Restart the device's shell in root before pushing data
https://bugs.webkit.org/show_bug.cgi?id=101944
Reviewed by Adam Barth.
Setting up md5sum and pushing the executable, fonts and test resources was
unintentionally being done prior to executing the "adb root" command,
which restarts the device's shell to be root. Since test data is still
being pushed to /data/local/tmp, writing to which requires root access,
devices not running as root would throw a ScriptError.
* Scripts/webkitpy/layout_tests/port/chromium_android.py:
(ChromiumAndroidDriver._setup_test):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (134260 => 134261)
--- trunk/Tools/ChangeLog 2012-11-12 19:10:10 UTC (rev 134260)
+++ trunk/Tools/ChangeLog 2012-11-12 19:12:12 UTC (rev 134261)
@@ -1,3 +1,19 @@
+2012-11-12 Peter Beverloo <[email protected]>
+
+ [Chromium-Android] Restart the device's shell in root before pushing data
+ https://bugs.webkit.org/show_bug.cgi?id=101944
+
+ Reviewed by Adam Barth.
+
+ Setting up md5sum and pushing the executable, fonts and test resources was
+ unintentionally being done prior to executing the "adb root" command,
+ which restarts the device's shell to be root. Since test data is still
+ being pushed to /data/local/tmp, writing to which requires root access,
+ devices not running as root would throw a ScriptError.
+
+ * Scripts/webkitpy/layout_tests/port/chromium_android.py:
+ (ChromiumAndroidDriver._setup_test):
+
2012-11-12 Allan Sandfeld Jensen <[email protected]>
[Qt] Support ResourceRequest's setTimeoutInterval
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py (134260 => 134261)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py 2012-11-12 19:10:10 UTC (rev 134260)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py 2012-11-12 19:12:12 UTC (rev 134261)
@@ -354,10 +354,11 @@
if self._has_setup:
return
+ self._run_adb_command(['root'])
self._setup_md5sum_and_push_data_if_needed()
self._has_setup = True
- self._run_adb_command(['root'])
self._setup_performance()
+
# Required by webkit_support::GetWebKitRootDirFilePath().
# Other directories will be created automatically by adb push.
self._run_adb_command(['shell', 'mkdir', '-p', DEVICE_SOURCE_ROOT_DIR + 'chrome'])
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
