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

build/android/pylib/base_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 contextlib
 import httplib
 import logging
 import os
 import tempfile
 import time
@@ skipping 88 matching lines @@
   def CopyTestData(self, test_data_paths, dest_dir):
     """Copies |test_data_paths| list of files/directories to |dest_dir|.
 
     Args:
       test_data_paths: A list of files or directories relative to |dest_dir|
           which should be copied to the device. The paths must exist in
           |CHROME_DIR|.
       dest_dir: Absolute path to copy to on the device.
     """
     for p in test_data_paths:
+      if not isinstance(p, list):

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

uh? 103 doesn't say this is allowed, who's passing list of lists? why is this
needed?

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

See single_test_runner.py:241; removed.

+        p = [p, p]
       self.adb.PushIfNeeded(
-          os.path.join(constants.CHROME_DIR, p),
-          os.path.join(dest_dir, p))
+          os.path.join(constants.CHROME_DIR, p[0]),
+          os.path.join(dest_dir, p[1]))
 
   def LaunchTestHttpServer(self, document_root, port=None,
                            extra_config_contents=None):
     """Launches an HTTP server to serve HTTP tests.
 
     Args:
       document_root: Document root of the HTTP server.
       port: port on which we want to the http server bind.
       extra_config_contents: Extra config contents for the HTTP server.
     """
@@ skipping 79 matching lines @@
       # Wait for 2 seconds then restart.
       time.sleep(2)
     if not server_ready:
       logging.error(';'.join(error_msgs))
       raise Exception('Can not start the test spawner server.')
     self._PushTestServerPortInfoToDevice()
     self._spawner_forwarder = self._CreateAndRunForwarder(
         self.adb,
         [(self.test_server_spawner_port, self.test_server_spawner_port)],
         self.tool, '127.0.0.1', self.build_type)