Clean up bitcode munging tests.

unittests/Bitcode/NaClMungeTest.h

Index: unittests/Bitcode/NaClMungeTest.h
diff --git a/unittests/Bitcode/NaClMungeTest.h b/unittests/Bitcode/NaClMungeTest.h
new file mode 100644
index 0000000000000000000000000000000000000000..53957770a84c68c576038ae3094939d5a43a3f1f
--- /dev/null
+++ b/unittests/Bitcode/NaClMungeTest.h
@@ -0,0 +1,41 @@
+//===- llvm/unittest/Bitcode/NaClMungeUtils.h - Test munging utils --------===//

[jvoung (off chromium), 2015/05/14 22:58:39]

NaClMungeUtils.h
->
NaClMungeTest.h

[Karl, 2015/05/18 16:02:38]

Done.

+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// Contains common utilities used in bitcode munge tests.
+
+#ifndef LLVM_UNITTEST_BITCODE_NACLMUNGEUTILS_H

[jvoung (off chromium), 2015/05/14 22:58:39]

NACLMUNGEUTILS
->
NACLMUNGETEST

[Karl, 2015/05/18 16:02:38]

Done.

+#define LLVM_UNITTEST_BITCODE_NACLMUNGEUTILS_H
+
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/Bitcode/NaCl/NaClBitcodeMunge.h"
+
+#include "gtest/gtest.h"
+
+namespace naclmungetest {
+
+const uint64_t Terminator = 0x5768798008978675LL;
+
+#define ARRAY(name) name, array_lengthof(name)
+
+#define ARRAY_TERM(name) ARRAY(name), Terminator
+
+inline std::string stringify(llvm::NaClMungedBitcode &MungedBitcode) {
+  std::string Buffer;
+  llvm::raw_string_ostream StrBuf(Buffer);
+  MungedBitcode.print(StrBuf);
+  return StrBuf.str();
+}
+
+inline std::string stringify(llvm::NaClBitcodeMunger &Munger) {
+  return stringify(Munger.getMungedBitcode());
+}
+
+} // end of namespace naclmungetest
+
+#endif // end LLVM_UNITTEST_BITCODE_NACLMUNGEUTILS_H

[jvoung (off chromium), 2015/05/14 22:58:39]

same

[Karl, 2015/05/18 16:02:38]

Done.