[llvm] r268798 - Fix failing test due to merge conflict.

Zachary Turner via llvm-commits llvm-commits at lists.llvm.org
Fri May 6 14:19:30 PDT 2016


Author: zturner
Date: Fri May  6 16:19:29 2016
New Revision: 268798

URL: http://llvm.org/viewvc/llvm-project?rev=268798&view=rev
Log:
Fix failing test due to merge conflict.

Modified:
    llvm/trunk/test/DebugInfo/PDB/pdbdump-headers.test

Modified: llvm/trunk/test/DebugInfo/PDB/pdbdump-headers.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/PDB/pdbdump-headers.test?rev=268798&r1=268797&r2=268798&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/PDB/pdbdump-headers.test (original)
+++ llvm/trunk/test/DebugInfo/PDB/pdbdump-headers.test Fri May  6 16:19:29 2016
@@ -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




More information about the llvm-commits mailing list