From 35d2b7e9de9ddb40cac35a21d50977dc5ca231d8 Mon Sep 17 00:00:00 2001 From: Edward Lemur Date: Wed, 27 Dec 2017 18:54:47 +0100 Subject: [PATCH] Fix reporting of perf results on video full stack tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For DualStreamsTest, the name of the metric reported ("dualstreams_moderately_restricted_screenshare") was repeated 4 times: - Conference_Restricted/0 - Conference_Restricted/1 - ModeratelyRestricted_SlidesVp8_3TL_Simulcast_Video_Simulcast_High/0 - ModeratelyRestricted_SlidesVp8_3TL_Simulcast_Video_Simulcast_High/1 So only one of those tests (whichever ran last) has its metrics reported to the perf dashboard, while the others have their metrics ignored. I added the "/0" or "/1" as part of the metric name, to differentiate between them. Bug: webrtc:8566 Change-Id: I088807b66f9b7957571dccdb8fe3df0d87486bb0 Reviewed-on: https://webrtc-review.googlesource.com/36400 Reviewed-by: Patrik Höglund Reviewed-by: Erik Språng Commit-Queue: Edward Lemur Cr-Commit-Position: refs/heads/master@{#21481} --- video/full_stack_tests.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/video/full_stack_tests.cc b/video/full_stack_tests.cc index 9e478e79a8..1e1bd23404 100644 --- a/video/full_stack_tests.cc +++ b/video/full_stack_tests.cc @@ -944,8 +944,9 @@ TEST_P(DualStreamsTest, // Call settings. dual_streams.call.send_side_bwe = true; dual_streams.call.dual_video = true; - dual_streams.analyzer = {"dualstreams_moderately_restricted_screenshare", 0.0, - 0.0, kFullStackTestDurationSecs}; + std::string test_label = "dualstreams_moderately_restricted_screenshare_" + + std::to_string(first_stream); + dual_streams.analyzer = {test_label, 0.0, 0.0, kFullStackTestDurationSecs}; dual_streams.pipe.loss_percent = 1; dual_streams.pipe.link_capacity_kbps = 7500; dual_streams.pipe.queue_length_packets = 30; @@ -975,8 +976,9 @@ TEST_P(DualStreamsTest, Conference_Restricted) { // Call settings. dual_streams.call.send_side_bwe = true; dual_streams.call.dual_video = true; - dual_streams.analyzer = {"dualstreams_moderately_restricted_screenshare", 0.0, - 0.0, kFullStackTestDurationSecs}; + std::string test_label = "dualstreams_conference_restricted_screenshare_" + + std::to_string(first_stream); + dual_streams.analyzer = {test_label, 0.0, 0.0, kFullStackTestDurationSecs}; dual_streams.pipe.loss_percent = 1; dual_streams.pipe.link_capacity_kbps = 5000; dual_streams.pipe.queue_length_packets = 30;