Modify the Android test running scripts so they can be used from WebKit

build/android/pylib/single_test_runner.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import glob
 import logging
 import os
 import sys
 
 from base_test_runner import BaseTestRunner
@@ skipping 17 matching lines @@
     gtest_filter: A gtest_filter flag.
     test_arguments: Additional arguments to pass to the test binary.
     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.
     shard_index: index number of the shard on which the test suite will run.
     dump_debug_info: Whether or not to dump debug information.
     build_type: 'Release' or 'Debug'.
+    in_webkit_checkout: Whether the suite is being run from a WebKit checkout.
   """
 
   def __init__(self, device, test_suite, gtest_filter, test_arguments, timeout,
                rebaseline, performance_test, cleanup_test_files, tool_name,
-               shard_index, dump_debug_info, fast_and_loose, build_type):
+               shard_index, dump_debug_info, fast_and_loose, build_type,
+               in_webkit_checkout):
     BaseTestRunner.__init__(self, device, tool_name, shard_index, build_type)
     self._running_on_emulator = self.device.startswith('emulator')
     self._gtest_filter = gtest_filter
     self._test_arguments = test_arguments
     self.test_results = TestResults()
     if dump_debug_info:
       self.dump_debug_info = debug_info.GTestDebugInfo(self.adb, device,
            os.path.basename(test_suite), gtest_filter)
     else:
       self.dump_debug_info = None
     self.fast_and_loose = fast_and_loose
+    self.in_webkit_checkout = in_webkit_checkout
 
     logging.warning('Test suite: ' + test_suite)
     if os.path.splitext(test_suite)[1] == '.apk':
       self.test_package = TestPackageApk(self.adb, device,
           test_suite, timeout, rebaseline, performance_test, cleanup_test_files,
           self.tool, self.dump_debug_info)
     else:
       # Put a copy into the android out/target directory, to allow stack trace
       # generation.
       symbols_dir = os.path.join(constants.CHROME_DIR, 'out', build_type,
@@ skipping 17 matching lines @@
     """Returns the filename of gtest filter."""
     return os.path.join(sys.path[0], 'gtest_filter',
         self.test_package.test_suite_basename + '_disabled')
 
   def _GetAdditionalEmulatorFilterName(self):
     """Returns the filename of additional gtest filter for emulator."""
     return os.path.join(sys.path[0], 'gtest_filter',
         self.test_package.test_suite_basename +
         '_emulator_additional_disabled')
 
+  def _PathToWebKitRoot(self):
+    """Returns the relative directory to the WebKit checkout, relative to

[bulach, 2012/11/15 01:06:39]

needs to be one liner.
"""Returns the relative directory to WebKit checkout from $CHROME_SRC"""

[Peter Beverloo, 2012/11/15 12:11:29]

Done.

+    Chrome's src/ directory."""
+    if self.in_webkit_checkout:
+      return os.path.join('..', '..', '..')
+    return os.path.join('third_party', 'WebKit')
+
   def GetDisabledTests(self):
     """Returns a list of disabled tests.
 
     Returns:
       A list of disabled tests obtained from gtest_filter/test_suite_disabled.
     """
     disabled_tests = run_tests_helper.GetExpectations(self._GetFilterFileName())
     if self._running_on_emulator:
       # Append emulator's filter file.
       disabled_tests.extend(run_tests_helper.GetExpectations(
@@ skipping 120 matching lines @@
       return [
           'chrome/test/data/dromaeo',
           'chrome/test/data/json2.js',
           'chrome/test/data/sunspider',
           'chrome/test/data/v8_benchmark',
           'chrome/test/perf/sunspider_uitest.js',
           'chrome/test/perf/v8_benchmark_uitest.js',
           ]
     elif self.test_package.test_suite_basename == 'webkit_unit_tests':
       return [
-          'third_party/WebKit/Source/WebKit/chromium/tests/data',
+          ['%s/Source/WebKit/chromium/tests/data' % self._PathToWebKitRoot(),
+              'third_party/Source/WebKit/chromium/tests/data']

[bulach, 2012/11/15 01:06:39]

ahn, I see... yeah, it seems entirely the wrong level to do this down there..
let's try to make it higher up at the test scripts?

[Peter Beverloo, 2012/11/15 12:11:29]

Done, I've now put this in a method under StripAndCopyFiles. Another option
would be to subclass SingleTestRunner specifically for WebKitUnitTests..

           ]
     elif self.test_package.test_suite_basename == 'content_unittests':
       return [
           'content/test/data/gpu/webgl_conformance_test_expectations.txt',
           'net/data/ssl/certificates/',
           'webkit/data/dom_storage/webcore_test_database.localstorage',
           'third_party/hyphen/hyph_en_US.dic',
           ]
     elif self.test_package.test_suite_basename == 'media_unittests':
       return [
@@ skipping 108 matching lines @@
     self.tool.CleanUpEnvironment()
     if self.test_package.cleanup_test_files:
       self.adb.RemovePushedFiles()
     if self.dump_debug_info:
       self.dump_debug_info.StopRecordingLog()
     if self._performance_test_setup:
       self._performance_test_setup.TearDown()
     if self.dump_debug_info:
       self.dump_debug_info.ArchiveNewCrashFiles()
     super(SingleTestRunner, self).TearDown()