diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-11 20:53:37 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:54:48 +0100 |
| commit | 21d179b334e59e9a3bfcaed4c4430bef1bc5759d (patch) | |
| tree | 64e2bb6da27af6a5c93ca34f6051584aafbfcb9e /testing | |
| parent | 0c63f00edd6ed0482fd5cbcea937ca088baf7858 (diff) | |
| download | external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.zip external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.gz external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.bz2 | |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/gmock.gyp | 4 | ||||
| -rw-r--r-- | testing/gtest.gyp | 20 |
2 files changed, 17 insertions, 7 deletions
diff --git a/testing/gmock.gyp b/testing/gmock.gyp index f879dcf..8f73cb6 100644 --- a/testing/gmock.gyp +++ b/testing/gmock.gyp @@ -50,9 +50,7 @@ ], }, { - # Note that calling this "gmock_main" confuses the scons build, - # which uses "_main" on scons files to produce special behavior. - 'target_name': 'gmockmain', + 'target_name': 'gmock_main', 'type': '<(library)', 'dependencies': [ 'gmock', diff --git a/testing/gtest.gyp b/testing/gtest.gyp index da95f42..1a91ac5 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -102,15 +102,27 @@ 'gtest/include', # So that gtest headers can find themselves. ], 'target_conditions': [ - ['_type=="executable"', {'test': 1}], + ['_type=="executable"', { + 'test': 1, + 'conditions': [ + ['OS=="mac"', { + 'run_as': { + 'action????': ['${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}'], + }, + }], + ['OS=="win"', { + 'run_as': { + 'action????': ['$(TargetPath)', '--gtest_print_time'], + }, + }], + ], + }], ], 'msvs_disabled_warnings': [4800], }, }, { - # Note that calling this "gtest_main" confuses the scons build, - # which uses "_main" on scons files to produce special behavior. - 'target_name': 'gtestmain', + 'target_name': 'gtest_main', 'type': '<(library)', 'dependencies': [ 'gtest', |