Install notion of diagnostic handler into PNaCl bitcode readers.

unittests/Bitcode/NaClParseTypesTest.cpp

Index: unittests/Bitcode/NaClParseTypesTest.cpp
diff --git a/unittests/Bitcode/NaClParseTypesTest.cpp b/unittests/Bitcode/NaClParseTypesTest.cpp
index 605f7532764a44851869cf963fe6d2810bf29351..761ed4a5f1887de203d5f219c0eb5181009bdf0a 100644
--- a/unittests/Bitcode/NaClParseTypesTest.cpp
+++ b/unittests/Bitcode/NaClParseTypesTest.cpp
@@ -59,15 +59,10 @@ TEST(NaClParseTypesTest, BadTypeReferences) {
   const uint64_t AddSelfReference[] = {
     ReplaceIndex, NaClMungedBitcode::Replace, 3, 3, 1, Terminator
   };
-  EXPECT_FALSE(Munger.runTest(ARRAY(AddSelfReference), false));
-  EXPECT_EQ(
-      "Error: Record doesn't have expected size or structure\n",
-      Munger.getTestResults());
-  EXPECT_FALSE(Munger.runTest(ARRAY(AddSelfReference), true));
-  EXPECT_EQ(
-      "Error(40:2): Invalid TYPE_CODE_FLOAT record\n"
-      "Error: Record doesn't have expected size or structure\n",
-      Munger.getTestResults());
+  EXPECT_FALSE(Munger.runTest(ARRAY(AddSelfReference)));
+  EXPECT_EQ("Invalid TYPE_CODE_FLOAT record\n"
+            "Corrupted bitcode\n",
+            stripErrorPrefix(Munger.getTestResults()));

[Derek Schuff, 2015/08/24 22:46:04]

I don't exactly understand what this is testing for, but is it intentional that
you've reduced the number of tests from 2 to 1?

[Karl, 2015/08/25 16:15:48]

The history is related to what happened when the "verbose" option for parsing
was added to the bitcode parser, and simple "error_codes" were returned as
values.

When you ran the test in non-verbose mode (i.e. runTEST(.., false), you only got
the message from the "error_code" (which is quite generic). When you ran it in
verbose mode (i.e. runTest(.., True)), you also got the more descriptive error
messages as well.

It turns out that this test example was the only case that was exercising this
difference. Hence, I decided to simplify the runTest method to just always use
the diagnostic handler function to capture the more descriptive error messages,
and follow it with the corresponding error_code message. Hence, we now only have
one test.

 }
 
 } // end of namespace naclmungetest