apk-based test runner work. Not enabled yet. This CL is a combination of upstreaming, ndk/ant-ifi…

build/android/test_package_apk.py

+#!/usr/bin/python
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.

[bulach, 2012/03/23 10:30:48]

nit:2012

[John Grabowski, 2012/03/24 01:59:18]

Done.

+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+
+import os
+import sys
+
+import cmd_helper
+import shutil
+import tempfile
+from test_package import TestPackage
+
+
+class TestPackageApk(TestPackage):
+  """A helper class for running APK-based native tests.
+
+  Args:
+    adb: ADB interface the tests are using.
+    device: Device to run the tests.
+    test_suite: A specific test suite to run, empty to run all.
+    timeout: Timeout for each test.
+    rebaseline: Whether or not to run tests in isolation and update the filter.
+    performance_test: Whether or not performance test(s).
+    cleanup_test_files: Whether or not to cleanup test files on device.
+    tool: Name of the Valgrind tool.
+    dump_debug_info: A debug_info object.
+  """
+
+  APK_DATA_DIR = '/data/user/0/com.android.chrome.native_tests/files/'
+
+  def __init__(self, adb, device, test_suite, timeout, rebaseline,
+               performance_test, cleanup_test_files, tool,
+               dump_debug_info):
+    TestPackage.__init__(self, adb, device, test_suite, timeout,
+                         rebaseline, performance_test, cleanup_test_files,
+                         tool, dump_debug_info)
+
+  def _CreateTestRunnerScript(self, options):
+    tool_wrapper = self.tool.GetTestWrapper()
+    if tool_wrapper:
+      raise RuntimeError("TestPackageApk does not support custom wrappers.")
+    command_line_file = tempfile.NamedTemporaryFile()
+    # GTest expects argv[0] to be the executable path.
+    command_line_file.write(self.test_suite_basename + ' ' + options)
+    command_line_file.flush()
+    self.adb.PushIfNeeded(command_line_file.name,
+                          TestPackageApk.APK_DATA_DIR +
+                          'chrome-native-tests-command-line')
+
+  def _GetGTestReturnCode(self):
+    return None
+
+  def GetAllTests(self):
+    """Returns a list of all tests available in the test suite."""
+    self._CreateTestRunnerScript('--gtest_list_tests')
+    self.adb.RunShellCommand('am start -n '
+                             'com.android.chrome.native_tests/'
+                             'android.app.NativeActivity')
+    stdout_file = tempfile.NamedTemporaryFile()
+    ret = []
+    self.adb.Adb().Pull(TestPackageApk.APK_DATA_DIR + 'stdout.txt',
+                        stdout_file.name)
+    ret = self._ParseGTestListTests(stdout_file)
+    return ret
+
+  def CreateTestRunnerScript(self, gtest_filter, test_arguments):
+     self._CreateTestRunnerScript('--gtest_filter=%s %s' % (gtest_filter,
+                                                            test_arguments))
+
+  def RunTestsAndListResults(self):
+    self.adb.StartMonitoringLogcat(clear=True, logfile=sys.stdout)
+    # TODO(jrg): make the activity name a function of the test.
+    self.adb.RunShellCommand('am start -n '
+                             'org.chromium.native_test/'
+                             'org.chromium.native_test.ChromeNativeTestActivity')

[bulach, 2012/03/23 10:30:48]

nit: >80cols

[John Grabowski, 2012/03/24 01:59:18]

Done.

+    return self._WatchTestOutput(self.adb.GetMonitoredLogCat())
+
+  def StripAndCopyExecutable(self):
+    # TODO(jrg): downstream we would package up the .so into the apk
+    # and rebuild.  (Yikes!)  We need to do something more kosher,
+    # such as assembly at build time.  E.g. building base_unittests
+    # will build a libbase_unittests.apk that contains
+    # libbbase_unittests.so, and avoid a "naked" ChromeNativeTests.apk.
+    self.adb.Adb().SendCommand('install -r ' + self.test_suite_full,
+                               timeout_time=60*5)