summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-19 19:55:37 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-19 19:55:37 +0000
commitd50f0a4a06cefafbfdb84ebf93046cd17b823a12 (patch)
treed304a250ac3107ec8dafe845d89272a2adf2d453 /base
parent9d4314aa8d3542ef3213654d7062d795f95e8d83 (diff)
downloadchromium_src-d50f0a4a06cefafbfdb84ebf93046cd17b823a12.zip
chromium_src-d50f0a4a06cefafbfdb84ebf93046cd17b823a12.tar.gz
chromium_src-d50f0a4a06cefafbfdb84ebf93046cd17b823a12.tar.bz2
Disabling the SamplingProfilerTest.Sample test on Windows 8 as the ZwSetIntervalProfile
API fails with a privilege not held by the client error. BUG=124077 R=cpu Review URL: https://chromiumcodereview.appspot.com/10021069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/win/sampling_profiler_unittest.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/base/win/sampling_profiler_unittest.cc b/base/win/sampling_profiler_unittest.cc
index caa4c63..b11e9ea 100644
--- a/base/win/sampling_profiler_unittest.cc
+++ b/base/win/sampling_profiler_unittest.cc
@@ -1,12 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/win/sampling_profiler.h"
-
+#include "base/logging.h"
#include "base/test/test_timeouts.h"
+#include "base/win/sampling_profiler.h"
#include "base/win/pe_image.h"
#include "base/win/scoped_handle.h"
+#include "base/win/windows_version.h"
#include "testing/gtest/include/gtest/gtest.h"
// The address of our image base.
@@ -59,6 +60,10 @@ TEST_F(SamplingProfilerTest, Initialize) {
}
TEST_F(SamplingProfilerTest, Sample) {
+ if (base::win::GetVersion() == base::win::VERSION_WIN8) {
+ LOG(INFO) << "Not running test on Windows 8";
+ return;
+ }
SamplingProfiler profiler;
// Initialize with a huge bucket size, aiming for a single bucket.