organicmaps/googletest
13
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-04-05 13:35:03 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Include shaming smh!

Browse source
This commit is contained in:
Tiago Freire 2023-11-14 09:28:05 +01:00
parent a6f833c44b
commit a9438be9ee
No known key found for this signature in database
GPG key ID: 67C8701B75172B17
50 changed files with 155 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
googlemock/CMakeLists.txt
View file

@ -67,7 +67,6 @@ config_compiler_and_linker() # from ${gtest_dir}/cmake/internal_utils.cmake
# Adds Google Mock's and Google Test's header directories to the search path.
set(gmock_build_include_dirs
"${gmock_SOURCE_DIR}/include"
"${gmock_SOURCE_DIR}"
"${gtest_SOURCE_DIR}/include"
# This directory is needed to build directly from Google Test sources.
"${gtest_SOURCE_DIR}")

6
googlemock/include/gmock/gmock-actions.h
View file

@ -142,9 +142,9 @@
#include <type_traits>
#include <utility>
#include "gmock/internal/gmock-internal-utils.h"
#include "gmock/internal/gmock-port.h"
#include "gmock/internal/gmock-pp.h"
#include "internal/gmock-internal-utils.h"
#include "internal/gmock-port.h"
#include "internal/gmock-pp.h"
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4100)

4
googlemock/include/gmock/gmock-cardinalities.h
View file

@ -44,8 +44,8 @@
#include <memory>
#include <ostream> // NOLINT
#include "gmock/internal/gmock-port.h"
#include "gtest/gtest.h"
#include "internal/gmock-port.h"
#include <gtest/gtest.h>
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
/* class A needs to have dll-interface to be used by clients of class B */)

6
googlemock/include/gmock/gmock-function-mocker.h
View file

@ -41,9 +41,9 @@
#include <type_traits> // IWYU pragma: keep
#include <utility> // IWYU pragma: keep
#include "gmock/gmock-spec-builders.h"
#include "gmock/internal/gmock-internal-utils.h"
#include "gmock/internal/gmock-pp.h"
#include "gmock-spec-builders.h"
#include "internal/gmock-internal-utils.h"
#include "internal/gmock-pp.h"
namespace testing {
namespace internal {

8
googlemock/include/gmock/gmock-matchers.h
View file

@ -271,10 +271,10 @@
#include <utility>
#include <vector>
#include "gmock/internal/gmock-internal-utils.h"
#include "gmock/internal/gmock-port.h"
#include "gmock/internal/gmock-pp.h"
#include "gtest/gtest.h"
#include "internal/gmock-internal-utils.h"
#include "internal/gmock-port.h"
#include "internal/gmock-pp.h"
#include <gtest/gtest.h>
// MSVC warning C5046 is new as of VS2017 version 15.8.
#if defined(_MSC_VER) && _MSC_VER >= 1915

6
googlemock/include/gmock/gmock-more-actions.h
View file

@ -40,11 +40,11 @@
#include <memory>
#include <utility>
#include "gmock/gmock-actions.h"
#include "gmock/internal/gmock-port.h"
#include "gmock-actions.h"
#include "internal/gmock-port.h"
// Include any custom callback actions added by the local installation.
#include "gmock/internal/custom/gmock-generated-actions.h"
#include "internal/custom/gmock-generated-actions.h"
// Sometimes you want to give an action explicit template parameters
// that cannot be inferred from its value parameters. ACTION() and

2
googlemock/include/gmock/gmock-more-matchers.h
View file

@ -43,7 +43,7 @@
#include <ostream>
#include <string>
#include "gmock/gmock-matchers.h"
#include "gmock-matchers.h"
namespace testing {

4
googlemock/include/gmock/gmock-nice-strict.h
View file

@ -66,8 +66,8 @@
#include <cstdint>
#include <type_traits>
#include "gmock/gmock-spec-builders.h"
#include "gmock/internal/gmock-port.h"
#include "gmock-spec-builders.h"
#include "internal/gmock-port.h"
namespace testing {
template <class MockClass>

12
googlemock/include/gmock/gmock-spec-builders.h
View file

@ -73,12 +73,12 @@
#include <utility>
#include <vector>
#include "gmock/gmock-actions.h"
#include "gmock/gmock-cardinalities.h"
#include "gmock/gmock-matchers.h"
#include "gmock/internal/gmock-internal-utils.h"
#include "gmock/internal/gmock-port.h"
#include "gtest/gtest.h"
#include "gmock-actions.h"
#include "gmock-cardinalities.h"
#include "gmock-matchers.h"
#include "internal/gmock-internal-utils.h"
#include "internal/gmock-port.h"
#include <gtest/gtest.h>
#if GTEST_HAS_EXCEPTIONS
#include <stdexcept> // NOLINT

20
googlemock/include/gmock/gmock.h
View file

@ -53,16 +53,16 @@
//
// where all clauses are optional and WillOnce() can be repeated.
#include "gmock/gmock-actions.h" // IWYU pragma: export
#include "gmock/gmock-cardinalities.h" // IWYU pragma: export
#include "gmock/gmock-function-mocker.h" // IWYU pragma: export
#include "gmock/gmock-matchers.h" // IWYU pragma: export
#include "gmock/gmock-more-actions.h" // IWYU pragma: export
#include "gmock/gmock-more-matchers.h" // IWYU pragma: export
#include "gmock/gmock-nice-strict.h" // IWYU pragma: export
#include "gmock/gmock-spec-builders.h" // IWYU pragma: export
#include "gmock/internal/gmock-internal-utils.h"
#include "gmock/internal/gmock-port.h"
#include "gmock-actions.h" // IWYU pragma: export
#include "gmock-cardinalities.h" // IWYU pragma: export
#include "gmock-function-mocker.h" // IWYU pragma: export
#include "gmock-matchers.h" // IWYU pragma: export
#include "gmock-more-actions.h" // IWYU pragma: export
#include "gmock-more-matchers.h" // IWYU pragma: export
#include "gmock-nice-strict.h" // IWYU pragma: export
#include "gmock-spec-builders.h" // IWYU pragma: export
#include "internal/gmock-internal-utils.h"
#include "internal/gmock-port.h"
// Declares Google Mock flags that we want a user to use programmatically.
GMOCK_DECLARE_bool_(catch_leaked_mocks);

4
googlemock/include/gmock/internal/gmock-internal-utils.h
View file

@ -46,8 +46,8 @@
#include <type_traits>
#include <vector>
#include "gmock/internal/gmock-port.h"
#include "gtest/gtest.h"
#include "gmock-port.h"
#include <gtest/gtest.h>
namespace testing {

4
googlemock/include/gmock/internal/gmock-port.h
View file

@ -53,8 +53,8 @@
// here, as Google Mock depends on Google Test. Only add a utility
// here if it's truly specific to Google Mock.
#include "gmock/internal/custom/gmock-port.h"
#include "gtest/internal/gtest-port.h"
#include "custom/gmock-port.h"
#include <gtest/internal/gtest-port.h>
#ifdef GTEST_HAS_ABSL
#include "absl/flags/declare.h"

12
googlemock/src/gmock-all.cc
View file

@ -36,11 +36,11 @@
// This line ensures that gmock.h can be compiled on its own, even
// when it's fused.
#include "gmock/gmock.h"
#include <gmock/gmock.h>
// The following lines pull in the real gmock *.cc files.
#include "src/gmock-cardinalities.cc"
#include "src/gmock-internal-utils.cc"
#include "src/gmock-matchers.cc"
#include "src/gmock-spec-builders.cc"
#include "src/gmock.cc"
#include "gmock-cardinalities.cc"
#include "gmock-internal-utils.cc"
#include "gmock-matchers.cc"
#include "gmock-spec-builders.cc"
#include "gmock.cc"

6
googlemock/src/gmock-cardinalities.cc
View file

@ -31,7 +31,7 @@
//
// This file implements cardinalities.
#include "gmock/gmock-cardinalities.h"
#include <gmock/gmock-cardinalities.h>
#include <limits.h>
@ -39,8 +39,8 @@
#include <sstream>
#include <string>
#include "gmock/internal/gmock-internal-utils.h"
#include "gtest/gtest.h"
#include <gmock/internal/gmock-internal-utils.h>
#include <gtest/gtest.h>
namespace testing {

8
googlemock/src/gmock-internal-utils.cc
View file

@ -33,7 +33,7 @@
// Mock. They are subject to change without notice, so please DO NOT
// USE THEM IN USER CODE.
#include "gmock/internal/gmock-internal-utils.h"
#include <gmock/internal/gmock-internal-utils.h>
#include <ctype.h>
@ -46,9 +46,9 @@
#include <string>
#include <vector>
#include "gmock/gmock.h"
#include "gmock/internal/gmock-port.h"
#include "gtest/gtest.h"
#include <gmock/gmock.h>
#include <gmock/internal/gmock-port.h>
#include <gtest/gtest.h>
namespace testing {
namespace internal {

2
googlemock/src/gmock-matchers.cc
View file

@ -32,7 +32,7 @@
// This file implements Matcher<const string&>, Matcher<string>, and
// utilities for defining matchers.
#include "gmock/gmock-matchers.h"
#include <gmock/gmock-matchers.h>
#include <string.h>

8
googlemock/src/gmock-spec-builders.cc
View file

@ -32,7 +32,7 @@
// This file implements the spec builder syntax (ON_CALL and
// EXPECT_CALL).
#include "gmock/gmock-spec-builders.h"
#include <gmock/gmock-spec-builders.h>
#include <stdlib.h>
@ -45,9 +45,9 @@
#include <unordered_map>
#include <vector>
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "gtest/internal/gtest-port.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <gtest/internal/gtest-port.h>
#if defined(GTEST_OS_CYGWIN) || defined(GTEST_OS_LINUX) || defined(GTEST_OS_MAC)
#include <unistd.h> // NOLINT

4
googlemock/src/gmock.cc
View file

@ -27,11 +27,11 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "gmock/gmock.h"
#include <gmock/gmock.h>
#include <string>
#include "gmock/internal/gmock-port.h"
#include <gmock/internal/gmock-port.h>
GMOCK_DEFINE_bool_(catch_leaked_mocks, true,
"true if and only if Google Mock should report leaked "

4
googlemock/src/gmock_main.cc
View file

@ -29,8 +29,8 @@
#include <iostream>
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#if defined(GTEST_OS_ESP8266) || defined(GTEST_OS_ESP32) || \
(defined(GTEST_OS_NRF52) && defined(ARDUINO))

3
googletest/CMakeLists.txt
View file

@ -108,8 +108,7 @@ endif()
# Where Google Test's .h files can be found.
set(gtest_build_include_dirs
"${gtest_SOURCE_DIR}/include"
"${gtest_SOURCE_DIR}")
"${gtest_SOURCE_DIR}/include")
include_directories(${gtest_build_include_dirs})
########################################################################

4
googletest/include/gtest/gtest-assertion-result.h
View file

@ -43,8 +43,8 @@
#include <string>
#include <type_traits>
#include "gtest/gtest-message.h"
#include "gtest/internal/gtest-port.h"
#include "gtest-message.h"
#include "internal/gtest-port.h"
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
/* class A needs to have dll-interface to be used by clients of class B */)

2
googletest/include/gtest/gtest-death-test.h
View file

@ -40,7 +40,7 @@
#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
#define GOOGLETEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
#include "gtest/internal/gtest-death-test-internal.h"
#include "internal/gtest-death-test-internal.h"
// This flag controls the style of death tests. Valid values are "threadsafe",
// meaning that the death test child process will re-execute the test binary

6
googletest/include/gtest/gtest-matchers.h
View file

@ -46,9 +46,9 @@
#include <string>
#include <type_traits>
#include "gtest/gtest-printers.h"
#include "gtest/internal/gtest-internal.h"
#include "gtest/internal/gtest-port.h"
#include "gtest-printers.h"
#include "internal/gtest-internal.h"
#include "internal/gtest-port.h"
// MSVC warning C5046 is new as of VS2017 version 15.8.
#if defined(_MSC_VER) && _MSC_VER >= 1915

2
googletest/include/gtest/gtest-message.h
View file

@ -54,7 +54,7 @@
#include <sstream>
#include <string>
#include "gtest/internal/gtest-port.h"
#include "internal/gtest-port.h"
#ifdef GTEST_HAS_ABSL
#include <type_traits>

6
googletest/include/gtest/gtest-param-test.h
View file

@ -177,9 +177,9 @@ TEST_P(DerivedTest, DoesBlah) {
#include <iterator>
#include <utility>
#include "gtest/internal/gtest-internal.h"
#include "gtest/internal/gtest-param-util.h"
#include "gtest/internal/gtest-port.h"
#include "internal/gtest-internal.h"
#include "internal/gtest-param-util.h"
#include "internal/gtest-port.h"
namespace testing {

4
googletest/include/gtest/gtest-printers.h
View file

@ -119,8 +119,8 @@
#include "absl/strings/has_absl_stringify.h"
#include "absl/strings/str_cat.h"
#endif // GTEST_HAS_ABSL
#include "gtest/internal/gtest-internal.h"
#include "gtest/internal/gtest-port.h"
#include "internal/gtest-internal.h"
#include "internal/gtest-port.h"
#if GTEST_INTERNAL_HAS_STD_SPAN
#include <span> // NOLINT

2
googletest/include/gtest/gtest-spi.h
View file

@ -35,7 +35,7 @@
#include <string>
#include "gtest/gtest.h"
#include "gtest.h"
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
/* class A needs to have dll-interface to be used by clients of class B */)

4
googletest/include/gtest/gtest-test-part.h
View file

@ -39,8 +39,8 @@
#include <string>
#include <vector>
#include "gtest/internal/gtest-internal.h"
#include "gtest/internal/gtest-string.h"
#include "internal/gtest-internal.h"
#include "internal/gtest-string.h"
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
/* class A needs to have dll-interface to be used by clients of class B */)

6
googletest/include/gtest/gtest-typed-test.h
View file

@ -171,9 +171,9 @@ INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes);
#endif // 0
#include "gtest/internal/gtest-internal.h"
#include "gtest/internal/gtest-port.h"
#include "gtest/internal/gtest-type-util.h"
#include "internal/gtest-internal.h"
#include "internal/gtest-port.h"
#include "internal/gtest-type-util.h"
// Implements typed tests.

24
googletest/include/gtest/gtest.h
View file

@ -60,18 +60,18 @@
#include <type_traits>
#include <vector>
#include "gtest/gtest-assertion-result.h"
#include "gtest/gtest-death-test.h"
#include "gtest/gtest-matchers.h"
#include "gtest/gtest-message.h"
#include "gtest/gtest-param-test.h"
#include "gtest/gtest-printers.h"
#include "gtest/gtest-test-part.h"
#include "gtest/gtest-typed-test.h"
#include "gtest/gtest_pred_impl.h"
#include "gtest/gtest_prod.h"
#include "gtest/internal/gtest-internal.h"
#include "gtest/internal/gtest-string.h"
#include "gtest-assertion-result.h"
#include "gtest-death-test.h"
#include "gtest-matchers.h"
#include "gtest-message.h"
#include "gtest-param-test.h"
#include "gtest-printers.h"
#include "gtest-test-part.h"
#include "gtest-typed-test.h"
#include "gtest_pred_impl.h"
#include "gtest_prod.h"
#include "internal/gtest-internal.h"
#include "internal/gtest-string.h"
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
/* class A needs to have dll-interface to be used by clients of class B */)

6
googletest/include/gtest/gtest_pred_impl.h
View file

@ -36,9 +36,9 @@
#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
#define GOOGLETEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
#include "gtest/gtest-assertion-result.h"
#include "gtest/internal/gtest-internal.h"
#include "gtest/internal/gtest-port.h"
#include "gtest-assertion-result.h"
#include "internal/gtest-internal.h"
#include "internal/gtest-port.h"
namespace testing {

4
googletest/include/gtest/internal/gtest-death-test-internal.h
View file

@ -44,8 +44,8 @@
#include <memory>
#include <string>
#include "gtest/gtest-matchers.h"
#include "gtest/internal/gtest-internal.h"
#include <gtest/gtest-matchers.h>
#include "gtest-internal.h"
GTEST_DECLARE_string_(internal_run_death_test);

4
googletest/include/gtest/internal/gtest-filepath.h
View file

@ -44,8 +44,8 @@
#include <string>
#include "gtest/internal/gtest-port.h"
#include "gtest/internal/gtest-string.h"
#include "gtest-port.h"
#include "gtest-string.h"
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
/* class A needs to have dll-interface to be used by clients of class B */)

10
googletest/include/gtest/internal/gtest-internal.h
View file

@ -39,7 +39,7 @@
#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
#include "gtest/internal/gtest-port.h"
#include "gtest-port.h"
#ifdef GTEST_OS_LINUX
#include <stdlib.h>
@ -66,10 +66,10 @@
#include <utility>
#include <vector>
#include "gtest/gtest-message.h"
#include "gtest/internal/gtest-filepath.h"
#include "gtest/internal/gtest-string.h"
#include "gtest/internal/gtest-type-util.h"
#include <gtest/gtest-message.h>
#include "gtest-filepath.h"
#include "gtest-string.h"
#include "gtest-type-util.h"
// Due to C++ preprocessor weirdness, we need double indirection to
// concatenate two tokens when one of them is __LINE__. Writing

8
googletest/include/gtest/internal/gtest-param-util.h
View file

@ -50,10 +50,10 @@
#include <utility>
#include <vector>
#include "gtest/gtest-printers.h"
#include "gtest/gtest-test-part.h"
#include "gtest/internal/gtest-internal.h"
#include "gtest/internal/gtest-port.h"
#include <gtest/gtest-printers.h>
#include <gtest/gtest-test-part.h>
#include "gtest-internal.h"
#include "gtest-port.h"
namespace testing {
// Input to a parameterized test name generator, describing a test parameter.

4
googletest/include/gtest/internal/gtest-port.h
View file

@ -327,8 +327,8 @@
#include <TargetConditionals.h>
#endif
#include "gtest/internal/custom/gtest-port.h"
#include "gtest/internal/gtest-port-arch.h"
#include "custom/gtest-port.h"
#include "gtest-port-arch.h"
#ifndef GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
#define GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ 0

2
googletest/include/gtest/internal/gtest-string.h
View file

@ -54,7 +54,7 @@
#include <sstream>
#include <string>
#include "gtest/internal/gtest-port.h"
#include "gtest-port.h"
namespace testing {
namespace internal {

2
googletest/include/gtest/internal/gtest-type-util.h
View file

@ -41,7 +41,7 @@
#include <type_traits>
#include <typeinfo>
#include "gtest/internal/gtest-port.h"
#include "gtest-port.h"
// #ifdef __GNUC__ is too general here. It is possible to use gcc without using
// libstdc++ (which is where cxxabi.h comes from).

20
googletest/src/gtest-all.cc
View file

@ -35,15 +35,15 @@
// This line ensures that gtest.h can be compiled on its own, even
// when it's fused.
#include "gtest/gtest.h"
#include <gtest/gtest.h>
// The following lines pull in the real gtest *.cc files.
#include "src/gtest-assertion-result.cc"
#include "src/gtest-death-test.cc"
#include "src/gtest-filepath.cc"
#include "src/gtest-matchers.cc"
#include "src/gtest-port.cc"
#include "src/gtest-printers.cc"
#include "src/gtest-test-part.cc"
#include "src/gtest-typed-test.cc"
#include "src/gtest.cc"
#include "gtest-assertion-result.cc"
#include "gtest-death-test.cc"
#include "gtest-filepath.cc"
#include "gtest-matchers.cc"
#include "gtest-port.cc"
#include "gtest-printers.cc"
#include "gtest-test-part.cc"
#include "gtest-typed-test.cc"
#include "gtest.cc"

4
googletest/src/gtest-assertion-result.cc
View file

@ -31,12 +31,12 @@
//
// This file defines the AssertionResult type.
#include "gtest/gtest-assertion-result.h"
#include <gtest/gtest-assertion-result.h>
#include <string>
#include <utility>
#include "gtest/gtest-message.h"
#include <gtest/gtest-message.h>
namespace testing {

10
googletest/src/gtest-death-test.cc
View file

@ -30,7 +30,7 @@
//
// This file implements death tests.
#include "gtest/gtest-death-test.h"
#include <gtest/gtest-death-test.h>
#include <functional>
#include <memory>
@ -39,8 +39,8 @@
#include <utility>
#include <vector>
#include "gtest/internal/custom/gtest.h"
#include "gtest/internal/gtest-port.h"
#include <gtest/internal/custom/gtest.h>
#include <gtest/internal/gtest-port.h>
#ifdef GTEST_HAS_DEATH_TEST
@ -85,8 +85,8 @@
#endif // GTEST_HAS_DEATH_TEST
#include "gtest/gtest-message.h"
#include "gtest/internal/gtest-string.h"
#include <gtest/gtest-message.h>
#include <gtest/internal/gtest-string.h>
#include "gtest-internal-inl.h"
namespace testing {

8
googletest/src/gtest-filepath.cc
View file

@ -27,15 +27,15 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "gtest/internal/gtest-filepath.h"
#include <gtest/internal/gtest-filepath.h>
#include <stdlib.h>
#include <iterator>
#include <string>
#include "gtest/gtest-message.h"
#include "gtest/internal/gtest-port.h"
#include <gtest/gtest-message.h>
#include <gtest/internal/gtest-port.h>
#ifdef GTEST_OS_WINDOWS_MOBILE
#include <windows.h>
@ -48,7 +48,7 @@
#include <climits> // Some Linux distributions define PATH_MAX here.
#endif // GTEST_OS_WINDOWS_MOBILE
#include "gtest/internal/gtest-string.h"
#include <gtest/internal/gtest-string.h>
#ifdef GTEST_OS_WINDOWS
#define GTEST_PATH_MAX_ _MAX_PATH

6
googletest/src/gtest-internal-inl.h
View file

@ -48,7 +48,7 @@
#include <string>
#include <vector>
#include "gtest/internal/gtest-port.h"
#include <gtest/internal/gtest-port.h>
#if GTEST_CAN_STREAM_RESULTS_
#include <arpa/inet.h> // NOLINT
@ -59,8 +59,8 @@
#include <windows.h> // NOLINT
#endif // GTEST_OS_WINDOWS
#include "gtest/gtest-spi.h"
#include "gtest/gtest.h"
#include <gtest/gtest-spi.h>
#include <gtest/gtest.h>
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
/* class A needs to have dll-interface to be used by clients of class B */)

6
googletest/src/gtest-matchers.cc
View file

@ -32,12 +32,12 @@
// This file implements just enough of the matcher interface to allow
// EXPECT_DEATH and friends to accept a matcher argument.
#include "gtest/gtest-matchers.h"
#include <gtest/gtest-matchers.h>
#include <string>
#include "gtest/internal/gtest-internal.h"
#include "gtest/internal/gtest-port.h"
#include <gtest/internal/gtest-internal.h>
#include <gtest/internal/gtest-port.h>
namespace testing {

10
googletest/src/gtest-port.cc
View file

@ -27,7 +27,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "gtest/internal/gtest-port.h"
#include <gtest/internal/gtest-port.h>
#include <limits.h>
#include <stdio.h>
@ -87,10 +87,10 @@
#include <zircon/syscalls.h>
#endif // GTEST_OS_FUCHSIA
#include "gtest/gtest-message.h"
#include "gtest/gtest-spi.h"
#include "gtest/internal/gtest-internal.h"
#include "gtest/internal/gtest-string.h"
#include <gtest/gtest-message.h>
#include <gtest/gtest-spi.h>
#include <gtest/internal/gtest-internal.h>
#include <gtest/internal/gtest-string.h>
#include "gtest-internal-inl.h"
namespace testing {

4
googletest/src/gtest-printers.cc
View file

@ -40,7 +40,7 @@
// or void PrintTo(const Foo&, ::std::ostream*) in the namespace that
// defines Foo.
#include "gtest/gtest-printers.h"
#include <gtest/gtest-printers.h>
#include <stdio.h>
@ -53,7 +53,7 @@
#include <string>
#include <type_traits>
#include "gtest/internal/gtest-port.h"
#include <gtest/internal/gtest-port.h>
#include "gtest-internal-inl.h"
namespace testing {

4
googletest/src/gtest-test-part.cc
View file

@ -30,12 +30,12 @@
//
// The Google C++ Testing and Mocking Framework (Google Test)
#include "gtest/gtest-test-part.h"
#include <gtest/gtest-test-part.h>
#include <ostream>
#include <string>
#include "gtest/internal/gtest-port.h"
#include <gtest/internal/gtest-port.h>
#include "gtest-internal-inl.h"
namespace testing {

4
googletest/src/gtest-typed-test.cc
View file

@ -27,13 +27,13 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "gtest/gtest-typed-test.h"
#include <gtest/gtest-typed-test.h>
#include <set>
#include <string>
#include <vector>
#include "gtest/gtest.h"
#include <gtest/gtest.h>
namespace testing {
namespace internal {

10
googletest/src/gtest.cc
View file

@ -30,7 +30,7 @@
//
// The Google C++ Testing and Mocking Framework (Google Test)
#include "gtest/gtest.h"
#include <gtest/gtest.h>
#include <ctype.h>
#include <stdarg.h>
@ -62,10 +62,10 @@
#include <utility>
#include <vector>
#include "gtest/gtest-assertion-result.h"
#include "gtest/gtest-spi.h"
#include "gtest/internal/custom/gtest.h"
#include "gtest/internal/gtest-port.h"
#include <gtest/gtest-assertion-result.h>
#include <gtest/gtest-spi.h>
#include <gtest/internal/custom/gtest.h>
#include <gtest/internal/gtest-port.h>
#ifdef GTEST_OS_LINUX

2
googletest/src/gtest_main.cc
View file

@ -29,7 +29,7 @@
#include <cstdio>
#include "gtest/gtest.h"
#include <gtest/gtest.h>
#if defined(GTEST_OS_ESP8266) || defined(GTEST_OS_ESP32) || \
(defined(GTEST_OS_NRF52) && defined(ARDUINO))