Commit 0f578508 authored by Penny MacNeil's avatar Penny MacNeil Committed by Commit Bot

[Windows Sandbox] Debug bot test failure "fix".

Remove debug-build aslr policy-set test.  It's been failing all along,
but this is the first time we've turned on a debug Win bot.

Follow-up work / cleanup expected to follow.  Ref: crbug/834907

BUG=833648
TEST=sbox_integration_tests.exe, ProcessMitigationsTest.CheckWin8AslrPolicySuccess

Change-Id: I5bd538a1be03020b3dd4e355a3ebbd0a066adf7d
Reviewed-on: https://chromium-review.googlesource.com/1020153Reviewed-by: default avatarJames Forshaw <forshaw@chromium.org>
Commit-Queue: Penny MacNeil <pennymac@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553202}
parent e21324d3
......@@ -605,31 +605,20 @@ TEST(ProcessMitigationsTest, CheckWin8AslrPolicySuccess) {
base::string16 test_command = L"CheckPolicy ";
test_command += std::to_wstring(TESTPOLICY_ASLR);
//---------------------------------------------
// Only test in release for now.
// TODO(pennymac): overhaul ASLR, crbug/834907.
//---------------------------------------------
#if defined(NDEBUG)
TestRunner runner;
sandbox::TargetPolicy* policy = runner.GetPolicy();
//---------------------------------
// 1) Test setting pre-startup.
// **Can only set ASLR pre-startup in release build.
//---------------------------------
#if defined(NDEBUG)
EXPECT_EQ(policy->SetProcessMitigations(
MITIGATION_RELOCATE_IMAGE | MITIGATION_RELOCATE_IMAGE_REQUIRED |
MITIGATION_BOTTOM_UP_ASLR | MITIGATION_HIGH_ENTROPY_ASLR),
SBOX_ALL_OK);
EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(test_command.c_str()));
//---------------------------------
// 2) Test setting post-startup.
// **Bottom up and high entropy can only be set pre-startup.
// **Can only set ASLR post-startup in debug build.
//---------------------------------
#else
EXPECT_EQ(policy->SetDelayedProcessMitigations(
MITIGATION_RELOCATE_IMAGE | MITIGATION_RELOCATE_IMAGE_REQUIRED),
SBOX_ALL_OK);
EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(test_command.c_str()));
#endif // !defined(NDEBUG)
#endif // defined(NDEBUG)
}
//------------------------------------------------------------------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment