Replace WebRTC-QuickPerfTest field trial with similar named dedicated test flag
Bug: webrtc:7101
Change-Id: I4034f90fdd3456c1d09981142ad494ad150f7b94
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/322801
Reviewed-by: Jeremy Leconte <jleconte@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40901}
diff --git a/experiments/field_trials.py b/experiments/field_trials.py
index f621f6e..0e922f9 100755
--- a/experiments/field_trials.py
+++ b/experiments/field_trials.py
@@ -700,9 +700,6 @@
FieldTrial('WebRTC-QpParsingKillSwitch',
'webrtc:12542',
date(2024, 4, 1)),
- FieldTrial('WebRTC-QuickPerfTest',
- 'webrtc:7101',
- INDEFINITE),
FieldTrial('WebRTC-RtcEventLogKillSwitch',
'webrtc:12084',
INDEFINITE),
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl
index f5a0156..cbf9b24 100644
--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -220,7 +220,7 @@
'args': ['--nologs']
},
'quick-perf-tests': {
- 'args': ['--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/', '--nologs']
+ 'args': ['--webrtc_quick_perf_test', '--nologs']
},
'redfin': {
'swarming': {
diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl
index 70e13f6..f8fa66b 100644
--- a/infra/specs/mixins_webrtc.pyl
+++ b/infra/specs/mixins_webrtc.pyl
@@ -158,7 +158,7 @@
},
'quick-perf-tests': {
'args': [
- '--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/',
+ '--webrtc_quick_perf_test',
'--nologs',
],
},
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json
index 6035a6c..61f4221 100644
--- a/infra/specs/tryserver.webrtc.json
+++ b/infra/specs/tryserver.webrtc.json
@@ -431,7 +431,7 @@
},
{
"args": [
- "--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/",
+ "--webrtc_quick_perf_test",
"--nologs"
],
"merge": {
@@ -908,7 +908,7 @@
},
{
"args": [
- "--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/",
+ "--webrtc_quick_perf_test",
"--nologs"
],
"merge": {
@@ -1385,7 +1385,7 @@
},
{
"args": [
- "--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/",
+ "--webrtc_quick_perf_test",
"--nologs"
],
"merge": {
@@ -1887,7 +1887,7 @@
},
{
"args": [
- "--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/",
+ "--webrtc_quick_perf_test",
"--nologs"
],
"merge": {
@@ -5962,7 +5962,7 @@
},
{
"args": [
- "--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/",
+ "--webrtc_quick_perf_test",
"--nologs",
"--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
],
@@ -6041,7 +6041,7 @@
},
{
"args": [
- "--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/",
+ "--webrtc_quick_perf_test",
"--nologs",
"--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
],
@@ -7437,7 +7437,7 @@
},
{
"args": [
- "--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/",
+ "--webrtc_quick_perf_test",
"--nologs",
"--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
],
@@ -7512,7 +7512,7 @@
},
{
"args": [
- "--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/",
+ "--webrtc_quick_perf_test",
"--nologs",
"--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
],
@@ -10572,7 +10572,7 @@
},
{
"args": [
- "--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/",
+ "--webrtc_quick_perf_test",
"--nologs",
"--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
],
@@ -10647,7 +10647,7 @@
},
{
"args": [
- "--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/",
+ "--webrtc_quick_perf_test",
"--nologs",
"--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
],
@@ -12638,7 +12638,7 @@
},
{
"args": [
- "--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/",
+ "--webrtc_quick_perf_test",
"--nologs",
"--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
],
@@ -12713,7 +12713,7 @@
},
{
"args": [
- "--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/",
+ "--webrtc_quick_perf_test",
"--nologs",
"--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
],
diff --git a/test/test_main_lib.cc b/test/test_main_lib.cc
index 331a2d3..4c80315 100644
--- a/test/test_main_lib.cc
+++ b/test/test_main_lib.cc
@@ -150,11 +150,6 @@
// outlive the application.
field_trials_ = absl::GetFlag(FLAGS_force_fieldtrials);
webrtc::field_trial::InitFieldTrialsFromString(field_trials_.c_str());
- // TODO(bugs.webrtc.org/7101): Remove when all invocation would use
- // webrtc_quick_perf_test flag directly instead of setting the field trial.
- if (webrtc::field_trial::IsEnabled("WebRTC-QuickPerfTest")) {
- absl::SetFlag(&FLAGS_webrtc_quick_perf_test, true);
- }
webrtc::metrics::Enable();
#if defined(WEBRTC_WIN)
