Merge bef2a5834c193419e5cba354058a76f3c42010c1 into 3ff51c3e80f2c2eb105d43ecb9acab9a62e01600

Merge pull request #5041 from alvinjaison:fix/get-test-suite-shuffle-index
PiperOrigin-RevId: 955317170 Change-Id: I40e01cdafe58768ccdb743dcf38717e48edcde41
2026-07-30 16:26:24 +08:00 · 2026-07-29 19:15:09 +08:00 · 2026-07-28 09:58:12 -07:00 · 2026-07-24 16:11:55 +01:00 · 2025-12-31 19:07:12 -08:00
2 changed files with 2 additions and 2 deletions
--- a/googletest/include/gtest/internal/gtest-port-arch.h
+++ b/googletest/include/gtest/internal/gtest-port-arch.h
@ -71,7 +71,7 @@
 #elif defined __APPLE__
 #define GTEST_OS_MAC 1
 #include <TargetConditionals.h>
-#if TARGET_OS_IPHONE
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
 #define GTEST_OS_IOS 1
 #endif
 #elif defined __DragonFly__
--- a/googletest/src/gtest-internal-inl.h
+++ b/googletest/src/gtest-internal-inl.h
@ -587,7 +587,7 @@ class GTEST_API_ UnitTestImpl {
  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
  const TestSuite* GetTestSuite(int i) const {
    const int index = GetElementOr(test_suite_indices_, i, -1);
-    return index < 0 ? nullptr : test_suites_[static_cast<size_t>(i)];
+    return index < 0 ? nullptr : test_suites_[static_cast<size_t>(index)];
  }

  //  Legacy API is deprecated but still available
Author	SHA1	Message	Date
Darryl Pogue	fa09f4c835	Merge bef2a5834c193419e5cba354058a76f3c42010c1 into 3ff51c3e80f2c2eb105d43ecb9acab9a62e01600	2026-07-29 19:15:09 +08:00
Copybara-Service	3ff51c3e80	Merge pull request #5041 from alvinjaison:fix/get-test-suite-shuffle-index PiperOrigin-RevId: 955317170 Change-Id: I40e01cdafe58768ccdb743dcf38717e48edcde41	2026-07-28 09:58:12 -07:00
Alvin Jaison	1269db9643	Fix GetTestSuite(i) ignoring shuffle order UnitTestImpl::GetTestSuite(int i) computes the shuffled index from test_suite_indices_ but then accesses test_suites_ using the raw parameter 'i' instead of the computed 'index'. This causes the public API UnitTest::GetTestSuite(i) to return test suites in original registration order rather than the active shuffle order. The mutable variant GetMutableSuiteCase(i) correctly uses 'index', and the equivalent function TestSuite::GetTestInfo(i) also uses 'index'. This was a copy-paste typo introduced in commit bd851333 (Sep 2009) when the shuffle feature was first added. The bug is observable from within TestEventListener callbacks during test execution when --gtest_shuffle is active.	2026-07-24 16:11:55 +01:00
Darryl Pogue	bef2a5834c	Resolve warning about undefined TARGET_OS_IPHONE Check that TARGET_OS_IPHONE is defined before checking its value to determine iOS support.	2025-12-31 19:07:12 -08:00