From: misterg <misterg@google.com>
Date: Thu, 18 Apr 2019 19:33:56 +0000 (-0400)
Subject: Googletest export
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0c68c865f3dafa73ceaacc10dbc3ac09a78971b3;p=googletest.git

Googletest export

Fixes https://github.com/google/googletest/issues/2232

PiperOrigin-RevId: 244237560
---

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();