From 35af7ccfb091d898132d2e468ffecbe5e502b9cf Mon Sep 17 00:00:00 2001 From: Christoffer Dewerin Date: Wed, 8 May 2024 11:19:39 +0200 Subject: [PATCH] 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 Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#42258} --- test/test_main_lib.cc | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/test/test_main_lib.cc b/test/test_main_lib.cc index e35029b943..486913b716 100644 --- a/test/test_main_lib.cc +++ b/test/test_main_lib.cc @@ -143,19 +143,6 @@ class TestMainImpl : public TestMain { 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 @@ class TestMainImpl : public TestMain { 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(