commit 35af7ccfb091d898132d2e468ffecbe5e502b9cf
author Christoffer Dewerin <jansson@google.com> Wed May 08 09:19:39 2024
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed May 08 10:15:10 2024
tree 38cf5fd2b26d32f23e290ca3ddf857ebe509be3e
parent 1545cdc76b2120398ff2b47dbad454e4da8c1675

Move sharding logic to the correct context

Bug: b:338087169
Change-Id: I380f03c34ffcee315ef5084263f9f740b6bc4176
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/349642
Commit-Queue: Christoffer Dewerin <jansson@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42258}

test/test_main_lib.cc

diff --git a/test/test_main_lib.cc b/test/test_main_lib.cc
index e35029b..486913b 100644
--- a/test/test_main_lib.cc
+++ b/test/test_main_lib.cc
@@ -143,19 +143,6 @@
     rtc::LogMessage::SetLogToStderr(absl::GetFlag(FLAGS_logs) ||
                                     absl::GetFlag(FLAGS_verbose));
 
-    // The sharding arguments take precedence over the sharding environment
-    // variables.
-    if (!absl::GetFlag(FLAGS_test_launcher_shard_index).empty() &&
-        !absl::GetFlag(FLAGS_test_launcher_total_shards).empty()) {
-      std::string shard_index =
-          "GTEST_SHARD_INDEX=" + absl::GetFlag(FLAGS_test_launcher_shard_index);
-      std::string total_shards =
-          "GTEST_TOTAL_SHARDS=" +
-          absl::GetFlag(FLAGS_test_launcher_total_shards);
-      putenv(shard_index.data());
-      putenv(total_shards.data());
-    }
-
     // InitFieldTrialsFromString stores the char*, so the char array must
     // outlive the application.
     field_trials_ = absl::GetFlag(FLAGS_force_fieldtrials);
@@ -191,6 +178,18 @@
         metrics_to_plot->clear();
       }
     }
+    // The sharding arguments take precedence over the sharding environment
+    // variables.
+    if (!absl::GetFlag(FLAGS_test_launcher_shard_index).empty() &&
+        !absl::GetFlag(FLAGS_test_launcher_total_shards).empty()) {
+      std::string shard_index =
+          "GTEST_SHARD_INDEX=" + absl::GetFlag(FLAGS_test_launcher_shard_index);
+      std::string total_shards =
+          "GTEST_TOTAL_SHARDS=" +
+          absl::GetFlag(FLAGS_test_launcher_total_shards);
+      putenv(total_shards.data());
+      putenv(shard_index.data());
+    }
 
 #if defined(WEBRTC_IOS)
     rtc::test::InitTestSuite(