From 28f6c2f292806bf31230a959bc4b19d7081669a7 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Mon, 7 Aug 2023 23:17:32 -0700 Subject: Import GoogleTest 1.14.0 GoogleTest 1.14.0 now requires C++14 to build. Change `googletest.test.inc.mk` to reflect this requirement. Adjust the build integration logic to handle the new version of GoogleTest (add/remove headers/sources as needed). Tighten down warnings via `CXXFLAGS.clang` instead of ignoring all warnings. Some new warnings snuck in after I did my last round of fix submissions upstream. Also address some overlinking added in the previous version import by removing superfluous libraries. =============================== Expect WhenDynamicCastToTest.AmbiguousCast to fail This change reapplies the expected failure from 1.10.0. Ref: https://github.com/google/googletest/issues/2172 MFC after: 2 weeks Reviewed by: asomers, emaste Differential Revision: https://reviews.freebsd.org/D41399 Merge commit '8ef491440fcaec96f899d73e08873426c78583a4' into googletest-v1.14.0-import --- .../googlemock/scripts/generator/cpp/utils.py | 41 ---------------------- 1 file changed, 41 deletions(-) delete mode 100755 contrib/googletest/googlemock/scripts/generator/cpp/utils.py (limited to 'contrib/googletest/googlemock/scripts/generator/cpp/utils.py') diff --git a/contrib/googletest/googlemock/scripts/generator/cpp/utils.py b/contrib/googletest/googlemock/scripts/generator/cpp/utils.py deleted file mode 100755 index eab36eec335e..000000000000 --- a/contrib/googletest/googlemock/scripts/generator/cpp/utils.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2007 Neal Norwitz -# Portions Copyright 2007 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Generic utilities for C++ parsing.""" - -__author__ = 'nnorwitz@google.com (Neal Norwitz)' - - -import sys - - -# Set to True to see the start/end token indices. -DEBUG = True - - -def ReadFile(filename, print_error=True): - """Returns the contents of a file.""" - try: - fp = open(filename) - try: - return fp.read() - finally: - fp.close() - except IOError: - if print_error: - print('Error reading %s: %s' % (filename, sys.exc_info()[1])) - return None -- cgit v1.2.3