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

Side by Side Diff: webrtc/BUILD.gn

Issue 2231413002: GN: Update tests to have the correct shard timeout value on Android. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixes according to comments. Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/api/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330.
10 10
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 "base:rtc_base_tests_utils", 571 "base:rtc_base_tests_utils",
572 "base:rtc_task_queue", 572 "base:rtc_task_queue",
573 "p2p:libstunprober", 573 "p2p:libstunprober",
574 "p2p:rtc_p2p", 574 "p2p:rtc_p2p",
575 "//testing/gmock", 575 "//testing/gmock",
576 "//testing/gtest", 576 "//testing/gtest",
577 ] 577 ]
578 578
579 if (is_android) { 579 if (is_android) {
580 deps += [ "//testing/android/native_test:native_test_support" ] 580 deps += [ "//testing/android/native_test:native_test_support" ]
581 shard_timeout = 900
581 } 582 }
582 583
583 if (is_ios || (is_mac && mac_deployment_target == "10.7")) { 584 if (is_ios || (is_mac && mac_deployment_target == "10.7")) {
584 deps += [ 585 deps += [
585 "sdk:rtc_sdk_peerconnection_objc", 586 "sdk:rtc_sdk_peerconnection_objc",
586 "system_wrappers:system_wrappers_default", 587 "system_wrappers:system_wrappers_default",
587 ] 588 ]
588 sources += [ 589 sources += [
589 "sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm", 590 "sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm",
590 "sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm", 591 "sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm",
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
658 "modules/video_capture", 659 "modules/video_capture",
659 "test:test_common", 660 "test:test_common",
660 "test:test_main", 661 "test:test_main",
661 "video:video_tests", 662 "video:video_tests",
662 ] 663 ]
663 if (is_clang) { 664 if (is_clang) {
664 # Suppress warnings from the Chromium Clang plugin. 665 # Suppress warnings from the Chromium Clang plugin.
665 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. 666 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
666 configs -= [ "//build/config/clang:find_bad_constructs" ] 667 configs -= [ "//build/config/clang:find_bad_constructs" ]
667 } 668 }
669 if (is_android) {
670 shard_timeout = 900
671 }
668 } 672 }
669 673
670 source_set("video_quality_test") { 674 source_set("video_quality_test") {
671 testonly = true 675 testonly = true
672 configs += [ ":common_config" ] 676 configs += [ ":common_config" ]
673 public_configs = [ ":common_inherited_config" ] 677 public_configs = [ ":common_inherited_config" ]
674 sources = [ 678 sources = [
675 "video/video_quality_test.cc", 679 "video/video_quality_test.cc",
676 "video/video_quality_test.h", 680 "video/video_quality_test.h",
677 ] 681 ]
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 "test:channel_transport", 722 "test:channel_transport",
719 "test:test_common", 723 "test:test_common",
720 "test:test_main", 724 "test:test_main",
721 "test:test_renderer", 725 "test:test_renderer",
722 "voice_engine", 726 "voice_engine",
723 "//testing/gmock", 727 "//testing/gmock",
724 "//testing/gtest", 728 "//testing/gtest",
725 ] 729 ]
726 if (is_android) { 730 if (is_android) {
727 deps += [ "//testing/android/native_test:native_test_native_code" ] 731 deps += [ "//testing/android/native_test:native_test_native_code" ]
732 shard_timeout = 2700
728 } 733 }
729 if (is_clang) { 734 if (is_clang) {
730 # Suppress warnings from the Chromium Clang plugin. 735 # Suppress warnings from the Chromium Clang plugin.
731 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. 736 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
732 configs -= [ "//build/config/clang:find_bad_constructs" ] 737 configs -= [ "//build/config/clang:find_bad_constructs" ]
733 } 738 }
734 } 739 }
735 740
736 test("webrtc_nonparallel_tests") { 741 test("webrtc_nonparallel_tests") {
737 testonly = true 742 testonly = true
(...skipping 13 matching lines...) Expand all
751 deps = [ 756 deps = [
752 "base:rtc_base", 757 "base:rtc_base",
753 "base:rtc_base_tests_utils", 758 "base:rtc_base_tests_utils",
754 "//testing/gtest", 759 "//testing/gtest",
755 ] 760 ]
756 if (is_win) { 761 if (is_win) {
757 sources += [ "base/win32socketserver_unittest.cc" ] 762 sources += [ "base/win32socketserver_unittest.cc" ]
758 } 763 }
759 if (is_android) { 764 if (is_android) {
760 deps += [ "//testing/android/native_test:native_test_support" ] 765 deps += [ "//testing/android/native_test:native_test_support" ]
766 shard_timeout = 900
761 } 767 }
762 768
763 if (is_mac) { 769 if (is_mac) {
764 sources += [ "base/macsocketserver_unittest.cc" ] 770 sources += [ "base/macsocketserver_unittest.cc" ]
765 } 771 }
766 if (is_ios || (is_mac && target_cpu != "x86")) { 772 if (is_ios || (is_mac && target_cpu != "x86")) {
767 defines = [ "CARBON_DEPRECATED=YES" ] 773 defines = [ "CARBON_DEPRECATED=YES" ]
768 } 774 }
769 if (is_clang) { 775 if (is_clang) {
770 # Suppress warnings from the Chromium Clang plugin. 776 # Suppress warnings from the Chromium Clang plugin.
771 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. 777 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
772 configs -= [ "//build/config/clang:find_bad_constructs" ] 778 configs -= [ "//build/config/clang:find_bad_constructs" ]
773 } 779 }
774 } 780 }
775 } 781 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/api/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698