Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(251)

Unified Diff: build/android/pylib/gtest/test_runner.py

Issue 12481028: base: Move the rest of JSONValueSerializer unit tests from c/common to base/json. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: change the extension to json Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: build/android/pylib/gtest/test_runner.py
diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py
index 77fa0a57259ab7430c73416bc046f9d39b2ce7ce..1be28a204fbfa6558db449c2d8679a7a91e2fb15 100644
--- a/build/android/pylib/gtest/test_runner.py
+++ b/build/android/pylib/gtest/test_runner.py
@@ -35,6 +35,9 @@ def _GetDataFilesForTestSuite(test_suite_basename):
'base/data/file_util_unittest',
'base/data/json/bom_feff.json',
'base/prefs/test/data/pref_service',
+ 'base/test/data/serializer_nested_test.json',
+ 'base/test/data/serializer_test.json',
+ 'base/test/data/serializer_test_nowhitespace.json',
'chrome/test/data/download-test1.lib',
'chrome/test/data/extensions/bad_magic.crx',
'chrome/test/data/extensions/good.crx',
@@ -58,9 +61,6 @@ def _GetDataFilesForTestSuite(test_suite_basename):
'chrome/test/data/History/',
'chrome/test/data/json_schema_validator/',
'chrome/test/data/pref_service/',
- 'chrome/test/data/serializer_nested_test.js',
- 'chrome/test/data/serializer_test.js',
- 'chrome/test/data/serializer_test_nowhitespace.js',
'chrome/test/data/top_sites/',
'chrome/test/data/web_app_info/',
'chrome/test/data/web_database',
@@ -121,6 +121,10 @@ def _GetDataFilesForTestSuite(test_suite_basename):
return [
'cc/test/data',
]
+ elif test_suite_basename == 'perf_tests':
+ return [
+ 'base/test/data',
+ ]
elif test_suite_basename == 'content_browsertests':
return [
'content/test/data',

Powered by Google App Engine
This is Rietveld 408576698