diff options
author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-24 20:08:05 +0000 |
---|---|---|
committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-24 20:08:05 +0000 |
commit | b99daba2d6896de6c303a2ed4f2430abf4d36f3d (patch) | |
tree | 17073408dfdb6c8690ee979416e35a44acf3ebc2 | |
parent | ba6da1fa11a1d7635e8ad5ab282734f80e2effa2 (diff) | |
download | chromium_src-b99daba2d6896de6c303a2ed4f2430abf4d36f3d.zip chromium_src-b99daba2d6896de6c303a2ed4f2430abf4d36f3d.tar.gz chromium_src-b99daba2d6896de6c303a2ed4f2430abf4d36f3d.tar.bz2 |
Add chrome_frame_reliability_tests.exe to the set of archived CF tests. (Needed for the CF reliability builder)
Remove the now-unused chrome_frame_builder target in all.gyp.
BUG=29451
TEST=chrome_frame_reliability_tests.exe shows up at http://chrome-web/buildbot/snapshots/chromium-rel-xp/
Review URL: http://codereview.chromium.org/658007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39915 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | build/all.gyp | 24 | ||||
-rw-r--r-- | chrome_frame/TESTS | 3 |
2 files changed, 4 insertions, 23 deletions
diff --git a/build/all.gyp b/build/all.gyp index cdb5f07..bb80617 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -221,32 +221,12 @@ 'temp_gyp/googleurl.gyp:googleurl_unittests', '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', + '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests', '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', '../chrome_frame/chrome_frame.gyp:npchrome_frame', ], - }, - { - # TODO(robertshield): Remove this target once the last independent - # CF builder is retired. - 'target_name': 'chrome_frame_builder', - 'type': 'none', - 'dependencies': [ - '../chrome/installer/installer.gyp:installer_util_unittests', - '../chrome/installer/installer.gyp:mini_installer_test', - # mini_installer_tests depends on mini_installer. This should be - # defined in installer.gyp. - '../chrome/installer/mini_installer.gyp:mini_installer', - '../chrome/installer/mini_installer.gyp:chrome_frame_mini_installer', - '../courgette/courgette.gyp:courgette_unittests', - '../chrome/chrome.gyp:chrome', - '../chrome_frame/chrome_frame.gyp:npchrome_frame', - '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', - ], - }, + }, ], # targets }], # OS="win" ], # conditions diff --git a/chrome_frame/TESTS b/chrome_frame/TESTS index 6f10655..3b55ecf 100644 --- a/chrome_frame/TESTS +++ b/chrome_frame/TESTS @@ -1,4 +1,5 @@ chrome_frame_net_tests.exe chrome_frame_perftests.exe chrome_frame_tests.exe -chrome_frame_unittests.exe
\ No newline at end of file +chrome_frame_unittests.exe +chrome_frame_reliability_tests.exe
\ No newline at end of file |