Commit 20cf4ff1 authored by Wez's avatar Wez Committed by Commit Bot

Re-enable LogMessageMarkerOnStack test on Windows.

This test was disabled on Windows in
https://chromium-review.googlesource.com/c/1293670
because of failures on the Windows Debug bots.

The failure cannot be reproduced locally, and we don't have links to
logs from the failed runs, so re-enabling the test to allow us to repro
and diagnose the issue.

Bug: 897735, 802393
Change-Id: I9086366e7b1f9240674f3b5678810d221b5d01ff
Reviewed-on: https://chromium-review.googlesource.com/c/1393545Reviewed-by: default avatarAlbert J. Wong <ajwong@chromium.org>
Reviewed-by: default avatarWez <wez@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#619528}
parent 1d83cb89
...@@ -829,17 +829,10 @@ TEST_F(LoggingTest, LogPrefix) { ...@@ -829,17 +829,10 @@ TEST_F(LoggingTest, LogPrefix) {
log_string_ptr = nullptr; log_string_ptr = nullptr;
} }
// Crashes on Win 10 only. https://crbug.com/897735
#if defined(OS_WIN)
#define MAYBE_LogMessageMarkersOnStack DISABLED_LogMessageMarkersOnStack
#else
#define MAYBE_LogMessageMarkersOnStack LogMessageMarkersOnStack
#endif
#if !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER) #if !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER)
// Since we scan potentially uninitialized portions of the stack, we can't run // Since we scan potentially uninitialized portions of the stack, we can't run
// this test under any sanitizer that checks for uninitialized reads. // this test under any sanitizer that checks for uninitialized reads.
TEST_F(LoggingTest, MAYBE_LogMessageMarkersOnStack) { TEST_F(LoggingTest, LogMessageMarkersOnStack) {
const uint32_t kLogStartMarker = 0xbedead01; const uint32_t kLogStartMarker = 0xbedead01;
const uint32_t kLogEndMarker = 0x5050dead; const uint32_t kLogEndMarker = 0x5050dead;
const char kTestMessage[] = "Oh noes! I have crashed! 💩"; const char kTestMessage[] = "Oh noes! I have crashed! 💩";
......
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