| 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 466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 477 deps += [ "//testing/android/native_test:native_test_native_code" ] | 477 deps += [ "//testing/android/native_test:native_test_native_code" ] |
| 478 shard_timeout = 2700 | 478 shard_timeout = 2700 |
| 479 } | 479 } |
| 480 if (is_ios) { | 480 if (is_ios) { |
| 481 deps += [ ":webrtc_perf_tests_bundle_data" ] | 481 deps += [ ":webrtc_perf_tests_bundle_data" ] |
| 482 } | 482 } |
| 483 } | 483 } |
| 484 | 484 |
| 485 rtc_test("webrtc_nonparallel_tests") { | 485 rtc_test("webrtc_nonparallel_tests") { |
| 486 testonly = true | 486 testonly = true |
| 487 configs += [ ":rtc_unittests_config" ] | 487 deps = [ |
| 488 sources = [ | 488 "base:base_nonparallel_tests", |
| 489 "base/nullsocketserver_unittest.cc", | |
| 490 "base/physicalsocketserver_unittest.cc", | |
| 491 "base/socket_unittest.cc", | |
| 492 "base/socket_unittest.h", | |
| 493 "base/socketaddress_unittest.cc", | |
| 494 "base/virtualsocket_unittest.cc", | |
| 495 ] | 489 ] |
| 496 deps = [ | |
| 497 "base:rtc_base", | |
| 498 "base:rtc_base_tests_utils", | |
| 499 "//testing/gtest", | |
| 500 ] | |
| 501 if (is_win) { | |
| 502 sources += [ "base/win32socketserver_unittest.cc" ] | |
| 503 } | |
| 504 if (is_android) { | 490 if (is_android) { |
| 505 deps += [ "//testing/android/native_test:native_test_support" ] | 491 deps += [ "//testing/android/native_test:native_test_support" ] |
| 506 shard_timeout = 900 | 492 shard_timeout = 900 |
| 507 } | 493 } |
| 508 | |
| 509 if (!build_with_chromium && is_clang) { | |
| 510 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | |
| 511 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | |
| 512 } | |
| 513 } | 494 } |
| 514 | 495 |
| 515 if (is_android) { | 496 if (is_android) { |
| 516 junit_binary("android_junit_tests") { | 497 junit_binary("android_junit_tests") { |
| 517 java_files = [ | 498 java_files = [ |
| 518 "androidjunit/src/org/webrtc/CameraEnumerationTest.java", | 499 "androidjunit/src/org/webrtc/CameraEnumerationTest.java", |
| 519 "examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java", | 500 "examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java", |
| 520 "examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java"
, | 501 "examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java"
, |
| 521 "examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java"
, | 502 "examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java"
, |
| 522 ] | 503 ] |
| 523 | 504 |
| 524 deps = [ | 505 deps = [ |
| 525 "//base:base_java_test_support", | 506 "//base:base_java_test_support", |
| 526 "//webrtc/examples:AppRTCMobile_javalib", | 507 "//webrtc/examples:AppRTCMobile_javalib", |
| 527 "//webrtc/sdk/android:libjingle_peerconnection_java", | 508 "//webrtc/sdk/android:libjingle_peerconnection_java", |
| 528 ] | 509 ] |
| 529 } | 510 } |
| 530 } | 511 } |
| 531 } | 512 } |
| OLD | NEW |