| Index: testing/gtest.gyp
|
| diff --git a/testing/gtest.gyp b/testing/gtest.gyp
|
| index 78b3ce23152f33c345584c3170c72e36041f6c98..97980b7877f67f8ea823f2f6d2ee0b0fb7471c7a 100644
|
| --- a/testing/gtest.gyp
|
| +++ b/testing/gtest.gyp
|
| @@ -51,7 +51,7 @@
|
| 'gtest_prod',
|
| ],
|
| 'conditions': [
|
| - ['OS == "mac"', {
|
| + ['OS == "mac" or OS == "ios"', {
|
| 'sources': [
|
| 'gtest_mac.h',
|
| 'gtest_mac.mm',
|
| @@ -63,6 +63,34 @@
|
| ],
|
| },
|
| }],
|
| + ['OS == "ios"', {
|
| + 'direct_dependent_settings': {
|
| + 'target_conditions': [
|
| + # Turn all tests into bundles on iOS because that's the only
|
| + # type of executable supported for iOS.
|
| + ['_type=="executable"', {
|
| + 'variables': {
|
| + # Use a variable so the path gets fixed up so it is always
|
| + # correct when INFOPLIST_FILE finally gets set.
|
| + 'ios_unittest_info_plist_path':
|
| + '<(DEPTH)/testing/gtest_ios/unittest-Info.plist',
|
| + },
|
| + 'mac_bundle': 1,
|
| + 'xcode_settings': {
|
| + 'BUNDLE_ID_TEST_NAME':
|
| + '>!(echo ">(_target_name)" | sed -e "s/_//g")',
|
| + 'INFOPLIST_FILE': '>(ios_unittest_info_plist_path)',
|
| + },
|
| + 'mac_bundle_resources': [
|
| + '<(ios_unittest_info_plist_path)',
|
| + ],
|
| + 'mac_bundle_resources!': [
|
| + '<(ios_unittest_info_plist_path)',
|
| + ],
|
| + }],
|
| + ],
|
| + },
|
| + }],
|
| ['os_posix == 1', {
|
| 'defines': [
|
| # gtest isn't able to figure out when RTTI is disabled for gcc
|
| @@ -111,6 +139,17 @@
|
| 'action????': ['${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}'],
|
| },
|
| }],
|
| + ['OS=="ios"', {
|
| + 'variables': {
|
| + # Use a variable so the path gets fixed up so it is always
|
| + # correct when the action finally gets used.
|
| + 'ios_run_unittest_script_path':
|
| + '<(DEPTH)/testing/gtest_ios/RunUnittest.sh',
|
| + },
|
| + 'run_as': {
|
| + 'action????': ['>(ios_run_unittest_script_path)'],
|
| + },
|
| + }],
|
| ['OS=="win"', {
|
| 'run_as': {
|
| 'action????': ['$(TargetPath)', '--gtest_print_time'],
|
|
|