summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-21 10:58:45 +0000
committerbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-21 10:58:45 +0000
commitdc68f705de044bcbe89650885753de6ebaa705c2 (patch)
treef3cebe3eaca048aa73c00ed0e2d76f475aa11d2b /build
parentd0c1412146f356ca61f1dd02f47e87a9498d018c (diff)
downloadchromium_src-dc68f705de044bcbe89650885753de6ebaa705c2.zip
chromium_src-dc68f705de044bcbe89650885753de6ebaa705c2.tar.gz
chromium_src-dc68f705de044bcbe89650885753de6ebaa705c2.tar.bz2
Android: creates fifo for test runners in internal directory.
Some devices have $EXTERNAL_STORAGE filesystems that don't support mkfifo. Create in the internal app dir instead. BUG= TEST= Review URL: https://codereview.chromium.org/10957036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157962 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/android/pylib/test_package_apk.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/build/android/pylib/test_package_apk.py b/build/android/pylib/test_package_apk.py
index 6430f60..5c633cc 100644
--- a/build/android/pylib/test_package_apk.py
+++ b/build/android/pylib/test_package_apk.py
@@ -57,21 +57,19 @@ class TestPackageApk(TestPackage):
# testing/android/java/src/org/chromium/native_test/
# ChromeNativeTestActivity.java and
# testing/android/native_test_launcher.cc
- return os.path.join(self.adb.GetExternalStorage(),
- 'native_tests', 'test.fifo')
+ return '/data/data/org.chromium.native_test/files/test.fifo'
def _ClearFifo(self):
self.adb.RunShellCommand('rm -f ' + self._GetFifo())
def _WatchFifo(self, timeout):
- i = 0
for i in range(5):
if self.adb.FileExistsOnDevice(self._GetFifo()):
print 'Fifo created...'
break
time.sleep(i)
else:
- sys.exit('Unable to find fifo on device %s ' % self._GetFifo())
+ raise Exception('Unable to find fifo on device %s ' % self._GetFifo())
args = shlex.split(self.adb.Adb()._target_arg)
args += ['shell', 'cat', self._GetFifo()]
return pexpect.spawn('adb', args, timeout=timeout, logfile=sys.stdout)