From 0c68c865f3dafa73ceaacc10dbc3ac09a78971b3 Mon Sep 17 00:00:00 2001 From: misterg Date: Thu, 18 Apr 2019 15:33:56 -0400 Subject: [PATCH] Googletest export Fixes https://github.com/google/googletest/issues/2232 PiperOrigin-RevId: 244237560 --- googletest/src/gtest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 36210c6e..5998f9a3 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();