Bug 1169974 part 2: Tell clang to ignore inconsistent-missing-override warnings for MOCK_METHOD2 macro from gtests. r=njn
authorDaniel Holbert <dholbert@cs.stanford.edu>
Thu, 24 Sep 2015 16:16:14 -0700
changeset 264265 2056cb9f608d9a967d3a6d19466c2f604407b820
parent 264264 cdee9be7cdc15a2e1518ca56dd57c812e5cfb107
child 264266 2849177a50a1cc30a13fd0f136c5b5c9c4b29f77
push id65588
push userdholbert@mozilla.com
push dateThu, 24 Sep 2015 23:16:41 +0000
treeherdermozilla-inbound@2056cb9f608d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnjn
bugs1169974
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1169974 part 2: Tell clang to ignore inconsistent-missing-override warnings for MOCK_METHOD2 macro from gtests. r=njn
devtools/shared/heapsnapshot/tests/gtest/moz.build
layout/base/gtest/moz.build
--- a/devtools/shared/heapsnapshot/tests/gtest/moz.build
+++ b/devtools/shared/heapsnapshot/tests/gtest/moz.build
@@ -19,11 +19,11 @@ UNIFIED_SOURCES = [
     'SerializesEverythingInHeapGraphOnce.cpp',
     'SerializesTypeNames.cpp',
     'UniqueStringHashPolicy.cpp',
 ]
 
 # THE MOCK_METHOD2 macro from gtest triggers this clang warning and it's hard
 # to work around, so we just ignore it.
 if CONFIG['CLANG_CXX']:
-  CXXFLAGS += ['-Wno-error=inconsistent-missing-override']
+  CXXFLAGS += ['-Wno-inconsistent-missing-override']
 
 FINAL_LIBRARY = 'xul-gtest'
--- a/layout/base/gtest/moz.build
+++ b/layout/base/gtest/moz.build
@@ -7,17 +7,17 @@
 UNIFIED_SOURCES += [
     'TestAccessibleCaretEventHub.cpp',
     'TestAccessibleCaretManager.cpp',
 ]
 
 # THE MOCK_METHOD2 macro from gtest triggers this clang warning and it's hard
 # to work around, so we just ignore it.
 if CONFIG['CLANG_CXX']:
-  CXXFLAGS += ['-Wno-error=inconsistent-missing-override']
+  CXXFLAGS += ['-Wno-inconsistent-missing-override']
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
     '/docshell/base',
     '/layout/base',
     '/layout/style',
 ]