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 594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 605 "test:test_common", | 605 "test:test_common", |
| 606 "test:test_main", | 606 "test:test_main", |
| 607 "video:video_tests", | 607 "video:video_tests", |
| 608 ] | 608 ] |
| 609 if (is_clang) { | 609 if (is_clang) { |
| 610 # Suppress warnings from the Chromium Clang plugin. | 610 # Suppress warnings from the Chromium Clang plugin. |
| 611 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 611 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 612 configs -= [ "//build/config/clang:find_bad_constructs" ] | 612 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 613 } | 613 } |
| 614 } | 614 } |
| 615 | |
| 616 test("webrtc_nonparallel_tests") { | |
| 617 testonly = true | |
| 618 configs += [ | |
| 619 ":common_config", | |
| 620 ":rtc_unittests_config", | |
| 621 ] | |
| 622 public_configs = [ ":common_inherited_config" ] | |
| 623 sources = [ | |
| 624 "base/nullsocketserver_unittest.cc", | |
| 625 "base/physicalsocketserver_unittest.cc", | |
| 626 "base/socket_unittest.cc", | |
| 627 "base/socket_unittest.h", | |
| 628 "base/socketaddress_unittest.cc", | |
| 629 "base/virtualsocket_unittest.cc", | |
| 630 ] | |
| 631 if (is_win) { | |
| 632 sources += [ "base/win32socketserver_unittest.cc" ] | |
| 633 | |
| 634 # TODO(pbos): Reenable: | |
|
danilchap
2016/06/27 16:53:13
Can you expand the comment when they should be ree
pbos-webrtc
2016/06/27 17:05:49
Restored the original comments, I don't know more.
| |
| 635 # | |
| 636 # base/physicalsocketserver_unittest.cc | |
| 637 # base/socket_unittest.cc | |
| 638 # base/win32socketserver_unittest.cc | |
| 639 sources -= [ | |
| 640 "base/physicalsocketserver_unittest.cc", | |
| 641 "base/socket_unittest.cc", | |
| 642 "base/win32socketserver_unittest.cc", | |
| 643 ] | |
| 644 } | |
| 645 if (is_mac) { | |
| 646 sources += [ "base/macsocketserver_unittest.cc" ] | |
| 647 } | |
| 648 if (is_ios || (is_mac && target_cpu != "x86")) { | |
| 649 defines = [ "CARBON_DEPRECATED=YES" ] | |
| 650 } | |
| 651 deps = [ | |
| 652 "base:rtc_base", | |
| 653 "base:rtc_base_tests_utils", | |
| 654 "//testing/gtest", | |
| 655 ] | |
| 656 if (is_clang) { | |
| 657 # Suppress warnings from the Chromium Clang plugin. | |
| 658 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | |
| 659 configs -= [ "//build/config/clang:find_bad_constructs" ] | |
| 660 } | |
| 661 } | |
| 615 } | 662 } |
| OLD | NEW |