feedback

Author: keith

llvm/test/tools/llvm-objcopy/MachO/install-name-tool.test

@@ -1,26 +1,19 @@
-## This test checks general llvm-install-name-tool behavior
+## This test checks general llvm-install-name-tool behavior.
 
 # RUN: yaml2obj %s -o %t
 
+## Passing something that doesn't exist
+# RUN: not llvm-install-name-tool -add_rpath foo non-existent-binary 2>&1 | FileCheck %s --check-prefix=DOES_NOT_EXIST
+
+# DOES_NOT_EXIST: {{.*}}non-existent-binary
+
 ## Passing a non-Mach-O binary
-# RUN: not llvm-install-name-tool -add_rpath foo %t 2>&1 | FileCheck %s --check-prefix=NON_MACH_O
+# RUN: not llvm-install-name-tool -add_rpath foo %t 2>&1 | FileCheck %s --check-prefix=NON_MACH_O -DFILE=%t
 
-# NON_MACH_O: llvm-install-name-tool: error: input file: {{.*}} is not a Mach-O file
+# NON_MACH_O: llvm-install-name-tool: error: input file: [[FILE]] is not a Mach-O file
 
 --- !ELF
 FileHeader:
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
   Type:            ET_EXEC
-  Machine:         EM_X86_64
-Sections:
-  - Name:            .bss
-    Type:            SHT_NOBITS
-    Flags:           [ SHF_ALLOC ]
-    AddressAlign:    0x0000000000000010
-    Size:            64
-  - Name:            .text
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-    AddressAlign:    0x0000000000000010
-    Content:         "00000000"

llvm/tools/llvm-objcopy/ObjcopyOptions.cpp

@@ -27,6 +27,7 @@
 
 using namespace llvm;
 using namespace llvm::objcopy;
+using namespace llvm::object;
 using namespace llvm::opt;
 
 namespace {
@@ -1243,8 +1244,8 @@ objcopy::parseInstallNameToolOptions(ArrayRef<const char *> ArgsArr) {
   Config.InputFilename = Positional[0];
   Config.OutputFilename = Positional[0];
 
-  Expected<llvm::object::OwningBinary<llvm::object::Binary>> BinaryOrErr =
-      llvm::object::createBinary(Config.InputFilename);
+  Expected<OwningBinary<Binary>> BinaryOrErr =
+      createBinary(Config.InputFilename);
   if (!BinaryOrErr)
     return createFileError(Config.InputFilename, BinaryOrErr.takeError());
   auto *Binary = (*BinaryOrErr).getBinary();