 Chromium Code Reviews
 Chromium Code Reviews Issue 2697603002:
  Move iOS tests to XCTest from gtest.  (Closed)
    
  
    Issue 2697603002:
  Move iOS tests to XCTest from gtest.  (Closed) 
  | OLD | NEW | 
|---|---|
| 1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2016 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 import("../webrtc.gni") | 9 import("../webrtc.gni") | 
| 10 if (is_android) { | 10 if (is_android) { | 
| (...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 426 ] | 426 ] | 
| 427 public_configs = [ ":socketrocket_include_config" ] | 427 public_configs = [ ":socketrocket_include_config" ] | 
| 428 | 428 | 
| 429 libs = [ | 429 libs = [ | 
| 430 "CFNetwork.framework", | 430 "CFNetwork.framework", | 
| 431 "icucore", | 431 "icucore", | 
| 432 ] | 432 ] | 
| 433 } | 433 } | 
| 434 | 434 | 
| 435 if (rtc_include_tests) { | 435 if (rtc_include_tests) { | 
| 436 config("rtc_apprtcmobile_config") { | 436 if (is_ios) { | 
| 
daniela-webrtc
2017/02/13 16:08:21
This means that we'll no longer have Mac test targ
 
kthelgason
2017/02/14 09:48:46
Good call, thanks. Done.
 | |
| 437 defines = [ "GTEST_RELATIVE_PATH" ] | 437 rtc_source_set("apprtcmobile_test_sources") { | 
| 438 } | 438 include_dirs = [ | 
| 439 | 439 "objc/AppRTCMobile", | 
| 440 rtc_test("apprtcmobile_tests") { | 440 "objc/AppRTCMobile/ios", | 
| 441 include_dirs = [ "objc/AppRTCMobile/ios" ] | 441 ] | 
| 442 deps = [ | 442 testonly = true | 
| 443 ":AppRTCMobile_lib", | 443 sources = [ | 
| 444 ":apprtc_signaling", | 444 "objc/AppRTCMobile/tests/ARDAppClient_xctest.mm", | 
| 445 "//testing/gtest", | 445 "objc/AppRTCMobile/tests/ARDSDPUtils_xctest.mm", | 
| 446 "//third_party/ocmock", | 446 "objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm", | 
| 447 ] | 447 ] | 
| 448 | 448 public_deps = [ | 
| 449 sources = [ | 449 ":AppRTCMobile_ios_frameworks", | 
| 450 "objc/AppRTCMobile/tests/ARDAppClientTest.mm", | 450 ":AppRTCMobile_lib", | 
| 451 "objc/AppRTCMobile/tests/ARDSettingsModelTests.mm", | 451 "//build/config/ios:xctest", | 
| 452 ] | 452 "//third_party/ocmock", | 
| 453 | 453 ] | 
| 454 if (is_ios) { | 454 configs += [ "//build/config/compiler:enable_arc" ] | 
| 455 info_plist = "objc/AppRTCMobile/ios/Info.plist" | |
| 456 } | 455 } | 
| 457 | 456 | 
| 458 configs += [ | 457 ios_xctest_test("apprtcmobile_tests") { | 
| 
kjellander_webrtc
2017/02/14 09:04:10
The rtc_test template in https://chromium.googleso
 
kthelgason
2017/02/14 09:48:46
Done.
 | |
| 459 ":rtc_apprtcmobile_config", | 458 info_plist = "objc/AppRTCMobile/ios/Info.plist" | 
| 460 "//build/config/compiler:enable_arc", | 459 sources = [ | 
| 461 ] | 460 "objc/AppRTCMobile/ios/main.m", | 
| 461 ] | |
| 462 deps = [ | |
| 463 ":apprtcmobile_test_sources", | |
| 464 ] | |
| 465 ldflags = [ "-all_load" ] | |
| 466 } | |
| 462 } | 467 } | 
| 463 } | 468 } | 
| 464 } | 469 } | 
| 465 | 470 | 
| 466 if (is_linux || is_win) { | 471 if (is_linux || is_win) { | 
| 467 config("peerconnection_client_warnings_config") { | 472 config("peerconnection_client_warnings_config") { | 
| 468 cflags = [] | 473 cflags = [] | 
| 469 if (is_win && is_clang) { | 474 if (is_win && is_clang) { | 
| 470 cflags += [ | 475 cflags += [ | 
| 471 # Disable warnings failing when compiling with Clang on Windows. | 476 # Disable warnings failing when compiling with Clang on Windows. | 
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 623 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 628 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 624 } | 629 } | 
| 625 | 630 | 
| 626 deps = [ | 631 deps = [ | 
| 627 "../p2p:libstunprober", | 632 "../p2p:libstunprober", | 
| 628 "../p2p:rtc_p2p", | 633 "../p2p:rtc_p2p", | 
| 629 "../system_wrappers:field_trial_default", | 634 "../system_wrappers:field_trial_default", | 
| 630 ] | 635 ] | 
| 631 } | 636 } | 
| 632 } | 637 } | 
| OLD | NEW |