Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 10:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 842668 - Should always use dd instead of cp in b2g reftest/mochitest;r=ahal

Browse Source
This commit is contained in:
William Lachance 2013-02-21 15:44:24 -05:00
parent d6b722e0fb
commit 1e2e91e1b8
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
layout/tools/reftest/runreftestb2g.py
View File

@ -264,10 +264,7 @@ class B2GReftest(RefTest):
# Restore the original user.js.
self._devicemanager._checkCmdAs(['shell', 'rm', '-f', self.userJS])
if self._devicemanager._useDDCopy:
self._devicemanager._checkCmdAs(['shell', 'dd', 'if=%s.orig' % self.userJS, 'of=%s' % self.userJS])
else:
self._devicemanager._checkCmdAs(['shell', 'cp', '%s.orig' % self.userJS, self.userJS])
self._devicemanager._checkCmdAs(['shell', 'dd', 'if=%s.orig' % self.userJS, 'of=%s' % self.userJS])
# We've restored the original profile, so reboot the device so that
# it gets picked up.

5
testing/mochitest/runtestsb2g.py
View File

@ -311,10 +311,7 @@ class B2GMochitest(Mochitest, B2GMochitestMixin):
self.originalProfilesIni = None
def copyRemoteFile(self, src, dest):
if self._dm._useDDCopy:
self._dm._checkCmdAs(['shell', 'dd', 'if=%s' % src, 'of=%s' % dest])
else:
self._dm._checkCmdAs(['shell', 'cp', src, dest])
self._dm._checkCmdAs(['shell', 'dd', 'if=%s' % src, 'of=%s' % dest])
def origUserJSExists(self):
return self._dm.fileExists('/data/local/user.js.orig')