[lld] r194292 - [mach-o] revert gunk added to test cases to debug build bot failures

[Nick Kledzik]

Author: kledzik
Date: Fri Nov  8 17:18:51 2013
New Revision: 194292

URL: http://llvm.org/viewvc/llvm-project?rev=194292&view=rev
Log:
[mach-o] revert gunk added to test cases to debug build bot failures

Modified:
    lld/trunk/test/darwin/hello-world.objtxt
    lld/trunk/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp

Modified: lld/trunk/test/darwin/hello-world.objtxt
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/darwin/hello-world.objtxt?rev=194292&r1=194291&r2=194292&view=diff
==============================================================================
--- lld/trunk/test/darwin/hello-world.objtxt (original)
+++ lld/trunk/test/darwin/hello-world.objtxt Fri Nov  8 17:18:51 2013
@@ -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
 #

Modified: lld/trunk/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp?rev=194292&r1=194291&r2=194292&view=diff
==============================================================================
--- lld/trunk/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp (original)
+++ lld/trunk/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp Fri Nov  8 17:18:51 2013
@@ -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));