Commit 5d11e7f8 authored by Greg Clayton's avatar Greg Clayton
Browse files

Revert "Fix GSYM tests to run the yaml files and fix test failures on some machines." 

This reverts commit d334ce0b.
parent 1a52d3d4

llvm/test/tools/llvm-gsymutil/lit.local.cfg

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
config.suffixes = ['.test', '.yaml']

llvm/tools/llvm-gsym/llvm-gsymutil.cpp

+3 −6
Original line number Diff line number Diff line
@@ -179,8 +179,7 @@ static bool filterArch(MachOObjectFile &Obj) { 
  if (ArchFilters.empty())

    return true;



  Triple ObjTriple(Obj.getArchTriple());

  StringRef ObjArch = ObjTriple.getArchName();

  StringRef ObjArch = Obj.getArchTriple().getArchName();



  for (auto Arch : ArchFilters) {

    // Match name.
@@ -351,8 +350,7 @@ static llvm::Error handleBuffer(StringRef Filename, MemoryBufferRef Buffer, 
  error(Filename, errorToErrorCode(BinOrErr.takeError()));



  if (auto *Obj = dyn_cast<ObjectFile>(BinOrErr->get())) {

    Triple ObjTriple(Obj->makeTriple());

    auto ArchName = ObjTriple.getArchName();

    auto ArchName = Obj->makeTriple().getArchName();

    outs() << "Output file (" << ArchName << "): " << OutFile << "\n";

    if (auto Err = handleObjectFile(*Obj, OutFile.c_str()))

      return Err;
@@ -376,8 +374,7 @@ static llvm::Error handleBuffer(StringRef Filename, MemoryBufferRef Buffer, 


    // Now handle each architecture we need to convert.

    for (auto &Obj: FilterObjs) {

      Triple ObjTriple(Obj->getArchTriple());

      auto ArchName = ObjTriple.getArchName();

      auto ArchName = Obj->getArchTriple().getArchName();

      std::string ArchOutFile(OutFile);

      // If we are only handling a single architecture, then we will use the

      // normal output file. If we are handling multiple architectures append