diff options
author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-22 22:07:40 +0000 |
---|---|---|
committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-22 22:07:40 +0000 |
commit | c704ac9353d6386c782175732df76cbcfe3eeed7 (patch) | |
tree | 056987afef853c421eb545ec15e8f288f7bc708b | |
parent | 1b2da8cc2ff36dd2dad578f4ef6dd27e0c82d796 (diff) | |
download | chromium_src-c704ac9353d6386c782175732df76cbcfe3eeed7.zip chromium_src-c704ac9353d6386c782175732df76cbcfe3eeed7.tar.gz chromium_src-c704ac9353d6386c782175732df76cbcfe3eeed7.tar.bz2 |
Reland 90109 - Disable V8BenchmarkReferenceTest.Perf for ChromeOS
BUG=87162
TEST=none
Review URL: http://codereview.chromium.org/7239003
TBR=rvargas@google.com
Review URL: http://codereview.chromium.org/7198007
Review URL: http://codereview.chromium.org/7238004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90116 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/test/ui/v8_benchmark_uitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/test/ui/v8_benchmark_uitest.cc b/chrome/test/ui/v8_benchmark_uitest.cc index add0c07b..dcebfa2 100644 --- a/chrome/test/ui/v8_benchmark_uitest.cc +++ b/chrome/test/ui/v8_benchmark_uitest.cc @@ -148,7 +148,14 @@ TEST_F(V8BenchmarkTest, Perf) { RunTest(); } -TEST_F(V8BenchmarkReferenceTest, Perf) { +// Bug 87162: Disable Perf for ChromeOS +#if defined(OS_CHROMEOS) +#define MAYBE_Perf DISABLED_Perf +#else +#define MAYBE_Perf Perf +#endif + +TEST_F(V8BenchmarkReferenceTest, MAYBE_Perf) { if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunV8Benchmark)) return; |