[Lldb-commits] [lldb] r369379 - Convert minidump unittests to use llvm::yaml::convertYAML

[Pavel Labath via lldb-commits]

Author: labath
Date: Tue Aug 20 05:53:42 2019
New Revision: 369379

URL: http://llvm.org/viewvc/llvm-project?rev=369379&view=rev
Log:
Convert minidump unittests to use llvm::yaml::convertYAML

previously they used a minidump-specific function for this purpose, but
this is no longer needed now that whole of yaml2obj is available as a
library.

Modified:
    lldb/trunk/unittests/Process/minidump/MinidumpParserTest.cpp

Modified: lldb/trunk/unittests/Process/minidump/MinidumpParserTest.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Process/minidump/MinidumpParserTest.cpp?rev=369379&r1=369378&r2=369379&view=diff
==============================================================================
--- lldb/trunk/unittests/Process/minidump/MinidumpParserTest.cpp (original)
+++ lldb/trunk/unittests/Process/minidump/MinidumpParserTest.cpp Tue Aug 20 05:53:42 2019
@@ -19,10 +19,11 @@
 #include "lldb/Utility/FileSpec.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/Optional.h"
-#include "llvm/ObjectYAML/MinidumpYAML.h"
+#include "llvm/ObjectYAML/yaml2obj.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Path.h"
+#include "llvm/Support/YAMLTraits.h"
 #include "llvm/Testing/Support/Error.h"
 #include "gtest/gtest.h"
 
@@ -54,7 +55,8 @@ public:
   llvm::Error SetUpFromYaml(llvm::StringRef yaml) {
     std::string data;
     llvm::raw_string_ostream os(data);
-    if (llvm::Error E = llvm::MinidumpYAML::writeAsBinary(yaml, os))
+    llvm::yaml::Input YIn(yaml);
+    if (llvm::Error E = llvm::yaml::convertYAML(YIn, os))
       return E;
 
     os.flush();
@@ -73,16 +75,15 @@ public:
 TEST_F(MinidumpParserTest, InvalidMinidump) {
   std::string duplicate_streams;
   llvm::raw_string_ostream os(duplicate_streams);
-  ASSERT_THAT_ERROR(llvm::MinidumpYAML::writeAsBinary(R"(
+  llvm::yaml::Input YIn(R"(
 --- !minidump
 Streams:
   - Type:            LinuxAuxv
     Content:         DEADBEEFBAADF00D
   - Type:            LinuxAuxv
     Content:         DEADBEEFBAADF00D
-  )",
-                                                      os),
-                    llvm::Succeeded());
+  )");
+  ASSERT_THAT_ERROR(llvm::yaml::convertYAML(YIn, os), llvm::Succeeded());
   os.flush();
   auto data_buffer_sp = std::make_shared<DataBufferHeap>(
       duplicate_streams.data(), duplicate_streams.size());