summaryrefslogtreecommitdiffstats
path: root/testing/gtest.gyp
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-03 20:47:21 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-03 20:47:21 +0000
commitc836d7a0a05a8e5326494dcbd6c1bc73ad496c20 (patch)
treef9fa326e901385dfbfd19e7d488dc86b9ceca310 /testing/gtest.gyp
parentb8913f0d456e385a470e4ec157978eacd8a91a91 (diff)
downloadchromium_src-c836d7a0a05a8e5326494dcbd6c1bc73ad496c20.zip
chromium_src-c836d7a0a05a8e5326494dcbd6c1bc73ad496c20.tar.gz
chromium_src-c836d7a0a05a8e5326494dcbd6c1bc73ad496c20.tar.bz2
Update gmock and gtest.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27953 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/gtest.gyp')
-rw-r--r--testing/gtest.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index f89d6e5c..17546f4 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -87,6 +87,7 @@
'target_conditions': [
['_type=="executable"', {'test': 1}],
],
+ 'msvs_disabled_warnings': [4800],
},
},
{