From 4b35a64cb10f16093601c0e3e3b2ea242b741c70 Mon Sep 17 00:00:00 2001 From: Pete Cooper Date: Mon, 4 Apr 2016 16:56:09 +0000 Subject: [PATCH] Fix test which failed Error migration on Windows bots. Note, this is https://llvm.org/bugs/show_bug.cgi?id=27187. The problem here was that just converting an error to a bool doesn't always set the checked bit. We only set that bit if the Error didn't actually contain an error. Otherwise we'd end potentially up silently dropping it. Instead just use the consumeError method which is designed to allow us to drop an error. llvm-svn: 265311 --- .../MachOTests/MachONormalizedFileBinaryReaderTests.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp b/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp index 923f61b546dc..277627e1e6c4 100644 --- a/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp +++ b/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp @@ -738,7 +738,6 @@ TEST(BinaryReaderTest, hello_obj_ppc) { auto ec = writeBinary(*f, "/tmp/foo.o"); // FIXME: We want to do EXPECT_FALSE(ec) but that fails on some Windows bots, // probably due to /tmp not being available. - // For now just check if an error happens as we need to mark it as checked. - bool failed = (bool)ec; - (void)failed; + // For now just consume the error without checking it. + consumeError(std::move(ec)); }