diff options
| author | Copybara-Service <copybara-worker@google.com> | 2022-08-01 18:47:51 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2022-08-01 18:47:51 (GMT) |
| commit | 6045bf2ade7d997373355ba147eb6dc74425deb5 (patch) | |
| tree | 28431ed6357dc8fb2dfa51d51b37fee1ae172aca /googletest | |
| parent | fa3f444be1700c066d1cddba1bcb8789730bfbae (diff) | |
| parent | dd72ed19fe52f2dbca3b354d9a49eb4124693b99 (diff) | |
| download | googletest-6045bf2ade7d997373355ba147eb6dc74425deb5.zip googletest-6045bf2ade7d997373355ba147eb6dc74425deb5.tar.gz googletest-6045bf2ade7d997373355ba147eb6dc74425deb5.tar.bz2 | |
Merge pull request #3918 from assafpr:master2main
PiperOrigin-RevId: 464586117
Change-Id: Icda62f13b962f7408bb5698ae2b627391257d152
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/README.md | 4 | ||||
| -rw-r--r-- | googletest/src/gtest-death-test.cc | 2 | ||||
| -rw-r--r-- | googletest/src/gtest.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/googletest/README.md b/googletest/README.md index 8760d13..75b3d52 100644 --- a/googletest/README.md +++ b/googletest/README.md @@ -9,7 +9,7 @@ depends on which build system you use, and is usually straightforward. ### Build with CMake GoogleTest comes with a CMake build script -([CMakeLists.txt](https://github.com/google/googletest/blob/master/CMakeLists.txt)) +([CMakeLists.txt](https://github.com/google/googletest/blob/main/CMakeLists.txt)) that can be used on a wide range of platforms ("C" stands for cross-platform.). If you don't have CMake installed already, you can download it for free from <http://www.cmake.org/>. @@ -140,7 +140,7 @@ command line. Generally, these macros are named like `GTEST_XYZ` and you define them to either 1 or 0 to enable or disable a certain feature. We list the most frequently used macros below. For a complete list, see file -[include/gtest/internal/gtest-port.h](https://github.com/google/googletest/blob/master/googletest/include/gtest/internal/gtest-port.h). +[include/gtest/internal/gtest-port.h](https://github.com/google/googletest/blob/main/googletest/include/gtest/internal/gtest-port.h). ### Multi-threaded Tests diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc index d549e83..b6968a9 100644 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -249,7 +249,7 @@ static std::string DeathTestThreadWarning(size_t thread_count) { msg << "detected " << thread_count << " threads."; } msg << " See " - "https://github.com/google/googletest/blob/master/docs/" + "https://github.com/google/googletest/blob/main/docs/" "advanced.md#death-tests-and-threads" << " for more explanation and suggested solutions, especially if" << " this is the last message you see before your test times out."; diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index bcfb41a..513a887 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -6039,7 +6039,7 @@ bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) { // each TestSuite and TestInfo object. // If shard_tests == true, further filters tests based on sharding // variables in the environment - see -// https://github.com/google/googletest/blob/master/googletest/docs/advanced.md +// https://github.com/google/googletest/blob/main/docs/advanced.md // . Returns the number of tests that should run. int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) { const int32_t total_shards = shard_tests == HONOR_SHARDING_PROTOCOL |