summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-30 19:23:11 +0000
committerkkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-30 19:23:11 +0000
commitf3fef7f96fdd05f899377424979a289439f34d20 (patch)
tree1f6ed9dadcfd1638e71669e5339ea11ef91e623b
parent83cfc4370ebe877b1992fba5d661c940c2998dd5 (diff)
downloadchromium_src-f3fef7f96fdd05f899377424979a289439f34d20.zip
chromium_src-f3fef7f96fdd05f899377424979a289439f34d20.tar.gz
chromium_src-f3fef7f96fdd05f899377424979a289439f34d20.tar.bz2
Build chromedriver2_unittests as part of chromium_builder_tests.
This is so it can be run optionally on the trybots. Review URL: https://chromiumcodereview.appspot.com/11299263 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170508 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--build/all.gyp1
-rw-r--r--chrome/chrome_tests.gypi3
2 files changed, 3 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp
index f327536..df02c8f 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -193,6 +193,7 @@
'dependencies': [
'../cc/cc_tests.gyp:cc_unittests',
'../chrome/chrome.gyp:browser_tests',
+ '../chrome/chrome.gyp:chromedriver2_tests',
'../chrome/chrome.gyp:chromedriver2_unittests',
'../chrome/chrome.gyp:interactive_ui_tests',
'../chrome/chrome.gyp:sync_integration_tests',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 21b7343..49ea955 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -724,7 +724,8 @@
'test/chromedriver/synchronized_map_unittest.cc',
],
},
- # ChromeDriver2 tests that aren't run on the main buildbots.
+ # ChromeDriver2 tests that aren't run on the main buildbot. Available
+ # as an optional test type on trybots.
{
'target_name': 'chromedriver2_tests',
'type': 'executable',