From 714dd4e532752fcf46efea3370dcefbb4b9575d6 Mon Sep 17 00:00:00 2001 From: sakal Date: Mon, 15 Aug 2016 02:29:11 -0700 Subject: [PATCH] GN: Update tests to have the correct shard timeout value on Android. TBR=mflodman@webrtc.org NOTRY=True Review-Url: https://codereview.webrtc.org/2231413002 Cr-Commit-Position: refs/heads/master@{#13741} --- webrtc/BUILD.gn | 6 ++++++ webrtc/api/BUILD.gn | 2 ++ webrtc/common_audio/BUILD.gn | 2 ++ webrtc/common_video/BUILD.gn | 2 ++ webrtc/modules/BUILD.gn | 3 +++ webrtc/modules/audio_coding/BUILD.gn | 2 ++ webrtc/system_wrappers/BUILD.gn | 2 ++ webrtc/test/BUILD.gn | 2 ++ webrtc/tools/BUILD.gn | 2 ++ webrtc/voice_engine/BUILD.gn | 1 + 10 files changed, 24 insertions(+) diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index 94ce0120b6..b30f479307 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -578,6 +578,7 @@ if (rtc_include_tests) { if (is_android) { deps += [ "//testing/android/native_test:native_test_support" ] + shard_timeout = 900 } if (is_ios || (is_mac && mac_deployment_target == "10.7")) { @@ -665,6 +666,9 @@ if (rtc_include_tests) { # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. configs -= [ "//build/config/clang:find_bad_constructs" ] } + if (is_android) { + shard_timeout = 900 + } } source_set("video_quality_test") { @@ -725,6 +729,7 @@ if (rtc_include_tests) { ] if (is_android) { deps += [ "//testing/android/native_test:native_test_native_code" ] + shard_timeout = 2700 } if (is_clang) { # Suppress warnings from the Chromium Clang plugin. @@ -758,6 +763,7 @@ if (rtc_include_tests) { } if (is_android) { deps += [ "//testing/android/native_test:native_test_support" ] + shard_timeout = 900 } if (is_mac) { diff --git a/webrtc/api/BUILD.gn b/webrtc/api/BUILD.gn index c4dc5f53d6..1a4619198f 100644 --- a/webrtc/api/BUILD.gn +++ b/webrtc/api/BUILD.gn @@ -400,6 +400,8 @@ if (rtc_include_tests) { if (is_android) { deps += [ "//testing/android/native_test:native_test_support" ] + + shard_timeout = 900 } } diff --git a/webrtc/common_audio/BUILD.gn b/webrtc/common_audio/BUILD.gn index f64ece3be3..a73d63d1ea 100644 --- a/webrtc/common_audio/BUILD.gn +++ b/webrtc/common_audio/BUILD.gn @@ -310,6 +310,8 @@ if (rtc_include_tests) { if (is_android) { deps += [ "//testing/android/native_test:native_test_support" ] + + shard_timeout = 900 } } } diff --git a/webrtc/common_video/BUILD.gn b/webrtc/common_video/BUILD.gn index c4edeaf0b1..14cbc7d3ff 100644 --- a/webrtc/common_video/BUILD.gn +++ b/webrtc/common_video/BUILD.gn @@ -124,6 +124,8 @@ if (rtc_include_tests) { data = [ "//resources/foreman_cif.yuv", ] + + shard_timeout = 900 } } } diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn index e846f83e44..676160ae65 100644 --- a/webrtc/modules/BUILD.gn +++ b/webrtc/modules/BUILD.gn @@ -84,6 +84,7 @@ if (rtc_include_tests) { if (is_android) { deps += [ "//testing/android/native_test:native_test_native_code" ] + shard_timeout = 900 } if (is_android || is_ios) { data = [ @@ -602,6 +603,8 @@ if (rtc_include_tests) { "//resources/verizon4g-downlink.rx", "//resources/verizon4g-uplink.rx", ] + + shard_timeout = 900 } if (is_ios) { diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn index 757b920f0d..ed200cb7c4 100644 --- a/webrtc/modules/audio_coding/BUILD.gn +++ b/webrtc/modules/audio_coding/BUILD.gn @@ -1029,6 +1029,7 @@ if (rtc_include_tests) { if (is_android) { deps += [ "//testing/android/native_test:native_test_native_code" ] + shard_timeout = 900 } if (is_ios) { @@ -1117,6 +1118,7 @@ if (rtc_include_tests) { if (is_android) { deps += [ "//testing/android/native_test:native_test_native_code" ] + shard_timeout = 900 } deps += [ diff --git a/webrtc/system_wrappers/BUILD.gn b/webrtc/system_wrappers/BUILD.gn index 9464c6b6e1..6e1b0ae407 100644 --- a/webrtc/system_wrappers/BUILD.gn +++ b/webrtc/system_wrappers/BUILD.gn @@ -240,6 +240,8 @@ if (rtc_include_tests) { if (is_android) { deps += [ "//testing/android/native_test:native_test_support" ] + + shard_timeout = 900 } } } diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn index 1b0b928924..a638fb6aea 100644 --- a/webrtc/test/BUILD.gn +++ b/webrtc/test/BUILD.gn @@ -325,6 +325,8 @@ test("test_support_unittests") { "//resources/video_coding/ssrcs-2.pcap", "//resources/video_coding/ssrcs-3.pcap", ] + + shard_timeout = 900 } deps += [ ":channel_transport", diff --git a/webrtc/tools/BUILD.gn b/webrtc/tools/BUILD.gn index 585ed9674d..5cd2754080 100644 --- a/webrtc/tools/BUILD.gn +++ b/webrtc/tools/BUILD.gn @@ -316,6 +316,8 @@ if (rtc_include_tests) { data = [ "//resources/foreman_cif.yuv", ] + + shard_timeout = 900 } } diff --git a/webrtc/voice_engine/BUILD.gn b/webrtc/voice_engine/BUILD.gn index 808d980c6f..e330bab4cc 100644 --- a/webrtc/voice_engine/BUILD.gn +++ b/webrtc/voice_engine/BUILD.gn @@ -143,6 +143,7 @@ if (rtc_include_tests) { if (is_android) { deps += [ "//testing/android/native_test:native_test_native_code" ] + shard_timeout = 900 } sources = [