diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-12 00:26:00 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-12 00:26:00 +0000 |
| commit | 4c7ac9e8b3dd2bd4e02770c8e44e379a163b0e9a (patch) | |
| tree | 2b9aaa112a078936d5fe18c7455ae163e8e2c33b /chrome/test/startup | |
| parent | 5cc8b1fbfd0046c9441277190819aaed000ca652 (diff) | |
| download | chromium_src-4c7ac9e8b3dd2bd4e02770c8e44e379a163b0e9a.zip chromium_src-4c7ac9e8b3dd2bd4e02770c8e44e379a163b0e9a.tar.gz chromium_src-4c7ac9e8b3dd2bd4e02770c8e44e379a163b0e9a.tar.bz2 | |
Fix mac build by disabling tests.
TBR=evan
Review URL: http://codereview.chromium.org/113239
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15821 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/startup')
| -rw-r--r-- | chrome/test/startup/feature_startup_test.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/test/startup/feature_startup_test.cc b/chrome/test/startup/feature_startup_test.cc index 2d86b4b..3ab29aa 100644 --- a/chrome/test/startup/feature_startup_test.cc +++ b/chrome/test/startup/feature_startup_test.cc @@ -6,6 +6,7 @@ #include "base/path_service.h" #include "base/perftimer.h" #include "base/time.h" +#include "build/build_config.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/automation/browser_proxy.h" @@ -92,6 +93,8 @@ class NewTabUIStartupTest : public UITest { // TODO(pamg): run these tests with a reference build? +// TODO(tc): Fix this. +#if !defined(OS_MACOSX) TEST_F(NewTabUIStartupTest, PerfCold) { RunStartupTest("tab_cold", false /* not cold */, true /* important */); } @@ -99,3 +102,4 @@ TEST_F(NewTabUIStartupTest, PerfCold) { TEST_F(NewTabUIStartupTest, DISABLED_PerfWarm) { RunStartupTest("tab_warm", true /* cold */, false /* not important */); } +#endif |