[packages][tests] Reorganize media test list
//garnet/packages/tests:media group now transitively includes all enabled media tests.
Subareas (player, audio, codecs) now include all tests in their :test group.
Change-Id: I96ca1d3d41a9a561f29ff0c817a118be955a27f5
diff --git a/garnet/bin/media/codecs/BUILD.gn b/garnet/bin/media/codecs/BUILD.gn
index 0af26f3..3e45682 100644
--- a/garnet/bin/media/codecs/BUILD.gn
+++ b/garnet/bin/media/codecs/BUILD.gn
@@ -54,3 +54,11 @@
"//zircon/public/lib/zx",
]
}
+
+group("tests") {
+ testonly = true
+ deps = [
+ "test",
+ "//garnet/examples/media:use_h264_decoder_test",
+ ]
+}
diff --git a/garnet/packages/tests/BUILD.gn b/garnet/packages/tests/BUILD.gn
index c84f5f0..3d863e7 100644
--- a/garnet/packages/tests/BUILD.gn
+++ b/garnet/packages/tests/BUILD.gn
@@ -378,8 +378,6 @@
":magma",
":mdns",
":media",
- ":mediaplayer",
- ":mediasession",
":memory_monitor",
":netcfg_tests",
":netemul",
@@ -771,14 +769,6 @@
]
}
-group("mediaplayer") {
- testonly = true
- public_deps = [
- "//src/media/playback/mediaplayer:mediaplayer_test_util",
- "//src/media/playback/mediaplayer:mediaplayer_tests",
- ]
-}
-
group("log_listener") {
testonly = true
public_deps = [
@@ -791,14 +781,11 @@
testonly = true
public_deps = [
":virtual_audio",
- "//garnet/bin/media/codecs/test",
- "//garnet/examples/media:use_h264_decoder_test",
- "//garnet/packages/prod:media_audio",
- "//garnet/packages/testing:run_test_component",
+ "//garnet/bin/media/codecs:tests",
"//garnet/public/lib/media/timeline:media_lib_timeline_tests",
- "//sdk/lib/media/audio_dfx/cpp:audio_dfx_tests",
- "//src/media/audio/audio_core/mixer:audio_mixer_tests",
- "//src/media/audio/audio_core/test:audio_fidl_tests",
+ "//src/media/audio:tests",
+ "//src/media/playback/mediaplayer:tests",
+ "//src/media/sessions:tests",
]
}
@@ -1202,13 +1189,6 @@
]
}
-group("mediasession") {
- testonly = true
- public_deps = [
- "//src/media/sessions:tests",
- ]
-}
-
group("virtual_audio") {
testonly = true
public_deps = [
diff --git a/src/media/audio/BUILD.gn b/src/media/audio/BUILD.gn
index 53fb35e..8d80bdb 100644
--- a/src/media/audio/BUILD.gn
+++ b/src/media/audio/BUILD.gn
@@ -21,5 +21,6 @@
data_deps = [
"audio_core:tests",
+ "//sdk/lib/media/audio_dfx/cpp:audio_dfx_tests",
]
}
diff --git a/src/media/playback/mediaplayer/BUILD.gn b/src/media/playback/mediaplayer/BUILD.gn
index a0f635f..4263e4c 100644
--- a/src/media/playback/mediaplayer/BUILD.gn
+++ b/src/media/playback/mediaplayer/BUILD.gn
@@ -6,6 +6,14 @@
import("//build/test/test_package.gni")
import("//build/testing/environments.gni")
+group("tests") {
+ testonly = true
+ deps = [
+ ":mediaplayer_test_util",
+ ":mediaplayer_tests",
+ ]
+}
+
package("mediaplayer") {
deps = [
":mediaplayer_bin",
@@ -106,7 +114,7 @@
]
}
-executable("tests") {
+executable("mediaplayer_tests_bin") {
output_name = "mediaplayer_tests"
testonly = true
@@ -155,7 +163,7 @@
test_package("mediaplayer_tests") {
deps = [
- ":tests",
+ ":mediaplayer_tests_bin",
"//src/media/playback/mediaplayer/core:tests",
"//src/media/playback/mediaplayer/demux:tests",
"//src/media/playback/mediaplayer/util:tests",
