summaryrefslogtreecommitdiffstats
path: root/googletest/src
diff options
context:
space:
mode:
authormisterg <misterg@google.com>2019-04-18 19:33:56 (GMT)
committerGennadiy Civil <misterg@google.com>2019-04-18 19:46:04 (GMT)
commit0c68c865f3dafa73ceaacc10dbc3ac09a78971b3 (patch)
tree3b41bceca80d5b16795b1fc6811fde7cbaa8ed9f /googletest/src
parent9f4f27b2a5081830aa977c4fbf303751118a68e4 (diff)
downloadgoogletest-0c68c865f3dafa73ceaacc10dbc3ac09a78971b3.zip
googletest-0c68c865f3dafa73ceaacc10dbc3ac09a78971b3.tar.gz
googletest-0c68c865f3dafa73ceaacc10dbc3ac09a78971b3.tar.bz2
Googletest export
Fixes https://github.com/google/googletest/issues/2232 PiperOrigin-RevId: 244237560
Diffstat (limited to 'googletest/src')
-rw-r--r--googletest/src/gtest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index 36210c6..5998f9a 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -5236,8 +5236,8 @@ bool UnitTestImpl::RunAllTests() {
// when we are inside the subprocess of a death test.
const int repeat = in_subprocess_for_death_test ? 1 : GTEST_FLAG(repeat);
// Repeats forever if the repeat count is negative.
- const bool forever = repeat < 0;
- for (int i = 0; forever || i != repeat; i++) {
+ const bool gtest_repeat_forever = repeat < 0;
+ for (int i = 0; gtest_repeat_forever || i != repeat; i++) {
// We want to preserve failures generated by ad-hoc test
// assertions executed before RUN_ALL_TESTS().
ClearNonAdHocTestResult();