Chromium Code Reviews| Index: build/config/ios/rules.gni |
| diff --git a/build/config/ios/rules.gni b/build/config/ios/rules.gni |
| index 8611e5a4cd6bcad98f38b2ad8e5c87a191824e41..8b71da75ec8e4d5c0af9c465c7986b57cc06e354 100644 |
| --- a/build/config/ios/rules.gni |
| +++ b/build/config/ios/rules.gni |
| @@ -1386,8 +1386,17 @@ template("ios_xctest_test") { |
| ios_info_plist(_xctest_info_plist_target) { |
| visibility = [ ":$_xctest_info_plist_bundle" ] |
| info_plist = "//build/config/ios/Module-Info.plist" |
| - extra_substitutions = [ "MODULE_NAME=$_xctest_output" ] |
| executable_name = _host_output |
| + if (ios_automatically_manage_certs) { |
| + # Use the same bundle identifier for EarlGrey tests as for unit tests |
| + # when managing certificates as the number of free certs is limited. |
| + extra_substitutions = [ |
| + "EXECUTABLE_NAME=gtest.generic-unit-test", |
|
justincohen
2017/02/22 15:02:19
should gtest.generic..blah be shared somehwere? S
|
| + "MODULE_NAME=generic-unit-test-module", |
| + ] |
| + } else { |
| + extra_substitutions = [ "MODULE_NAME=$_xctest_output" ] |
| + } |
| } |
| bundle_data(_xctest_info_plist_bundle) { |
| @@ -1454,6 +1463,14 @@ template("ios_xctest_test") { |
| if (!defined(invoker.info_plist) && !defined(invoker.info_plist_target)) { |
| info_plist = "//build/config/ios/Host-Info.plist" |
| + if (ios_automatically_manage_certs) { |
| + # Use the same bundle identifier for EarlGrey tests as for unit tests |
| + # when managing certificates as the number of free certs is limited. |
| + if (!defined(extra_substitutions)) { |
| + extra_substitutions = [] |
| + } |
| + extra_substitutions += [ "EXECUTABLE_NAME=gtest.generic-unit-test" ] |
| + } |
| } |
| # Xcode needs those two framework installed in the application (and signed) |