Author: grimar
Date: Fri Sep 13 09:00:28 2019
New Revision: 371866
URL: http://llvm.org/viewvc/llvm-project?rev=371866&view=rev
Log:
[lldb] - Update unit tests after lib/ObjectYAML change.
An update after r371865
Modified:
lldb/trunk/unittests/Process/minidump/MinidumpParserTest.cpp
lldb/trunk/unittests/TestingSupport/TestUtilities.cpp
Modified: lldb/trunk/unittests/Process/minidump/MinidumpParserTest.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Process/minidump/MinidumpParserTest.cpp?rev=371866&r1=371865&r2=371866&view=diff
==============================================================================
--- lldb/trunk/unittests/Process/minidump/MinidumpParserTest.cpp (original)
+++ lldb/trunk/unittests/Process/minidump/MinidumpParserTest.cpp Fri Sep 13
09:00:28 2019
@@ -56,8 +56,9 @@ public:
std::string data;
llvm::raw_string_ostream os(data);
llvm::yaml::Input YIn(yaml);
- if (llvm::Error E = llvm::yaml::convertYAML(YIn, os))
- return E;
+ if (!llvm::yaml::convertYAML(YIn, os, [](const llvm::Twine &Msg) {}))
+ return llvm::createStringError(llvm::inconvertibleErrorCode(),
+ "convertYAML() failed");
os.flush();
auto data_buffer_sp =
@@ -83,7 +84,8 @@ Streams:
- Type: LinuxAuxv
Content: DEADBEEFBAADF00D
)");
- ASSERT_THAT_ERROR(llvm::yaml::convertYAML(YIn, os), llvm::Succeeded());
+
+ ASSERT_TRUE(llvm::yaml::convertYAML(YIn, os, [](const llvm::Twine &Msg){}));
os.flush();
auto data_buffer_sp = std::make_shared<DataBufferHeap>(
duplicate_streams.data(), duplicate_streams.size());
Modified: lldb/trunk/unittests/TestingSupport/TestUtilities.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/TestingSupport/TestUtilities.cpp?rev=371866&r1=371865&r2=371866&view=diff
==============================================================================
--- lldb/trunk/unittests/TestingSupport/TestUtilities.cpp (original)
+++ lldb/trunk/unittests/TestingSupport/TestUtilities.cpp Fri Sep 13 09:00:28
2019
@@ -39,8 +39,9 @@ llvm::Expected<TestFile> TestFile::fromY
{
llvm::raw_fd_ostream OS(FD, /*shouldClose*/ true);
llvm::yaml::Input YIn(Yaml);
- if (llvm::Error E = llvm::yaml::convertYAML(YIn, OS))
- return std::move(E);
+ if (!llvm::yaml::convertYAML(YIn, OS, [](const llvm::Twine &Msg) {}))
+ return llvm::createStringError(llvm::inconvertibleErrorCode(),
+ "convertYAML() failed");
}
return TestFile(Name, std::move(Remover));
}
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
