diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 23:24:55 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 23:24:55 +0000 |
| commit | 3513707b5d087c229b82879e663409bf2d4f477b (patch) | |
| tree | 9e86007bd8a438502e7d116539f11f8e5eaa7c52 /sandbox | |
| parent | 59ae0c3662d57e8e9ae9555efc7e0ee7819df645 (diff) | |
| download | chromium_src-3513707b5d087c229b82879e663409bf2d4f477b.zip chromium_src-3513707b5d087c229b82879e663409bf2d4f477b.tar.gz chromium_src-3513707b5d087c229b82879e663409bf2d4f477b.tar.bz2 | |
Disable ProcessMitigationsTest.CheckDep on Win64
DEP is already enabled by default and Win64 throws an
error when you try to manipulate the setting at all.
Review URL: https://codereview.chromium.org/12218061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181382 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/win/src/process_mitigations_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sandbox/win/src/process_mitigations_test.cc b/sandbox/win/src/process_mitigations_test.cc index 7ea670b..69b158d 100644 --- a/sandbox/win/src/process_mitigations_test.cc +++ b/sandbox/win/src/process_mitigations_test.cc @@ -140,7 +140,6 @@ TEST(ProcessMitigationsTest, CheckWin8) { SBOX_TESTS_COMMAND int CheckDep(int argc, wchar_t **argv) { -#if !defined(_WIN64) // DEP is always enabled on 64-bit. GetProcessDEPPolicyFunction get_process_dep_policy = reinterpret_cast<GetProcessDEPPolicyFunction>( ::GetProcAddress(::GetModuleHandleW(L"kernel32.dll"), @@ -183,11 +182,11 @@ SBOX_TESTS_COMMAND int CheckDep(int argc, wchar_t **argv) { return SBOX_TEST_FOURTH_ERROR; } } -#endif return SBOX_TEST_SUCCEEDED; } +#if !defined(_WIN64) // DEP is always enabled on 64-bit. TEST(ProcessMitigationsTest, CheckDep) { if (!IsXPSP2OrLater() || base::win::GetVersion() > base::win::VERSION_WIN7) return; @@ -202,6 +201,7 @@ TEST(ProcessMitigationsTest, CheckDep) { SBOX_ALL_OK); EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"CheckDep")); } +#endif } // namespace sandbox |