diff options
| author | thakis <thakis@chromium.org> | 2015-12-31 09:26:06 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-31 17:26:58 +0000 |
| commit | 29de2c811de5e5fa6eb238bbcd45796907c037bd (patch) | |
| tree | ac1ea9902b9958b3af28eda50a4301bf56c3ecf5 /third_party/ocmock | |
| parent | 92469c8c4b7da052273dee1a31308663d1dd1e3d (diff) | |
| download | chromium_src-29de2c811de5e5fa6eb238bbcd45796907c037bd.zip chromium_src-29de2c811de5e5fa6eb238bbcd45796907c037bd.tar.gz chromium_src-29de2c811de5e5fa6eb238bbcd45796907c037bd.tar.bz2 | |
Prepare for -Wall for third-party code, -Wextra for chromium_code
This lands patch set 16 of https://codereview.chromium.org/1551753002/
(reviewed there), except for the changes to build/common.gypi and
build/config/compiler/BUILD.gn. The changes to these two files are likely
to break some bot I don't know about, and I don't want to keep reverting
and relanding all these files. So this lands the parts that are hopefully
harmless separately.
BUG=573250
TBR=thestig
Review URL: https://codereview.chromium.org/1557733002
Cr-Commit-Position: refs/heads/master@{#367252}
Diffstat (limited to 'third_party/ocmock')
| -rw-r--r-- | third_party/ocmock/BUILD.gn | 6 | ||||
| -rw-r--r-- | third_party/ocmock/ocmock.gyp | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/third_party/ocmock/BUILD.gn b/third_party/ocmock/BUILD.gn index de51636..7d9f702 100644 --- a/third_party/ocmock/BUILD.gn +++ b/third_party/ocmock/BUILD.gn @@ -8,6 +8,11 @@ config("ocmock_config") { include_dirs = [ "//third_party/ocmock" ] } +config("ocmock_warnings") { + # NSInvocation+OCMAdditions.m has some `- (void) foo; {...` + cflags = [ "-Wno-semicolon-before-method-body" ] +} + source_set("ocmock") { testonly = true @@ -70,4 +75,5 @@ source_set("ocmock") { "//testing/gtest", ] public_configs = [ ":ocmock_config" ] + configs += [ ":ocmock_warnings" ] } diff --git a/third_party/ocmock/ocmock.gyp b/third_party/ocmock/ocmock.gyp index 04a4a88..942992b 100644 --- a/third_party/ocmock/ocmock.gyp +++ b/third_party/ocmock/ocmock.gyp @@ -72,6 +72,12 @@ 'OCMock/OCObserverMockObject.h', 'OCMock/OCObserverMockObject.m', ], + 'variables': { + 'clang_warning_flags': [ + # NSInvocation+OCMAdditions.m has some `- (void) foo; {...` + '-Wno-semicolon-before-method-body', + ], + }, }, ], }], |