summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authoralecflett@chromium.org <alecflett@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-03 23:02:57 +0000
committeralecflett@chromium.org <alecflett@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-03 23:02:57 +0000
commit4170d3a06feb349153149c05493756bfd3700cd3 (patch)
treec3b3b20ddd3689b1c177b44635fe3c2d27750f35 /build
parentc1c416186e47a3caab464ffe8851e8ce5ff92b5b (diff)
downloadchromium_src-4170d3a06feb349153149c05493756bfd3700cd3.zip
chromium_src-4170d3a06feb349153149c05493756bfd3700cd3.tar.gz
chromium_src-4170d3a06feb349153149c05493756bfd3700cd3.tar.bz2
Move components/zip to third_party/zip
Move components to zip as per the discussion here: https://groups.google.com/a/chromium.org/d/topic/chromium-dev/MgbMTQCNzR0/discussion BUG= R=agl@chromium.org, gavinp@chromium.org, jam@chromium.org, joi@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=197964 Review URL: https://codereview.chromium.org/14021015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198222 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/android/pylib/gtest/test_runner.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py
index 08ab8a1..bdbfa60 100644
--- a/build/android/pylib/gtest/test_runner.py
+++ b/build/android/pylib/gtest/test_runner.py
@@ -68,6 +68,7 @@ def _GetDataFilesForTestSuite(test_suite_basename):
'chrome/third_party/mock4js/',
'net/data/ssl/certificates',
'third_party/accessibility-developer-tools/gen/axs_testing.js',
+ 'third_party/zlib/google/test/data',
]
# The following are spell check data. Now only list the data under
# third_party/hunspell_dictionaries which are used by unit tests.
@@ -76,10 +77,6 @@ def _GetDataFilesForTestSuite(test_suite_basename):
test_files += glob.glob('third_party/hunspell_dictionaries/*.bdic')
os.chdir(old_cwd)
return test_files
- elif test_suite_basename == 'components_unittests':
- return [
- 'components/test/data/zip',
- ]
elif test_suite_basename == 'media_unittests':
return [
'media/test/data',