Revert "Split perf-test-specific resources in low_bandwidth_audio_test"
This reverts commit 4bbc150b18e961811991e3e524378e703b6d5b31.
Reason for revert: Breaks on perf Mac bot
https://build.chromium.org/p/client.webrtc.perf/builders/Mac%2010.11/builds/5696
Original change's description:
> Split perf-test-specific resources in low_bandwidth_audio_test
>
> Bug: chromium:755660
> Change-Id: I7c60a47b26ad86892218497f28a09a04574077e6
> Reviewed-on: https://webrtc-review.googlesource.com/61961
> Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
> Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#22439}
TBR=phoglund@webrtc.org,oprypin@webrtc.org
Change-Id: I235301020417416745c1e754b4dd57726dfb27ea
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:755660
Reviewed-on: https://webrtc-review.googlesource.com/61980
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22442}
diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index 86ea308..39a1db3 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -188,23 +188,7 @@
}
data = [
- "../resources/voice_engine/audio_tiny16.wav",
- ]
-
- if (!build_with_chromium && is_clang) {
- # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163)
- suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
- }
- }
-
- group("low_bandwidth_audio_perf_test") {
- testonly = true
-
- deps = [
- ":low_bandwidth_audio_test",
- ]
-
- data = [
+ "../resources/voice_engine/audio_dtx16.wav",
"../resources/voice_engine/audio_tiny16.wav",
"../resources/voice_engine/audio_tiny48.wav",
"test/low_bandwidth_audio_test.py",
@@ -226,6 +210,11 @@
if (is_mac) {
data += [ "../tools_webrtc/audio_quality/mac/pesq" ]
}
+
+ if (!build_with_chromium && is_clang) {
+ # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163)
+ suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+ }
}
}
diff --git a/tools_webrtc/mb/gn_isolate_map.pyl b/tools_webrtc/mb/gn_isolate_map.pyl
index 8c7a887..3dbb4a8 100644
--- a/tools_webrtc/mb/gn_isolate_map.pyl
+++ b/tools_webrtc/mb/gn_isolate_map.pyl
@@ -67,7 +67,7 @@
],
},
"low_bandwidth_audio_perf_test": {
- "label": "//audio:low_bandwidth_audio_perf_test",
+ "label": "//audio:low_bandwidth_audio_test",
"type": "script",
"script": "//audio/test/low_bandwidth_audio_test.py",
"args": [