[lld-macho][easy] Use substitution for test

[int3]

Summary

Depends on D77006.

[MaskRay]

I like the idea but this patch means we should do this with the initial patch D75382.

[int3]

I have half a dozen commits (with tests in all of them) since then. Rebasing-splitting this would be a lot of work

[int3]

rebase

[ruiu]

I'm actually not in favor of this change as I want to keep test files self-contained. I'd stick with lld -flavor darwinnew. Once the new lld/mach-o is ready, you can run sed with s/lld -flavor darwinnew/lld.ld64/g to replace all occurrences of lld -flavor darwinnew. So I don't see a need for abstraction here.

[int3]

Manual line wrapping is kind of a chore, and since we don't have an autoformatter for these files, we'd end up with lines that are too short after doing that sed operation. Plus I was also considering adding -Z to the base %lld substitution to ensure that we never write tests which accidentally depend on system libraries.

[ruiu]

In D77086#1953958, @int3 wrote:

Manual line wrapping is kind of a chore, and since we don't have an autoformatter for these files, we'd end up with lines that are too short after doing that sed operation. Plus I was also considering adding -Z to the base %lld substitution to ensure that we never write tests which accidentally depend on system libraries.

We are not strictly enforcing the 80 column rule to the test files, so having long lines are fine for now.

Regarding -Z, shouldn't we turn on that flag whenever LLD_IN_TEST environment variable is set? It's the catch-all flag to change the linker's behavior whenever running in the test environment.

[int3]

Okay, fair enough

lld/test/MachO/alignment-too-large.yaml

 # RUN: yaml2obj %s -o %t.o
-# RUN: not lld -flavor darwinnew -o %t %t.o 2>&1 | FileCheck %s
+# RUN: not %lld -o %t %t.o 2>&1 | FileCheck %s
 #
 # CHECK: alignment 32 of section __text is too large
 --- !mach-o
 FileHeader:
   magic:           0xFEEDFACF
   cputype:         0x01000007
   cpusubtype:      0x00000003
   filetype:        0x00000001

lld/test/MachO/arch.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-darwin %s -o %t.o
-# RUN: lld -flavor darwinnew -arch x86_64 -o /dev/null %t.o
-# RUN: not lld -flavor darwinnew -arch i386 -o /dev/null %t.o 2>&1 | FileCheck %s
+# RUN: %lld -arch x86_64 -o /dev/null %t.o
+# RUN: not %lld -arch i386 -o /dev/null %t.o 2>&1 | FileCheck %s
 # CHECK: missing or unsupported -arch i386
 
 .text
 .global _main
 _main:
   mov $0, %rax
   ret

lld/test/MachO/duplicate-symbol.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t-dup.o
-# RUN: not lld -flavor darwinnew -o /dev/null %t-dup.o %t.o 2>&1 | FileCheck %s
+# RUN: not %lld -o /dev/null %t-dup.o %t.o 2>&1 | FileCheck %s
 
 # CHECK: duplicate symbol: _main
 
 .text
 .global _main
 _main:
   mov $0, %rax
   ret

lld/test/MachO/dylib.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
 
-# RUN: lld -flavor darwinnew -dylib -install_name @executable_path/libfoo.dylib \
-# RUN:   %t.o -o %t.dylib
+# RUN: %lld -dylib -install_name @executable_path/libfoo.dylib %t.o -o %t.dylib
 # CHECK:     cmd: LC_ID_DYLIB
 # CHECK-NOT: cmd:
 # CHECK:     PayloadString: '@executable_path/libfoo.dylib'
 
 ## Check that -e is a no-op when -dylib is also passed.
-# RUN: lld -flavor darwinnew -dylib %t.o -o %t.dylib -e missing_entry
+# RUN: %lld -dylib %t.o -o %t.dylib -e missing_entry
 # RUN: obj2yaml %t.dylib | FileCheck %s -DOUTPUT=%t.dylib --check-prefix=DEFAULT-INSTALL-NAME
 # DEFAULT-INSTALL-NAME:     cmd: LC_ID_DYLIB
 # DEFAULT-INSTALL-NAME-NOT: cmd:
 # DEFAULT-INSTALL-NAME:     PayloadString: '[[OUTPUT]]'
 
 ## Check for the absence of load commands / segments that should not be in a
 ## dylib.
 # RUN: obj2yaml %t.dylib | FileCheck %s --check-prefix=NCHECK

lld/test/MachO/dylink.s

 # REQUIRES: x86
 # RUN: mkdir -p %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %p/Inputs/libhello.s \
 # RUN:   -o %t/libhello.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %p/Inputs/libgoodbye.s \
 # RUN:   -o %t/libgoodbye.o
-# RUN: lld -flavor darwinnew -dylib -install_name \
-# RUN:   @executable_path/libhello.dylib %t/libhello.o -o %t/libhello.dylib
-# RUN: lld -flavor darwinnew -dylib -install_name \
-# RUN:   @executable_path/libgoodbye.dylib %t/libgoodbye.o -o %t/libgoodbye.dylib
+# RUN: %lld -dylib -install_name @executable_path/libhello.dylib \
+# RUN:   %t/libhello.o -o %t/libhello.dylib
+# RUN: %lld -dylib -install_name @executable_path/libgoodbye.dylib \
+# RUN:   %t/libgoodbye.o -o %t/libgoodbye.dylib
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/dylink.o
-# RUN: lld -flavor darwinnew -o %t/dylink -Z -L%t -lhello -lgoodbye %t/dylink.o
+# RUN: %lld -o %t/dylink -Z -L%t -lhello -lgoodbye %t/dylink.o
 # RUN: llvm-objdump --bind -d %t/dylink | FileCheck %s
 
 # CHECK: movq [[#%u, HELLO_OFF:]](%rip), %rsi
 # CHECK-NEXT: [[#%x, HELLO_RIP:]]:
 
 # CHECK: movq [[#%u, HELLO_ITS_ME_OFF:]](%rip), %rsi
 # CHECK-NEXT: [[#%x, HELLO_ITS_ME_RIP:]]:
 

lld/test/MachO/entry-symbol.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
-# RUN: lld -flavor darwinnew -o /dev/null %t.o -e _not_main
-# RUN: not lld -flavor darwinnew -o /dev/null %t.o -e _missing 2>&1 | FileCheck %s
-# RUN: not lld -flavor darwinnew -o /dev/null %t.o 2>&1 | FileCheck %s --check-prefix=DEFAULT_ENTRY
+# RUN: %lld -o /dev/null %t.o -e _not_main
+# RUN: not %lld -o /dev/null %t.o -e _missing 2>&1 | FileCheck %s
+# RUN: not %lld -o /dev/null %t.o 2>&1 | FileCheck %s --check-prefix=DEFAULT_ENTRY
 
 # CHECK: undefined symbol: _missing
 # DEFAULT_ENTRY: undefined symbol: _main
 
 .text
 .global _not_main
 _not_main:
   ret

lld/test/MachO/export-trie.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
-# RUN: lld -flavor darwinnew -dylib %t.o -o %t.dylib
+# RUN: %lld -dylib %t.o -o %t.dylib
 
 # RUN: llvm-objdump --exports-trie -d %t.dylib | FileCheck %s --check-prefix=EXPORTS
 # EXPORTS-LABEL: Exports trie:
 # EXPORTS-DAG: _hello_world
 # EXPORTS-DAG: _hello_its_me
 # EXPORTS-DAG: _hello_its_you
 ## TODO: once we support proper symtab entries, add a check here to ensure
 ## export trie addresses match symtab addresses.

lld/test/MachO/fat-arch.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=i386-apple-darwin %s -o %t.i386.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.x86_64.o
 # RUN: llvm-lipo %t.i386.o %t.x86_64.o -create -o %t.fat.o
-# RUN: lld -flavor darwinnew -arch x86_64 -o /dev/null %t.fat.o
+# RUN: %lld -arch x86_64 -o /dev/null %t.fat.o
 
 # RUN: llvm-lipo %t.i386.o -create -o %t.noarch.o
-# RUN: not lld -flavor darwinnew -arch x86_64 -o /dev/null %t.noarch.o 2>&1 | \
+# RUN: not %lld -arch x86_64 -o /dev/null %t.noarch.o 2>&1 | \
 # RUN:    FileCheck %s -DFILE=%t.noarch.o
 # CHECK: Unable to find matching architecture in [[FILE]]
 # CHECK: undefined symbol: _main
 
 .text
 .global _main
 _main:
   mov $0, %eax
   ret

lld/test/MachO/invalid-executable.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-darwin %s -o %t.o
-# RUN: lld -flavor darwinnew -o %t %t.o
-# RUN: not lld -flavor darwinnew -o /dev/null %t 2>&1 | FileCheck %s
+# RUN: %lld -o %t %t.o
+# RUN: not %lld -o /dev/null %t 2>&1 | FileCheck %s
 # CHECK: unhandled file type
 
 .text
 .global _main
 _main:
   mov $0, %rax
   ret

lld/test/MachO/lit.local.cfg

+config.substitutions += [
+    ('%lld', 'lld -flavor darwinnew'),
+]

lld/test/MachO/load-commands.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
-# RUN: lld -flavor darwinnew -o %t %t.o
+# RUN: %lld -o %t %t.o
 
 ## Check for the presence of load commands that are essential for a working
 ## executable.
 # RUN: obj2yaml %t | FileCheck %s
 # CHECK-DAG: cmd: LC_DYLD_INFO_ONLY
 # CHECK-DAG: cmd: LC_SYMTAB
 # CHECK-DAG: cmd: LC_DYSYMTAB
 # CHECK-DAG: cmd: LC_MAIN

lld/test/MachO/missing-dylib.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
-# RUN: not lld -flavor darwinnew -Z -o %t -lmissing %t.o 2>&1 | FileCheck %s
+# RUN: not %lld -Z -o %t -lmissing %t.o 2>&1 | FileCheck %s
 
 # CHECK: library not found for -lmissing

lld/test/MachO/no-exports-dylib.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
-# RUN: lld -flavor darwinnew -dylib %t.o -o %t.dylib
+# RUN: %lld -dylib %t.o -o %t.dylib
 
 # RUN: obj2yaml %t.dylib | FileCheck %s
 # CHECK: export_size: 0

lld/test/MachO/no-id-dylink.s

 # REQUIRES: x86
 # RUN: mkdir -p %t
 # RUN: yaml2obj %p/Inputs/no-id-dylib.yaml -o %t/libnoid.dylib
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/no-id-dylink.o
-# RUN: not lld -flavor darwinnew -o %t/no-id-dylink -Z -L%t -lnoid %t/no-id-dylink.o 2>&1 | FileCheck %s
+# RUN: not %lld -o %t/no-id-dylink -Z -L%t -lnoid %t/no-id-dylink.o 2>&1 | FileCheck %s
 # CHECK: dylib {{.*}}libnoid.dylib missing LC_ID_DYLIB load command
 
 .text
 .globl _main
 
 _main:
   mov $0, %rax
   ret

lld/test/MachO/no-such-file.s

 # REQUIRES: x86
-# RUN: not lld -flavor darwinnew -o /dev/null %t-no-such-file.o 2>&1 | FileCheck %s
+# RUN: not %lld -o /dev/null %t-no-such-file.o 2>&1 | FileCheck %s
 
 # CHECK: cannot open {{.*}}no-such-file.o

lld/test/MachO/relocations.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
-# RUN: lld -flavor darwinnew -o %t %t.o
+# RUN: %lld -o %t %t.o
 # RUN: llvm-objdump -d %t | FileCheck %s
 
 # CHECK: leaq 17(%rip), %rsi
 
 .section __TEXT,__text
 .globl _main
 _main:
   movl $0x2000004, %eax # write() syscall

lld/test/MachO/section-headers.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
-# RUN: lld -flavor darwinnew -o %t %t.o
+# RUN: %lld -o %t %t.o
 # RUN: llvm-readobj --section-headers %t | FileCheck %s
 
 # CHECK:      Name: __text
 # CHECK-NEXT: Segment: __TEXT
 # CHECK-NOT:  }
 # CHECK:      Alignment: 1
 # CHECK-NOT:  }
 # CHECK:      Type: Regular (0x0)

lld/test/MachO/segments.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
-# RUN: lld -flavor darwinnew -o %t %t.o
+# RUN: %lld -o %t %t.o
 # RUN: llvm-readobj --macho-segment %t | FileCheck %s
 
 ## These two segments must always be present at the start of an executable.
 # CHECK-NOT:  Segment {
 # CHECK:      Segment {
 # CHECK:        Cmd: LC_SEGMENT_64
 # CHECK:        Name: __PAGEZERO
 # CHECK:        Size: 72

lld/test/MachO/silent-ignore.test

-RUN: lld -flavor darwinnew -v \
+RUN: %lld -v \
 RUN:   -demangle \
 RUN:   -dynamic \
 RUN:   -no_deduplicate \
 RUN:   -lto_library /lib/foo \
 RUN:   -macosx_version_min 0
-RUN: not lld -flavor darwinnew -v --not-an-ignored-argument 2>&1 | FileCheck %s
+RUN: not %lld -v --not-an-ignored-argument 2>&1 | FileCheck %s
 CHECK: unknown argument: --not-an-ignored-argument