AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Stop cctest/test-log/LogMaps from flaking on Windows.

Browse Source 
This patch disables the conditions that cause the test to flake, but
as a band-aid that doesn't fix the underlying issue.

Bug: v8:8084
Change-Id: I46380d0ce4f450c176583330ed760bc3b57b9edc
Reviewed-on: https://chromium-review.googlesource.com/1189822
Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
Commit-Queue: Bret Sepulveda <bsep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#55426}
This commit is contained in:
Bret Sepulveda 2018-08-27 11:17:21 +02:00 committed by Commit Bot
parent 99acd2c191
commit 43d6814585
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/cctest/test-log.cc
View File

@ -155,12 +155,16 @@ class ScopedLoggerInitializer {
start = IndexOfLine({search_term}, start); start = IndexOfLine({search_term}, start);
if (start == std::string::npos) break; if (start == std::string::npos) break;
std::vector<std::string> columns = Split(log_.at(start), ','); std::vector<std::string> columns = Split(log_.at(start), ',');
CHECK_LT(address_column, columns.size()); ++start; // Skip the found line.
// TODO(crbug.com/v8/8084): These two continue lines should really be
// errors. But on Windows the log is sometimes mysteriously cut off at the
// end. If the cut-off point happens to fall in the address field, the
// conditions will be triggered.
if (address_column >= columns.size()) continue;
uintptr_t address = uintptr_t address =
strtoll(columns.at(address_column).c_str(), nullptr, 16); strtoll(columns.at(address_column).c_str(), nullptr, 16);
CHECK_GT(address, 0); if (address == 0) continue;
result.insert(address); result.insert(address);
++start; // Skip the found line.
} }
return result; return result;
} }