From 1b302289945dbffe4cc94c22edb65efac8e1e1b0 Mon Sep 17 00:00:00 2001
From: Nick Kledzik <kledzik@apple.com>
Date: Fri, 8 Nov 2013 23:18:51 +0000
Subject: [PATCH] [mach-o] revert gunk added to test cases to debug build bot
 failures

llvm-svn: 194292
---
 lld/test/darwin/hello-world.objtxt             |  2 +-
 .../MachONormalizedFileBinaryWriterTests.cpp   | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/lld/test/darwin/hello-world.objtxt b/lld/test/darwin/hello-world.objtxt
index 16eb69266ba9..df335c5ad4c8 100644
--- a/lld/test/darwin/hello-world.objtxt
+++ b/lld/test/darwin/hello-world.objtxt
@@ -1,5 +1,5 @@
 # RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t  && \
-# RUN: (llvm-nm %t | FileCheck %s) || (hexdump -C %t && false)
+# RUN: llvm-nm %t | FileCheck %s
 #
 # Test that hello-world can be linked into a mach-o executable
 #
diff --git a/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp b/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp
index 89529b7907bf..0f2d8d6f3b99 100644
--- a/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp
+++ b/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp
@@ -283,12 +283,6 @@ TEST(BinaryWriterTest, obj_relocs_x86) {
   EXPECT_EQ(N_UNDF, barUndef.type);
   EXPECT_EQ(SymbolScope(N_EXT), barUndef.scope);
   const Symbol& tbarUndef = f2->undefinedSymbols[1];
-  // BEGIN debug
-  if (!tbarUndef.name.equals("_tbar")) {
-    llvm::errs() << "obj_relocs_x86 _tbar is actually '" 
-                 << tbarUndef.name << "'\n";
-  }
-  // END debug
   EXPECT_TRUE(tbarUndef.name.equals("_tbar"));
   EXPECT_EQ(N_UNDF, tbarUndef.type);
   EXPECT_EQ(SymbolScope(N_EXT), tbarUndef.scope);
@@ -296,19 +290,7 @@ TEST(BinaryWriterTest, obj_relocs_x86) {
   EXPECT_EQ(1UL, f2->sections.size());
   const Section& text = f2->sections[0];
   EXPECT_TRUE(text.segmentName.equals("__TEXT"));
-  // BEGIN debug
-  if (!text.segmentName.equals("__TEXT")) {
-    llvm::errs() << "obj_relocs_x86 __TEXT is actually '" 
-                 << text.segmentName << "'\n";
-  }
-  // END debug
   EXPECT_TRUE(text.sectionName.equals("__text"));
-  // BEGIN debug
-  if (!text.sectionName.equals("__text")) {
-    llvm::errs() << "obj_relocs_x86 __text is actually '" 
-                 << text.sectionName << "'\n";
-  }
-  // END debug
   EXPECT_EQ(S_REGULAR, text.type);
   EXPECT_EQ(text.attributes,SectionAttr(S_ATTR_PURE_INSTRUCTIONS 
                                       | S_ATTR_SOME_INSTRUCTIONS));