Android: Avoid multiple data file pushes for unittests

build/android/pylib/gtest/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
 
 from pylib import android_commands
 from pylib import constants
@@ skipping 12 matching lines @@
 
   Args:
     test_suite_basename: The test suite basename for which to return file paths.
 
   Returns:
     A list of test file and directory paths.
   """
   # Ideally, we'd just push all test data. However, it has >100MB, and a lot
   # of the files are not relevant (some are used for browser_tests, others for
   # features not supported, etc..).
-  if test_suite_basename in ['base_unittests', 'sql_unittests', 'unit_tests']:

[frankf, 2013/04/08 19:19:37]

sql_unittests don't have any deps?

[nilesh, 2013/04/08 23:50:57]

No, no files are needed for sql_unittests.

+  if test_suite_basename == 'base_unittests':
+    return [
+        'base/test/data/',
+    ]
+  elif test_suite_basename == 'unit_tests':
     test_files = [
         'base/test/data/',
         'chrome/test/data/download-test1.lib',
         'chrome/test/data/extensions/bad_magic.crx',
         'chrome/test/data/extensions/good.crx',
         'chrome/test/data/extensions/icon1.png',
         'chrome/test/data/extensions/icon2.png',
         'chrome/test/data/extensions/icon3.png',
         'chrome/test/data/extensions/allow_silent_upgrade/',
         'chrome/test/data/extensions/app/',
         'chrome/test/data/extensions/bad/',
         'chrome/test/data/extensions/effective_host_permissions/',
         'chrome/test/data/extensions/empty_manifest/',
         'chrome/test/data/extensions/good/Extensions/',
         'chrome/test/data/extensions/manifest_tests/',
         'chrome/test/data/extensions/page_action/',
         'chrome/test/data/extensions/permissions/',
         'chrome/test/data/extensions/script_and_capture/',
         'chrome/test/data/extensions/unpacker/',
         'chrome/test/data/bookmarks/',
         'chrome/test/data/components/',
         'chrome/test/data/extensions/json_schema_test.js',
         'chrome/test/data/History/',
         'chrome/test/data/json_schema_validator/',
         'chrome/test/data/pref_service/',
+        'chrome/test/data/simple_open_search.xml',
         'chrome/test/data/top_sites/',
         'chrome/test/data/web_app_info/',
         'chrome/test/data/web_database',
         'chrome/test/data/webui/',
         'chrome/test/data/zip',
         'chrome/third_party/mock4js/',
-        'content/browser/gpu/software_rendering_list.json',
-        'net/data/cache_tests/insert_load1',
-        'net/data/cache_tests/dirty_entry5',
-        'net/data/ssl/certificates/',
+        'net/data/ssl/certificates',

[frankf, 2013/04/08 19:19:37]

I'm assuming trailing slash is optional.

[nilesh, 2013/04/08 23:50:57]

yes.

         'third_party/accessibility-developer-tools/gen/axs_testing.js',
-        'ui/base/test/data/data_pack_unittest',
     ]
-    if test_suite_basename == 'unit_tests':
-      test_files += ['chrome/test/data/simple_open_search.xml']
-      # The following are spell check data. Now only list the data under
-      # third_party/hunspell_dictionaries which are used by unit tests.
-      old_cwd = os.getcwd()
-      os.chdir(constants.CHROME_DIR)
-      test_files += glob.glob('third_party/hunspell_dictionaries/*.bdic')
-      os.chdir(old_cwd)
+    # The following are spell check data. Now only list the data under
+    # third_party/hunspell_dictionaries which are used by unit tests.
+    old_cwd = os.getcwd()
+    os.chdir(constants.CHROME_DIR)
+    test_files += glob.glob('third_party/hunspell_dictionaries/*.bdic')
+    os.chdir(old_cwd)
     return test_files
   elif test_suite_basename == 'media_unittests':
     return [
         'media/test/data',
     ]
   elif test_suite_basename == 'net_unittests':
     return [
         'chrome/test/data/animate1.gif',
         'chrome/test/data/simple.html',
         'net/data/cache_tests',
         'net/data/filter_unittests',
         'net/data/ftp',
         'net/data/proxy_resolver_v8_tracing_unittest',
         'net/data/proxy_resolver_v8_unittest',
+        'net/data/proxy_script_fetcher_unittest',
         'net/data/ssl/certificates',
         'net/data/url_request_unittest/',
-        'net/data/proxy_script_fetcher_unittest'
         ]
   elif test_suite_basename == 'ui_tests':
     return [
         'chrome/test/data/dromaeo',
         'chrome/test/data/json2.js',
         'chrome/test/data/sunspider',
         ]
+  elif test_suite_basename == 'ui_unittests':
+    return [
+        'ui/base/test/data/data_pack_unittest/truncated-header.pak',
+    ]
   elif test_suite_basename == 'content_unittests':
     return [
+        'content/browser/gpu/software_rendering_list.json',
         'content/test/data/gpu/webgl_conformance_test_expectations.txt',
         'net/data/ssl/certificates/',
+        'third_party/hyphen/hyph_en_US.dic',
         'webkit/data/dom_storage/webcore_test_database.localstorage',
-        'third_party/hyphen/hyph_en_US.dic',
         ]
   elif test_suite_basename == 'cc_perftests':
     return [
       'cc/test/data',
     ]
   elif test_suite_basename == 'perf_tests':
     return [
       'base/test/data',
     ]
   elif test_suite_basename == 'content_browsertests':
@@ skipping 253 matching lines @@
       self.LaunchChromeTestServerSpawner()
     self.tool.SetupEnvironment()
 
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.tool.CleanUpEnvironment()
     if self._cleanup_test_files:
       self.adb.RemovePushedFiles()
     super(TestRunner, self).TearDown()