summaryrefslogtreecommitdiffstats
path: root/base/base.gyp
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-30 23:31:16 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-30 23:31:16 +0000
commitbc8d9b963ce313b79e5c0816d2283dd7ba1c641a (patch)
tree837b8f221a3bd18ff424a0bbdb22d17fa581f5ff /base/base.gyp
parente9908c90f06bf2720255072834a189bf9c51907a (diff)
downloadchromium_src-bc8d9b963ce313b79e5c0816d2283dd7ba1c641a.zip
chromium_src-bc8d9b963ce313b79e5c0816d2283dd7ba1c641a.tar.gz
chromium_src-bc8d9b963ce313b79e5c0816d2283dd7ba1c641a.tar.bz2
base/prefs: Build and run json_pref_store_unittest.cc within base_unittests target.
But exclude from iOS build, since it doesn't run there yet. BUG=155525 TEST=base_unittests --gtest_filter=JsonPrefStoreTest* R=joi@chromium.org Review URL: https://codereview.chromium.org/12087026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179732 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
-rw-r--r--base/base.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 1a169c1..bd8a0c8 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -506,6 +506,7 @@
'posix/file_descriptor_shuffle_unittest.cc',
'posix/unix_domain_socket_linux_unittest.cc',
'pr_time_unittest.cc',
+ 'prefs/json_pref_store_unittest.cc',
'prefs/overlay_user_pref_store_unittest.cc',
'prefs/pref_value_map_unittest.cc',
'process_util_unittest.cc',
@@ -635,6 +636,8 @@
['exclude', '^metrics/stats_table_unittest\\.cc$'],
# iOS does not use message_pump_libevent.
['exclude', '^message_pump_libevent_unittest\\.cc$'],
+ ['exclude', '^prefs/json_pref_store_unittest.\\cc$'],
+
],
'conditions': [
['coverage != 0', {