Skip to content
Snippets Groups Projects
Commit f07f2cee authored by Pavel Labath's avatar Pavel Labath
Browse files

[lldb/unittest] Adjust CheckIPSupport function to avoid double-consume of llvm::Error

The problem caught by clang-tidy and reported by Tobias Bosch.
parent 5cee8ddc
No related branches found
No related tags found
No related merge requests found
...@@ -101,16 +101,19 @@ static bool CheckIPSupport(llvm::StringRef Proto, llvm::StringRef Addr) { ...@@ -101,16 +101,19 @@ static bool CheckIPSupport(llvm::StringRef Proto, llvm::StringRef Addr) {
"Creating a canary {0} TCP socket failed: {1}.", "Creating a canary {0} TCP socket failed: {1}.",
Proto, Err) Proto, Err)
.str(); .str();
if (Err.isA<llvm::ECError>() && bool HasAddrNotAvail = false;
errorToErrorCode(std::move(Err)) == handleAllErrors(std::move(Err), [&](std::unique_ptr<llvm::ECError> ECErr) {
std::make_error_code(std::errc::address_not_available)) { if (ECErr->convertToErrorCode() ==
std::make_error_code(std::errc::address_not_available))
HasAddrNotAvail = true;
});
if (HasAddrNotAvail) {
GTEST_LOG_(WARNING) GTEST_LOG_(WARNING)
<< llvm::formatv( << llvm::formatv(
"Assuming the host does not support {0}. Skipping test.", Proto) "Assuming the host does not support {0}. Skipping test.", Proto)
.str(); .str();
return false; return false;
} }
consumeError(std::move(Err));
GTEST_LOG_(WARNING) << "Continuing anyway. The test will probably fail."; GTEST_LOG_(WARNING) << "Continuing anyway. The test will probably fail.";
return true; return true;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment