summaryrefslogtreecommitdiffstats
path: root/cc/cc_tests.gyp
diff options
context:
space:
mode:
authorjam <jam@chromium.org>2015-01-27 09:22:35 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-27 17:24:12 +0000
commit75a28f07d5c54d2c0ea5ad59718038599b4b7287 (patch)
tree7000a1c861a54a860c57ac403e146305b47721b1 /cc/cc_tests.gyp
parent3dc33bd5214a94b2f206950980b09bf6218eec7e (diff)
downloadchromium_src-75a28f07d5c54d2c0ea5ad59718038599b4b7287.zip
chromium_src-75a28f07d5c54d2c0ea5ad59718038599b4b7287.tar.gz
chromium_src-75a28f07d5c54d2c0ea5ad59718038599b4b7287.tar.bz2
Revert of Revert of Swarm cc_unittests. (patchset #1 id:1 of https://codereview.chromium.org/861173002/)
Reason for revert: just saw this revert. can't find sergeyv online, and don't see information on what broke. so reverting the revert and watching the tree. Original issue's description: > Revert of Swarm cc_unittests. (patchset #6 id:100001 of https://codereview.chromium.org/854743002/) > > Reason for revert: > Failures on chrome.mac > > Original issue's description: > > Swarm cc_unittests. > > > > BUG=448877 > > > > Committed: https://crrev.com/9086ff0072268267bacf28e6098a7b5bd8478982 > > Cr-Commit-Position: refs/heads/master@{#312252} > > TBR=maruel@chromium.org,alexst@chromium.org,jam@chromium.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=448877 > > Committed: https://crrev.com/c497f3788bc5007ee3bbe2f6aa1cc101b6d66d8b > Cr-Commit-Position: refs/heads/master@{#312322} TBR=maruel@chromium.org,alexst@chromium.org,sergeyv@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=448877 Review URL: https://codereview.chromium.org/880803004 Cr-Commit-Position: refs/heads/master@{#313294}
Diffstat (limited to 'cc/cc_tests.gyp')
-rw-r--r--cc/cc_tests.gyp19
1 files changed, 18 insertions, 1 deletions
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index 74cb1bfd..49337bc 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -444,6 +444,23 @@
},
],
}
- ]
+ ],
+ ['test_isolation_mode != "noop"', {
+ 'targets': [
+ {
+ 'target_name': 'cc_unittests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'cc_unittests',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'cc_unittests.isolate',
+ ],
+ },
+ ],
+ }],
],
}