diff options
| -rw-r--r-- | googletest/test/BUILD.bazel | 6 | ||||
| -rw-r--r-- | googletest/test/googletest-message-test.cc (renamed from googletest/test/gtest-message_test.cc) | 0 | ||||
| -rw-r--r-- | googletest/test/googletest-options-test.cc (renamed from googletest/test/gtest-options_test.cc) | 4 | ||||
| -rw-r--r-- | googletest/test/googletest-port-test.cc (renamed from googletest/test/gtest-port_test.cc) | 6 | ||||
| -rw-r--r-- | googletest/test/googletest-printers-test.cc (renamed from googletest/test/gtest-printers_test.cc) | 0 | ||||
| -rw-r--r-- | googletest/test/googletest-tuple-test.cc (renamed from googletest/test/gtest-tuple_test.cc) | 0 |
6 files changed, 8 insertions, 8 deletions
diff --git a/googletest/test/BUILD.bazel b/googletest/test/BUILD.bazel index 7d0932bd..a5c6b14d 100644 --- a/googletest/test/BUILD.bazel +++ b/googletest/test/BUILD.bazel @@ -49,7 +49,7 @@ config_setting( values = {"define": "absl=1"}, ) -#on windows exclude gtest-tuple.h and gtest-tuple_test.cc +#on windows exclude gtest-tuple.h and googletest-tuple-test.cc cc_test( name = "gtest_all_test", size = "small", @@ -62,7 +62,7 @@ cc_test( ], exclude = [ "gtest-unittest-api_test.cc", - "gtest-tuple_test.cc", + "googletest-tuple-test.cc", "googletest/src/gtest-all.cc", "gtest_all_test.cc", "gtest-death-test_ex_test.cc", @@ -85,7 +85,7 @@ cc_test( "//:windows": [], "//:windows_msvc": [], "//conditions:default": [ - "gtest-tuple_test.cc", + "googletest-tuple-test.cc", ], }), copts = select({ diff --git a/googletest/test/gtest-message_test.cc b/googletest/test/googletest-message-test.cc index 175238ef..175238ef 100644 --- a/googletest/test/gtest-message_test.cc +++ b/googletest/test/googletest-message-test.cc diff --git a/googletest/test/gtest-options_test.cc b/googletest/test/googletest-options-test.cc index 10cb1df7..e4c0d04f 100644 --- a/googletest/test/gtest-options_test.cc +++ b/googletest/test/googletest-options-test.cc @@ -99,7 +99,7 @@ TEST(OutputFileHelpersTest, GetCurrentExecutableName) { const std::string exe_str = GetCurrentExecutableName().string(); #if GTEST_OS_WINDOWS const bool success = - _strcmpi("gtest-options_test", exe_str.c_str()) == 0 || + _strcmpi("googletest-options-test", exe_str.c_str()) == 0 || _strcmpi("gtest-options-ex_test", exe_str.c_str()) == 0 || _strcmpi("gtest_all_test", exe_str.c_str()) == 0 || _strcmpi("gtest_dll_test", exe_str.c_str()) == 0; @@ -109,7 +109,7 @@ TEST(OutputFileHelpersTest, GetCurrentExecutableName) { // TODO(wan@google.com): remove the hard-coded "lt-" prefix when // Chandler Carruth's libtool replacement is ready. const bool success = - exe_str == "gtest-options_test" || + exe_str == "googletest-options-test" || exe_str == "gtest_all_test" || exe_str == "lt-gtest_all_test" || exe_str == "gtest_dll_test"; diff --git a/googletest/test/gtest-port_test.cc b/googletest/test/googletest-port-test.cc index 3801e5ee..15a629fc 100644 --- a/googletest/test/gtest-port_test.cc +++ b/googletest/test/googletest-port-test.cc @@ -346,11 +346,11 @@ TEST(GtestCheckDeathTest, DiesWithCorrectOutputOnFailure) { const bool a_false_condition = false; const char regex[] = #ifdef _MSC_VER - "gtest-port_test\\.cc\\(\\d+\\):" + "googletest-port-test\\.cc\\(\\d+\\):" #elif GTEST_USES_POSIX_RE - "gtest-port_test\\.cc:[0-9]+" + "googletest-port-test\\.cc:[0-9]+" #else - "gtest-port_test\\.cc:\\d+" + "googletest-port-test\\.cc:\\d+" #endif // _MSC_VER ".*a_false_condition.*Extra info.*"; diff --git a/googletest/test/gtest-printers_test.cc b/googletest/test/googletest-printers-test.cc index 49b3bd46..49b3bd46 100644 --- a/googletest/test/gtest-printers_test.cc +++ b/googletest/test/googletest-printers-test.cc diff --git a/googletest/test/gtest-tuple_test.cc b/googletest/test/googletest-tuple-test.cc index bfaa3e0a..bfaa3e0a 100644 --- a/googletest/test/gtest-tuple_test.cc +++ b/googletest/test/googletest-tuple-test.cc |