Clean up unit munging unit tests using common NaCl API.

Makefile.standalone

@@ -259,6 +259,7 @@ $(UNITTEST_OBJS): $(OBJDIR)/unittest/%.o: unittest/%.cpp \
 	$(CXX) -c $(CXXFLAGS) \
 		-Isrc/ \
 		-I$(LLVM_SRC_PATH)/utils/unittest/googletest/include \
+		-I$(LLVM_SRC_PATH) \
 		-DGTEST_HAS_RTTI=0 -DGTEST_USE_OWN_TR1_TUPLE \
 		$< -o $@
 

unittest/BitcodeMunge.cpp

@@ -33,14 +33,14 @@ void IceTest::SubzeroBitcodeMunger::resetMungeFlags() {
   Flags.setVerbose(Ice::IceV_Instructions);
 }
 
-bool IceTest::SubzeroBitcodeMunger::runTest(const char *TestName,
-                                            const uint64_t Munges[],
+bool IceTest::SubzeroBitcodeMunger::runTest(const uint64_t Munges[],
                                             size_t MungeSize) {
   const bool AddHeader = true;
-  setupTest(TestName, Munges, MungeSize, AddHeader);
+  setupTest(Munges, MungeSize, AddHeader);
   Ice::GlobalContext Ctx(DumpStream, DumpStream, DumpStream, nullptr, Flags);
   Ice::PNaClTranslator Translator(&Ctx);
-  Translator.translateBuffer(TestName, MungedInput.get());
+  const char *BufferName = "Test";
+  Translator.translateBuffer(BufferName, MungedInput.get());
 
   cleanupTest();
   return Translator.getErrorStatus().value() == 0;

unittest/BitcodeMunge.h

@@ -36,12 +36,12 @@ public:
   /// Runs PNaClTranslator to translate bitcode records (with defined
   /// record Munges), and puts output into DumpResults. Returns true
   /// if parse is successful.
-  bool runTest(const char *TestName, const uint64_t Munges[], size_t MungeSize);
+  bool runTest(const uint64_t Munges[], size_t MungeSize);
 
   /// Same as above, but without any edits.
-  bool runTest(const char *TestName) {
+  bool runTest() {
     uint64_t NoMunges[] = {0};
-    return runTest(TestName, NoMunges, 0);
+    return runTest(NoMunges, 0);
   }
 
   /// Sets flags back to default assumptions for munging.