Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 687 | 687 |
| 688 test("webrtc_nonparallel_tests") { | 688 test("webrtc_nonparallel_tests") { |
| 689 testonly = true | 689 testonly = true |
| 690 configs += [ | 690 configs += [ |
| 691 ":common_config", | 691 ":common_config", |
| 692 ":rtc_unittests_config", | 692 ":rtc_unittests_config", |
| 693 ] | 693 ] |
| 694 public_configs = [ ":common_inherited_config" ] | 694 public_configs = [ ":common_inherited_config" ] |
| 695 sources = [ | 695 sources = [ |
| 696 "base/nullsocketserver_unittest.cc", | 696 "base/nullsocketserver_unittest.cc", |
| 697 "base/physicalsocketserver_unittest.cc", | |
| 698 "base/socket_unittest.cc", | |
| 699 "base/socket_unittest.h", | |
| 700 "base/socketaddress_unittest.cc", | 697 "base/socketaddress_unittest.cc", |
| 701 "base/virtualsocket_unittest.cc", | 698 "base/virtualsocket_unittest.cc", |
| 702 ] | 699 ] |
| 703 deps = [ | 700 deps = [ |
| 704 "base:rtc_base", | 701 "base:rtc_base", |
| 705 "base:rtc_base_tests_utils", | 702 "base:rtc_base_tests_utils", |
| 706 "//testing/gtest", | 703 "//testing/gtest", |
| 707 ] | 704 ] |
| 708 if (is_win) { | 705 if (is_win) { |
| 709 sources += [ "base/win32socketserver_unittest.cc" ] | |
| 710 | |
| 711 # TODO(ronghuawu): Fix TestUdpReadyToSendIPv6 on windows bot then reenable | 706 # TODO(ronghuawu): Fix TestUdpReadyToSendIPv6 on windows bot then reenable |
| 712 # these tests. | 707 # these tests. |
| 708 # sources += [ "base/win32socketserver_unittest.cc" ] | |
|
kjellander_webrtc
2016/08/01 19:37:31
This is odd, it was really added+removed before...
| |
| 709 } | |
| 710 if (!is_win) { | |
|
kjellander_webrtc
2016/08/01 19:37:31
Replace line 709-710 with:
} else {
danilchap
2016/08/02 07:49:37
Done.
| |
| 713 # TODO(pbos): Move test disabling to ifdefs within the test files instead | 711 # TODO(pbos): Move test disabling to ifdefs within the test files instead |
| 714 # of here. | 712 # of here. |
| 715 sources -= [ | 713 sources += [ |
| 716 "base/physicalsocketserver_unittest.cc", | 714 "base/physicalsocketserver_unittest.cc", |
| 717 "base/socket_unittest.cc", | 715 "base/socket_unittest.cc", |
| 718 "base/win32socketserver_unittest.cc", | 716 "base/socket_unittest.h", |
| 719 ] | 717 ] |
| 720 } | 718 } |
| 721 if (is_android) { | 719 if (is_android) { |
| 722 deps += [ "//testing/android/native_test:native_test_support" ] | 720 deps += [ "//testing/android/native_test:native_test_support" ] |
| 723 } | 721 } |
| 724 | 722 |
| 725 if (is_mac) { | 723 if (is_mac) { |
| 726 sources += [ "base/macsocketserver_unittest.cc" ] | 724 sources += [ "base/macsocketserver_unittest.cc" ] |
| 727 } | 725 } |
| 728 if (is_ios || (is_mac && target_cpu != "x86")) { | 726 if (is_ios || (is_mac && target_cpu != "x86")) { |
| 729 defines = [ "CARBON_DEPRECATED=YES" ] | 727 defines = [ "CARBON_DEPRECATED=YES" ] |
| 730 } | 728 } |
| 731 if (is_clang) { | 729 if (is_clang) { |
| 732 # Suppress warnings from the Chromium Clang plugin. | 730 # Suppress warnings from the Chromium Clang plugin. |
| 733 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 731 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 734 configs -= [ "//build/config/clang:find_bad_constructs" ] | 732 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 735 } | 733 } |
| 736 } | 734 } |
| 737 } | 735 } |
| OLD | NEW |