summaryrefslogtreecommitdiffstats
path: root/sandbox/win
diff options
context:
space:
mode:
authorJohn Abd-El-Malek <jam@chromium.org>2016-01-23 13:15:30 -0800
committerJohn Abd-El-Malek <jam@chromium.org>2016-01-23 21:18:36 +0000
commit1e6bc80b2530e57d9c03ea79ae393958bb785f61 (patch)
tree15d0f2bae2481e90ff428a55236ca7684c3e5004 /sandbox/win
parent3013c63965953c4fbf535eda79c1736a363681d7 (diff)
downloadchromium_src-1e6bc80b2530e57d9c03ea79ae393958bb785f61.zip
chromium_src-1e6bc80b2530e57d9c03ea79ae393958bb785f61.tar.gz
chromium_src-1e6bc80b2530e57d9c03ea79ae393958bb785f61.tar.bz2
Disable failing portion of ProcessPolicyTest.CreateProcessAW on Windows 7 32 bit.
BUG=580800 TBR=wfh@chromium.org Review URL: https://codereview.chromium.org/1622793003 . Cr-Commit-Position: refs/heads/master@{#371139}
Diffstat (limited to 'sandbox/win')
-rw-r--r--sandbox/win/src/process_policy_test.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sandbox/win/src/process_policy_test.cc b/sandbox/win/src/process_policy_test.cc
index 44effa3..2a22bb5 100644
--- a/sandbox/win/src/process_policy_test.cc
+++ b/sandbox/win/src/process_policy_test.cc
@@ -319,7 +319,9 @@ TEST(ProcessPolicyTest, CreateProcessAW) {
runner.RunTest(L"Process_RunApp6 findstr.exe"));
#if !defined(_WIN64)
- if (base::win::OSInfo::GetInstance()->version() >= base::win::VERSION_VISTA) {
+ if (base::win::OSInfo::GetInstance()->version() >= base::win::VERSION_VISTA &&
+ base::win::OSInfo::GetInstance()->architecture() !=
+ base::win::OSInfo::X86_ARCHITECTURE) { // http://crbug.com/580800
// WinXP results are not reliable.
EXPECT_EQ(SBOX_TEST_SECOND_ERROR,
runner.RunTest(L"Process_RunApp4 calc.exe"));