From 7c7aba6e5fef47a01a136be655b0a92cfd7090f6 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Fri, 16 Jun 2017 21:03:24 +0000 Subject: Vendor import of llvm trunk r305575: https://llvm.org/svn/llvm-project/llvm/trunk@305575 --- unittests/DebugInfo/PDB/HashTableTest.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'unittests/DebugInfo/PDB/HashTableTest.cpp') diff --git a/unittests/DebugInfo/PDB/HashTableTest.cpp b/unittests/DebugInfo/PDB/HashTableTest.cpp index 94c9ee86c4a6..f1968e55e86f 100644 --- a/unittests/DebugInfo/PDB/HashTableTest.cpp +++ b/unittests/DebugInfo/PDB/HashTableTest.cpp @@ -7,13 +7,13 @@ // //===----------------------------------------------------------------------===// -#include "ErrorChecking.h" -#include "gtest/gtest.h" - #include "llvm/DebugInfo/PDB/Native/HashTable.h" #include "llvm/Support/BinaryByteStream.h" #include "llvm/Support/BinaryStreamReader.h" #include "llvm/Support/BinaryStreamWriter.h" +#include "llvm/Testing/Support/Error.h" + +#include "gtest/gtest.h" #include @@ -150,13 +150,13 @@ TEST(HashTableTest, Serialization) { std::vector Buffer(Table.calculateSerializedLength()); MutableBinaryByteStream Stream(Buffer, little); BinaryStreamWriter Writer(Stream); - EXPECT_NO_ERROR(Table.commit(Writer)); + EXPECT_THAT_ERROR(Table.commit(Writer), Succeeded()); // We should have written precisely the number of bytes we calculated earlier. EXPECT_EQ(Buffer.size(), Writer.getOffset()); HashTableInternals Table2; BinaryStreamReader Reader(Stream); - EXPECT_NO_ERROR(Table2.load(Reader)); + EXPECT_THAT_ERROR(Table2.load(Reader), Succeeded()); // We should have read precisely the number of bytes we calculated earlier. EXPECT_EQ(Buffer.size(), Reader.getOffset()); -- cgit v1.3