summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Minor <dminor@mozilla.com>2017-03-02 17:12:14 -0500
committerDan Minor <dminor@mozilla.com>2017-03-02 17:12:14 -0500
commit646ec29c75069e8b9ffb2b3d73c9b9175db73af3 (patch)
treeb462992fe7b0bc607f75150f631e8995e2d6f99c
parente56a77c10107ae74e1411666dc855037e352616d (diff)
downloadnss-hg-646ec29c75069e8b9ffb2b3d73c9b9175db73af3.tar.gz
Bug 1343557 - Disable -pedantic-errors for pkix gtests; r=keeler
MozReview-Commit-ID: FEeAF9Vm3PJ
-rw-r--r--lib/mozpkix/test/gtest/moz.build5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/mozpkix/test/gtest/moz.build b/lib/mozpkix/test/gtest/moz.build
index 50d7ae966..3eae044d7 100644
--- a/lib/mozpkix/test/gtest/moz.build
+++ b/lib/mozpkix/test/gtest/moz.build
@@ -37,6 +37,11 @@ FINAL_LIBRARY = 'xul-gtest'
include('../../warnings.mozbuild')
+# GTest uses a variadic macro in a questionable way and it doesn't seem to be
+# possible to selectively disable just that error when -pedantic-errors is set.
+if CONFIG['GNU_CXX'] and not CONFIG['CLANG_CXX']:
+ CXXFLAGS.remove('-pedantic-errors')
+
# These warnings are disabled in order to minimize the amount of boilerplate
# required to implement tests, and/or because they originate in the GTest
# framework in a way we cannot otherwise work around.