Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/test/BUILD.gn

Issue 2845063002: Hiding problematic targets from chromium (Closed)
Patch Set: moving test_support_unittests_bundle_data in a better position Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/test/BUILD.gn
diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn
index 9f40c0959ca3d25f07a95655bbb66f79ddf4ec9e..c696979dd11105b7c4aed5bc81b74c28fca2978f 100644
--- a/webrtc/test/BUILD.gn
+++ b/webrtc/test/BUILD.gn
@@ -96,129 +96,211 @@ rtc_source_set("field_trial") {
]
}
-rtc_source_set("test_main") {
- testonly = true
- sources = [
- "test_main.cc",
- ]
+test_support_unittests_resources = [
+ "//resources/foreman_cif_short.yuv",
+ "//resources/video_coding/frame-ethernet-ii.pcap",
+ "//resources/video_coding/frame-loopback.pcap",
+ "//resources/video_coding/pltype103.rtp",
+ "//resources/video_coding/pltype103_header_only.rtp",
+ "//resources/video_coding/ssrcs-2.pcap",
+ "//resources/video_coding/ssrcs-3.pcap",
+]
- public_deps = [
- ":test_support",
- ]
- deps = [
- ":field_trial",
- "../system_wrappers:metrics_default",
- "//testing/gmock",
- "//testing/gtest",
- "//third_party/gflags",
- ]
+if (is_ios) {
+ bundle_data("test_support_unittests_bundle_data") {
+ testonly = true
+ sources = test_support_unittests_resources
+ outputs = [
+ "{{bundle_resources_dir}}/{{source_file_part}}",
+ ]
+ }
}
-rtc_source_set("fileutils") {
- testonly = true
- sources = [
- "testsupport/fileutils.cc",
- "testsupport/fileutils.h",
- ]
- if (is_ios) {
- sources += [ "testsupport/iosfileutils.mm" ]
+if (!build_with_chromium) {
+ # This target depends on //third_party/gflags and since chromium does not
+ # have gflags it causes an error when Gn parses this BUILD.gn file.
+ # It seems that Gn eagerly tries to understand if all the targets are
+ # buildable (even deps). Obviously gflags is not buildable in chromium
+ # so if a target depends on this BUILD.gn file we hit this error.
+ rtc_source_set("test_main") {
+ testonly = true
+ sources = [
+ "test_main.cc",
+ ]
+
+ public_deps = [
+ ":test_support",
+ ]
+ deps = [
+ ":field_trial",
+ "../system_wrappers:metrics_default",
+ "//testing/gmock",
+ "//testing/gtest",
+ "//third_party/gflags",
+ ]
}
- visibility = [ ":*" ]
-}
-rtc_source_set("video_test_support") {
- testonly = true
+ rtc_source_set("video_test_support") {
+ testonly = true
- sources = [
- "testsupport/frame_reader.h",
- "testsupport/frame_writer.h",
- "testsupport/metrics/video_metrics.cc",
- "testsupport/metrics/video_metrics.h",
- "testsupport/mock/mock_frame_reader.h",
- "testsupport/mock/mock_frame_writer.h",
- "testsupport/y4m_frame_writer.cc",
- "testsupport/yuv_frame_reader.cc",
- "testsupport/yuv_frame_writer.cc",
- ]
+ sources = [
+ "testsupport/frame_reader.h",
+ "testsupport/frame_writer.h",
+ "testsupport/metrics/video_metrics.cc",
+ "testsupport/metrics/video_metrics.h",
+ "testsupport/mock/mock_frame_reader.h",
+ "testsupport/mock/mock_frame_writer.h",
+ "testsupport/y4m_frame_writer.cc",
+ "testsupport/yuv_frame_reader.cc",
+ "testsupport/yuv_frame_writer.cc",
+ ]
- deps = [
- "../base:rtc_base_approved",
- "../common_video",
- "../system_wrappers",
- "//testing/gmock",
- "//testing/gtest",
- "//third_party/gflags",
- ]
+ deps = [
+ "../base:rtc_base_approved",
+ "../common_video",
+ "../system_wrappers",
+ "//testing/gmock",
+ "//testing/gtest",
+ "//third_party/gflags",
+ ]
- public_deps = [
- ":fileutils",
- ]
+ public_deps = [
+ ":fileutils",
+ ]
- 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" ]
- }
+ 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" ]
+ }
- if (is_android) {
- deps += [ "//base:base" ]
- }
+ if (is_android) {
+ deps += [ "//base:base" ]
+ }
- if (is_ios) {
- deps += [ "//webrtc/sdk:rtc_sdk_common_objc" ]
- }
+ if (is_ios) {
+ deps += [ "//webrtc/sdk:rtc_sdk_common_objc" ]
+ }
- if (rtc_use_memcheck) {
- data = valgrind_webrtc_dependencies
+ if (rtc_use_memcheck) {
+ data = valgrind_webrtc_dependencies
+ }
}
-}
-rtc_source_set("test_support") {
- testonly = true
+ rtc_source_set("test_support") {
+ testonly = true
- sources = [
- "gmock.h",
- "gtest.h",
- "testsupport/isolated_output.cc",
- "testsupport/isolated_output.h",
- "testsupport/packet_reader.cc",
- "testsupport/packet_reader.h",
- "testsupport/perf_test.cc",
- "testsupport/perf_test.h",
- "testsupport/trace_to_stderr.cc",
- "testsupport/trace_to_stderr.h",
- "testsupport/unittest_utils.h",
- ]
+ sources = [
+ "gmock.h",
+ "gtest.h",
+ "testsupport/isolated_output.cc",
+ "testsupport/isolated_output.h",
+ "testsupport/packet_reader.cc",
+ "testsupport/packet_reader.h",
+ "testsupport/perf_test.cc",
+ "testsupport/perf_test.h",
+ "testsupport/trace_to_stderr.cc",
+ "testsupport/trace_to_stderr.h",
+ "testsupport/unittest_utils.h",
+ ]
- deps = [
- "../base:gtest_prod",
- "../base:rtc_base_approved",
- "../common_video",
- "../system_wrappers",
- "//testing/gmock",
- "//testing/gtest",
- "//third_party/gflags",
- ]
+ deps = [
+ "../base:gtest_prod",
+ "../base:rtc_base_approved",
+ "../common_video",
+ "../system_wrappers",
+ "//testing/gmock",
+ "//testing/gtest",
+ "//third_party/gflags",
+ ]
- public_deps = [
- ":fileutils",
- ]
+ public_deps = [
+ ":fileutils",
+ ]
- 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" ]
- }
+ 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" ]
+ }
- if (is_android) {
- deps += [ "//base:base" ]
+ if (is_android) {
+ deps += [ "//base:base" ]
+ }
+
+ if (is_ios) {
+ deps += [ "//webrtc/sdk:rtc_sdk_common_objc" ]
+ }
+
+ if (rtc_use_memcheck) {
+ data = valgrind_webrtc_dependencies
+ }
}
- if (is_ios) {
- deps += [ "//webrtc/sdk:rtc_sdk_common_objc" ]
+ rtc_test("test_support_unittests") {
+ deps = []
+ sources = [
+ "fake_audio_device_unittest.cc",
+ "fake_network_pipe_unittest.cc",
+ "frame_generator_unittest.cc",
+ "rtp_file_reader_unittest.cc",
+ "rtp_file_writer_unittest.cc",
+ "testsupport/always_passing_unittest.cc",
+ "testsupport/isolated_output_unittest.cc",
+ "testsupport/metrics/video_metrics_unittest.cc",
+ "testsupport/packet_reader_unittest.cc",
+ "testsupport/perf_test_unittest.cc",
+ "testsupport/y4m_frame_writer_unittest.cc",
+ "testsupport/yuv_frame_reader_unittest.cc",
+ "testsupport/yuv_frame_writer_unittest.cc",
+ ]
+
+ # TODO(jschuh): Bug 1348: fix this warning.
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
+
+ if (is_win) {
+ # virtual override w/different const/volatile signature.
+ cflags = [ "/wd4373" ]
+ }
+
+ 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" ]
+ }
+
+ data = test_support_unittests_resources
+ if (is_android) {
+ deps += [ "//testing/android/native_test:native_test_support" ]
+ shard_timeout = 900
+ }
+
+ if (is_ios) {
+ deps += [ ":test_support_unittests_bundle_data" ]
+ }
+
+ deps += [
+ ":direct_transport",
+ ":fileutils_unittests",
+ ":test_common",
+ ":test_main",
+ ":video_test_common",
+ ":video_test_support",
+ "../modules/video_capture",
+ "//testing/gmock",
+ "//testing/gtest",
+ "//third_party/gflags",
+ ]
}
+}
- if (rtc_use_memcheck) {
- data = valgrind_webrtc_dependencies
+rtc_source_set("fileutils") {
+ testonly = true
+ sources = [
+ "testsupport/fileutils.cc",
+ "testsupport/fileutils.h",
+ ]
+ if (is_ios) {
+ sources += [ "testsupport/iosfileutils.mm" ]
}
+ visibility = [ ":*" ]
}
rtc_source_set("run_test") {
@@ -233,79 +315,6 @@ rtc_source_set("run_test") {
}
}
-test_support_unittests_resources = [
- "//resources/foreman_cif_short.yuv",
- "//resources/video_coding/frame-ethernet-ii.pcap",
- "//resources/video_coding/frame-loopback.pcap",
- "//resources/video_coding/pltype103.rtp",
- "//resources/video_coding/pltype103_header_only.rtp",
- "//resources/video_coding/ssrcs-2.pcap",
- "//resources/video_coding/ssrcs-3.pcap",
-]
-
-if (is_ios) {
- bundle_data("test_support_unittests_bundle_data") {
- testonly = true
- sources = test_support_unittests_resources
- outputs = [
- "{{bundle_resources_dir}}/{{source_file_part}}",
- ]
- }
-}
-
-rtc_test("test_support_unittests") {
- deps = []
- sources = [
- "fake_audio_device_unittest.cc",
- "fake_network_pipe_unittest.cc",
- "frame_generator_unittest.cc",
- "rtp_file_reader_unittest.cc",
- "rtp_file_writer_unittest.cc",
- "testsupport/always_passing_unittest.cc",
- "testsupport/isolated_output_unittest.cc",
- "testsupport/metrics/video_metrics_unittest.cc",
- "testsupport/packet_reader_unittest.cc",
- "testsupport/perf_test_unittest.cc",
- "testsupport/y4m_frame_writer_unittest.cc",
- "testsupport/yuv_frame_reader_unittest.cc",
- "testsupport/yuv_frame_writer_unittest.cc",
- ]
-
- # TODO(jschuh): Bug 1348: fix this warning.
- configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
-
- if (is_win) {
- cflags = [ "/wd4373" ] # virtual override w/different const/volatile signature.
- }
-
- 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" ]
- }
-
- data = test_support_unittests_resources
- if (is_android) {
- deps += [ "//testing/android/native_test:native_test_support" ]
- shard_timeout = 900
- }
-
- if (is_ios) {
- deps += [ ":test_support_unittests_bundle_data" ]
- }
-
- deps += [
- ":direct_transport",
- ":fileutils_unittests",
- ":test_common",
- ":test_main",
- ":video_test_common",
- ":video_test_support",
- "../modules/video_capture",
- "//testing/gmock",
- "//testing/gtest",
- "//third_party/gflags",
- ]
-}
rtc_source_set("fileutils_unittests") {
testonly = true
visibility = [ ":*" ] # Only targets in this file can depend on this.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698