summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-01 13:32:12 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-01 13:32:12 +0000
commit2b95d7bddd7df783524c532cc29e3a84803da94b (patch)
tree359217ca0a8dea1e86cac6ef845980826a1771e5 /chrome/chrome_tests.gypi
parentbb74729b0ec66ad9e73a48312c87809fe3c6526c (diff)
downloadchromium_src-2b95d7bddd7df783524c532cc29e3a84803da94b.zip
chromium_src-2b95d7bddd7df783524c532cc29e3a84803da94b.tar.gz
chromium_src-2b95d7bddd7df783524c532cc29e3a84803da94b.tar.bz2
Add unit_tests_run that (mostly) works for all of linux, OSX and Windows.
Revert r134670 "Revert 134667 "Revert r134508 "Revert 134507, broke the main builders:"" This CL's going to get in at whatever cost. I moved more optional files to be untracked. The dependencies were retrieved with trace_inputs.py and merged with merge_isolate.py. Manual edits: - Added <(EXECUTABLE_SUFFIX) to two executables: unit_tests and xdisplaycheck. - Removed testserver.log and unit_tests.log. - Added copyright. - Removed *.db-journal files. TBR=rogerta@chromium.org BUG=98636 TEST= Review URL: https://chromiumcodereview.appspot.com/10263018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r--chrome/chrome_tests.gypi30
1 files changed, 30 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 90e1818..2f396c9 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2598,6 +2598,36 @@
],
},
{
+ 'target_name': 'unit_tests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'unit_tests',
+ ],
+ 'includes': [
+ 'unit_tests.isolate',
+ ],
+ 'actions': [
+ {
+ 'action_name': 'isolate',
+ 'inputs': [
+ '<@(isolate_dependency_tracked)',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/unit_tests.results',
+ ],
+ 'action': [
+ 'python',
+ '../tools/isolate/isolate.py',
+ '--mode', '<(tests_run)',
+ '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
+ '--variable', 'OS', '<(OS)',
+ '--result', '<@(_outputs)',
+ 'unit_tests.isolate',
+ ],
+ },
+ ],
+ },
+ {
# Executable that runs each browser test in a new process.
'target_name': 'browser_tests',
'type': 'executable',