diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 22:45:08 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 22:45:08 +0000 |
| commit | a2b8d271f6e9b141d5bcc0b4fee4dd766a27b41c (patch) | |
| tree | 95604a75bb724a30b934bc2c82430c4315ad6077 /build | |
| parent | 5ffa75d42d901f303b10702717272f1ea83607e7 (diff) | |
| download | chromium_src-a2b8d271f6e9b141d5bcc0b4fee4dd766a27b41c.zip chromium_src-a2b8d271f6e9b141d5bcc0b4fee4dd766a27b41c.tar.gz chromium_src-a2b8d271f6e9b141d5bcc0b4fee4dd766a27b41c.tar.bz2 | |
Reverting most of r81003.
BUG=None
TEST=None
TBR=nsylvain
Review URL: http://codereview.chromium.org/6825016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/build/all.gyp b/build/all.gyp index 74bdce8..5c13347 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -206,8 +206,9 @@ '../base/base.gyp:base_unittests', '../chrome/chrome.gyp:browser_tests', '../chrome/chrome.gyp:interactive_ui_tests', - '../chrome/chrome.gyp:nacl_ui_tests', - '../chrome/chrome.gyp:nacl_sandbox_tests', + # TODO(bradnelson): fix and enable. + #'../chrome/chrome.gyp:nacl_ui_tests', + #'../chrome/chrome.gyp:nacl_sandbox_tests', '../chrome/chrome.gyp:safe_browsing_tests', '../chrome/chrome.gyp:sync_integration_tests', '../chrome/chrome.gyp:sync_unit_tests', @@ -228,10 +229,10 @@ ['OS=="win"', { 'dependencies': [ '../chrome/chrome.gyp:installer_util_unittests', - '../chrome/chrome.gyp:mini_installer_test', + # TODO(bradnelson): fix and enable. + #'../chrome/chrome.gyp:mini_installer_test', # mini_installer_tests depends on mini_installer. This should be # defined in installer.gyp. - # TODO(bradnelson): fix and enable. #'../chrome/installer/mini_installer.gyp:mini_installer', #'../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', #'../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', |