From fead4f794af191ac07bceaad67c4cc5a7decc9c0 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Fri, 6 May 2016 21:19:29 +0000 Subject: [PATCH] Fix failing test due to merge conflict. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@268798 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/DebugInfo/PDB/pdbdump-headers.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/DebugInfo/PDB/pdbdump-headers.test b/test/DebugInfo/PDB/pdbdump-headers.test index 6ac6813a5bc..dc5099be75a 100644 --- a/test/DebugInfo/PDB/pdbdump-headers.test +++ b/test/DebugInfo/PDB/pdbdump-headers.test @@ -1238,4 +1238,4 @@ ; BIG-NEXT: ] ; BIG-NEXT: } -; BAD-BLOCK-SIZE: The MSF superblock is in an invalid format. +; BAD-BLOCK-SIZE: The PDB file is corrupt. Does not contain superblock -- 2.50.1