summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2015-08-08 12:40:18 -0700
committerNico Weber <thakis@chromium.org>2015-08-08 19:41:42 +0000
commitb35ddf501b14f51de10b39ee2bffa35c4aff75f5 (patch)
tree4864fe9abba209c7597cb7df76ba11efba0f3dee
parente33057019a84b903c6c12394500e4b3893d0f34e (diff)
downloadchromium_src-b35ddf501b14f51de10b39ee2bffa35c4aff75f5.zip
chromium_src-b35ddf501b14f51de10b39ee2bffa35c4aff75f5.tar.gz
chromium_src-b35ddf501b14f51de10b39ee2bffa35c4aff75f5.tar.bz2
clang/win: Try to fix 64-bit build after https://codereview.chromium.org/1261953003.
BUG=505316 TBR=cpu@chromium.org Review URL: https://codereview.chromium.org/1284533002. Cr-Commit-Position: refs/heads/master@{#342538}
-rw-r--r--sandbox/win/src/process_mitigations_test.cc2
-rw-r--r--tools/gn/exec_process_unittest.cc8
2 files changed, 6 insertions, 4 deletions
diff --git a/sandbox/win/src/process_mitigations_test.cc b/sandbox/win/src/process_mitigations_test.cc
index 78f730b..080d8ec 100644
--- a/sandbox/win/src/process_mitigations_test.cc
+++ b/sandbox/win/src/process_mitigations_test.cc
@@ -30,6 +30,7 @@ typedef BOOL (WINAPI *GetProcessMitigationPolicyFunction)(
GetProcessMitigationPolicyFunction get_process_mitigation_policy;
+#if !defined(_WIN64)
bool CheckWin8DepPolicy() {
PROCESS_MITIGATION_DEP_POLICY policy = {};
if (!get_process_mitigation_policy(::GetCurrentProcess(), ProcessDEPPolicy,
@@ -38,6 +39,7 @@ bool CheckWin8DepPolicy() {
}
return policy.Enable && policy.Permanent;
}
+#endif // !defined(_WIN64)
#if defined(NDEBUG)
bool CheckWin8AslrPolicy() {
diff --git a/tools/gn/exec_process_unittest.cc b/tools/gn/exec_process_unittest.cc
index 41c1802..a5697b0 100644
--- a/tools/gn/exec_process_unittest.cc
+++ b/tools/gn/exec_process_unittest.cc
@@ -14,6 +14,10 @@
namespace internal {
+// TODO(cjhopman): Enable these tests when windows ExecProcess handles stderr.
+// 'python' is not runnable on Windows. Adding ["cmd", "/c"] fails because
+// CommandLine does unusual reordering of args.
+#if !defined(OS_WIN)
namespace {
bool ExecPython(const std::string& command,
std::string* std_out,
@@ -35,10 +39,6 @@ bool ExecPython(const std::string& command,
}
} // namespace
-// TODO(cjhopman): Enable these tests when windows ExecProcess handles stderr.
-// 'python' is not runnable on Windows. Adding ["cmd", "/c"] fails because
-// CommandLine does unusual reordering of args.
-#if !defined(OS_WIN)
TEST(ExecProcessTest, TestExitCode) {
std::string std_out, std_err;
int exit_code;