summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-17 16:04:03 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-17 16:04:03 +0000
commit8855583c5785c972d557a800684da81a1dcb6646 (patch)
tree5f82875ff7259f7655b3d2a75dca2c94eeb272e5
parent9d8bdca06a573876f2aab6c21227c7c7cfc2941f (diff)
downloadchromium_src-8855583c5785c972d557a800684da81a1dcb6646.zip
chromium_src-8855583c5785c972d557a800684da81a1dcb6646.tar.gz
chromium_src-8855583c5785c972d557a800684da81a1dcb6646.tar.bz2
Use run_as to hang the action for the runners so GYP doesn't have to know about gtest.
BUG=none TEST=none Review URL: http://codereview.chromium.org/5573006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69548 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--testing/gtest.gyp16
1 files changed, 15 insertions, 1 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index c0be091..1a91ac5 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -102,7 +102,21 @@
'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],
},