Skip to content

Commit 86802fd

Browse files
int3int3
committed
[lld-macho][test] Hyphenate lit's check-prefixes
For consistency.
1 parent 0edc92e commit 86802fd

File tree

3 files changed

+79
-79
lines changed

3 files changed

+79
-79
lines changed

‎lld/test/MachO/lc-build-version.s

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,67 +2,67 @@
22

33
# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
44

5-
# RUN: %lld -platform_version macos 10.14 10.15 -o %t.macos_10_14 %t.o
6-
# RUN: llvm-objdump --macho --all-headers %t.macos_10_14 | FileCheck %s --check-prefix=MACOS_10_14
5+
# RUN: %lld -platform_version macos 10.14 10.15 -o %t.macos-10-14 %t.o
6+
# RUN: llvm-objdump --macho --all-headers %t.macos-10-14 | FileCheck %s --check-prefix=MACOS-10-14
77

8-
# MACOS_10_14: cmd LC_BUILD_VERSION
9-
# MACOS_10_14-NEXT: cmdsize 32
10-
# MACOS_10_14-NEXT: platform macos
11-
# MACOS_10_14-NEXT: sdk 10.15
12-
# MACOS_10_14-NEXT: minos 10.14
13-
# MACOS_10_14-NEXT: ntools 1
14-
# MACOS_10_14-NEXT: tool ld
15-
# MACOS_10_14-NEXT: version {{[0-9\.]+}}
8+
# MACOS-10-14: cmd LC_BUILD_VERSION
9+
# MACOS-10-14-NEXT: cmdsize 32
10+
# MACOS-10-14-NEXT: platform macos
11+
# MACOS-10-14-NEXT: sdk 10.15
12+
# MACOS-10-14-NEXT: minos 10.14
13+
# MACOS-10-14-NEXT: ntools 1
14+
# MACOS-10-14-NEXT: tool ld
15+
# MACOS-10-14-NEXT: version {{[0-9\.]+}}
1616

17-
# RUN: %lld -platform_version macos 10.13 10.15 -o %t.macos_10_13 %t.o
18-
# RUN: llvm-objdump --macho --all-headers %t.macos_10_13 | FileCheck %s --check-prefix=MACOS_10_13
17+
# RUN: %lld -platform_version macos 10.13 10.15 -o %t.macos-10-13 %t.o
18+
# RUN: llvm-objdump --macho --all-headers %t.macos-10-13 | FileCheck %s --check-prefix=MACOS-10-13
1919

20-
# MACOS_10_13: cmd LC_VERSION_MIN_MACOSX
21-
# MACOS_10_13-NEXT: cmdsize 16
22-
# MACOS_10_13-NEXT: version 10.13
23-
# MACOS_10_13-NEXT: sdk 10.15
20+
# MACOS-10-13: cmd LC_VERSION_MIN_MACOSX
21+
# MACOS-10-13-NEXT: cmdsize 16
22+
# MACOS-10-13-NEXT: version 10.13
23+
# MACOS-10-13-NEXT: sdk 10.15
2424

25-
# RUN: %no-arg-lld -arch x86_64 -platform_version ios 12.0 10.15 -o %t.ios_12_0 %t.o
26-
# RUN: llvm-objdump --macho --all-headers %t.ios_12_0 | FileCheck %s --check-prefix=IOS_12_0
27-
# RUN: %no-arg-lld -arch x86_64 -platform_version ios-simulator 13.0 10.15 -o %t.ios_sim_13_0 %t.o
28-
# RUN: llvm-objdump --macho --all-headers %t.ios_sim_13_0 | FileCheck %s --check-prefix=IOS_12_0
25+
# RUN: %no-arg-lld -arch x86_64 -platform_version ios 12.0 10.15 -o %t.ios-12-0 %t.o
26+
# RUN: llvm-objdump --macho --all-headers %t.ios-12-0 | FileCheck %s --check-prefix=IOS-12-0
27+
# RUN: %no-arg-lld -arch x86_64 -platform_version ios-simulator 13.0 10.15 -o %t.ios-sim-13-0 %t.o
28+
# RUN: llvm-objdump --macho --all-headers %t.ios-sim-13-0 | FileCheck %s --check-prefix=IOS-12-0
2929

30-
# IOS_12_0: cmd LC_BUILD_VERSION
30+
# IOS-12-0: cmd LC_BUILD_VERSION
3131

32-
# RUN: %no-arg-lld -arch x86_64 -platform_version ios 11.0 10.15 -o %t.ios_11_0 %t.o
33-
# RUN: llvm-objdump --macho --all-headers %t.ios_11_0 | FileCheck %s --check-prefix=IOS_11_0
34-
# RUN: %no-arg-lld -arch x86_64 -platform_version ios-simulator 12.0 10.15 -o %t.ios_sim_12_0 %t.o
35-
# RUN: llvm-objdump --macho --all-headers %t.ios_sim_12_0 | FileCheck %s --check-prefix=IOS_11_0
32+
# RUN: %no-arg-lld -arch x86_64 -platform_version ios 11.0 10.15 -o %t.ios-11-0 %t.o
33+
# RUN: llvm-objdump --macho --all-headers %t.ios-11-0 | FileCheck %s --check-prefix=IOS-11-0
34+
# RUN: %no-arg-lld -arch x86_64 -platform_version ios-simulator 12.0 10.15 -o %t.ios-sim-12-0 %t.o
35+
# RUN: llvm-objdump --macho --all-headers %t.ios-sim-12-0 | FileCheck %s --check-prefix=IOS-11-0
3636

37-
# IOS_11_0: cmd LC_VERSION_MIN_IPHONEOS
37+
# IOS-11-0: cmd LC_VERSION_MIN_IPHONEOS
3838

39-
# RUN: %no-arg-lld -arch x86_64 -platform_version tvos 12.0 10.15 -o %t.tvos_12_0 %t.o
40-
# RUN: llvm-objdump --macho --all-headers %t.tvos_12_0 | FileCheck %s --check-prefix=TVOS_12_0
41-
# RUN: %no-arg-lld -arch x86_64 -platform_version tvos-simulator 13.0 10.15 -o %t.tvos_sim_13_0 %t.o
42-
# RUN: llvm-objdump --macho --all-headers %t.tvos_sim_13_0 | FileCheck %s --check-prefix=TVOS_12_0
39+
# RUN: %no-arg-lld -arch x86_64 -platform_version tvos 12.0 10.15 -o %t.tvos-12-0 %t.o
40+
# RUN: llvm-objdump --macho --all-headers %t.tvos-12-0 | FileCheck %s --check-prefix=TVOS-12-0
41+
# RUN: %no-arg-lld -arch x86_64 -platform_version tvos-simulator 13.0 10.15 -o %t.tvos-sim-13-0 %t.o
42+
# RUN: llvm-objdump --macho --all-headers %t.tvos-sim-13-0 | FileCheck %s --check-prefix=TVOS-12-0
4343

44-
# TVOS_12_0: cmd LC_BUILD_VERSION
44+
# TVOS-12-0: cmd LC_BUILD_VERSION
4545

46-
# RUN: %no-arg-lld -arch x86_64 -platform_version tvos 11.0 10.15 -o %t.tvos_11_0 %t.o
47-
# RUN: llvm-objdump --macho --all-headers %t.tvos_11_0 | FileCheck %s --check-prefix=TVOS_11_0
48-
# RUN: %no-arg-lld -arch x86_64 -platform_version tvos-simulator 12.0 10.15 -o %t.tvos_sim_12_0 %t.o
49-
# RUN: llvm-objdump --macho --all-headers %t.tvos_sim_12_0 | FileCheck %s --check-prefix=TVOS_11_0
46+
# RUN: %no-arg-lld -arch x86_64 -platform_version tvos 11.0 10.15 -o %t.tvos-11-0 %t.o
47+
# RUN: llvm-objdump --macho --all-headers %t.tvos-11-0 | FileCheck %s --check-prefix=TVOS-11-0
48+
# RUN: %no-arg-lld -arch x86_64 -platform_version tvos-simulator 12.0 10.15 -o %t.tvos-sim-12-0 %t.o
49+
# RUN: llvm-objdump --macho --all-headers %t.tvos-sim-12-0 | FileCheck %s --check-prefix=TVOS-11-0
5050

51-
# TVOS_11_0: cmd LC_VERSION_MIN_TVOS
51+
# TVOS-11-0: cmd LC_VERSION_MIN_TVOS
5252

53-
# RUN: %no-arg-lld -arch x86_64 -platform_version watchos 5.0 10.15 -o %t.watchos_5_0 %t.o
54-
# RUN: llvm-objdump --macho --all-headers %t.watchos_5_0 | FileCheck %s --check-prefix=WATCHOS_5_0
55-
# RUN: %no-arg-lld -arch x86_64 -platform_version watchos-simulator 6.0 10.15 -o %t.watchos_sim_6_0 %t.o
56-
# RUN: llvm-objdump --macho --all-headers %t.watchos_sim_6_0 | FileCheck %s --check-prefix=WATCHOS_5_0
53+
# RUN: %no-arg-lld -arch x86_64 -platform_version watchos 5.0 10.15 -o %t.watchos-5-0 %t.o
54+
# RUN: llvm-objdump --macho --all-headers %t.watchos-5-0 | FileCheck %s --check-prefix=WATCHOS-5-0
55+
# RUN: %no-arg-lld -arch x86_64 -platform_version watchos-simulator 6.0 10.15 -o %t.watchos-sim-6-0 %t.o
56+
# RUN: llvm-objdump --macho --all-headers %t.watchos-sim-6-0 | FileCheck %s --check-prefix=WATCHOS-5-0
5757

58-
# WATCHOS_5_0: cmd LC_BUILD_VERSION
58+
# WATCHOS-5-0: cmd LC_BUILD_VERSION
5959

60-
# RUN: %no-arg-lld -arch x86_64 -platform_version watchos 4.0 10.15 -o %t.watchos_4_0 %t.o
61-
# RUN: llvm-objdump --macho --all-headers %t.watchos_4_0 | FileCheck %s --check-prefix=WATCHOS_4_0
62-
# RUN: %no-arg-lld -arch x86_64 -platform_version watchos-simulator 5.0 10.15 -o %t.watchos_sim_5_0 %t.o
63-
# RUN: llvm-objdump --macho --all-headers %t.watchos_sim_5_0 | FileCheck %s --check-prefix=WATCHOS_4_0
60+
# RUN: %no-arg-lld -arch x86_64 -platform_version watchos 4.0 10.15 -o %t.watchos-4-0 %t.o
61+
# RUN: llvm-objdump --macho --all-headers %t.watchos-4-0 | FileCheck %s --check-prefix=WATCHOS-4-0
62+
# RUN: %no-arg-lld -arch x86_64 -platform_version watchos-simulator 5.0 10.15 -o %t.watchos-sim-5-0 %t.o
63+
# RUN: llvm-objdump --macho --all-headers %t.watchos-sim-5-0 | FileCheck %s --check-prefix=WATCHOS-4-0
6464

65-
# WATCHOS_4_0: cmd LC_VERSION_MIN_WATCHOS
65+
# WATCHOS-4-0: cmd LC_VERSION_MIN_WATCHOS
6666

6767
.text
6868
.global _main

‎lld/test/MachO/lc-linker-option.ll

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
; FRAME-NEXT: cmdsize
1313
; FRAME-NEXT: name /System/Library/Frameworks/CoreFoundation.framework/CoreFoundation
1414

15-
; RUN: not %lld %t/framework.o -o %t/frame_no_autolink -ignore_auto_link 2>&1 | FileCheck --check-prefix=NO_AUTOLINK %s
16-
; RUN: not %lld %t/framework.o -o %t/frame_no_autolink --ignore-auto-link-option CoreFoundation 2>&1 | FileCheck --check-prefix=NO_AUTOLINK %s
17-
; RUN: not %lld %t/framework.o -o %t/frame_no_autolink --ignore-auto-link-option=CoreFoundation 2>&1 | FileCheck --check-prefix=NO_AUTOLINK %s
18-
; NO_AUTOLINK: error: undefined symbol: __CFBigNumGetInt128
15+
; RUN: not %lld %t/framework.o -o %t/frame_no_autolink -ignore_auto_link 2>&1 | FileCheck --check-prefix=NO-AUTOLINK %s
16+
; RUN: not %lld %t/framework.o -o %t/frame_no_autolink --ignore-auto-link-option CoreFoundation 2>&1 | FileCheck --check-prefix=NO-AUTOLINK %s
17+
; RUN: not %lld %t/framework.o -o %t/frame_no_autolink --ignore-auto-link-option=CoreFoundation 2>&1 | FileCheck --check-prefix=NO-AUTOLINK %s
18+
; NO-AUTOLINK: error: undefined symbol: __CFBigNumGetInt128
1919

2020
; RUN: llvm-as %t/l.ll -o %t/l.o
2121
;; The dynamic call to _CFBigNumGetInt128 uses dyld_stub_binder,
@@ -87,39 +87,39 @@
8787

8888
;; Make sure -all_load has effect when libraries are loaded via LC_LINKER_OPTION flags and explicitly passed as well
8989
; RUN: %lld -all_load %t/load-framework-foo.o %t/load-library-foo.o %t/main.o -o %t/main -F%t -L%t -lfoo
90-
; RUN: llvm-objdump --macho --syms %t/main | FileCheck %s --check-prefix=SYMS_ALL_LOAD
90+
; RUN: llvm-objdump --macho --syms %t/main | FileCheck %s --check-prefix=SYMS-ALL-LOAD
9191

9292
;; Note that _OBJC_CLASS_$_TestClass is *included* here.
93-
; SYMS_ALL_LOAD: SYMBOL TABLE:
94-
; SYMS_ALL_LOAD-NEXT: g F __TEXT,__text _main
95-
; SYMS_ALL_LOAD-NEXT: g O __DATA,__objc_data _OBJC_CLASS_$_TestClass
96-
; SYMS_ALL_LOAD-NEXT: g F __TEXT,__text __mh_execute_header
97-
; SYMS_ALL_LOAD-NEXT: *UND* dyld_stub_binder
98-
; SYMS_ALL_LOAD-EMPTY:
93+
; SYMS-ALL-LOAD: SYMBOL TABLE:
94+
; SYMS-ALL-LOAD-NEXT: g F __TEXT,__text _main
95+
; SYMS-ALL-LOAD-NEXT: g O __DATA,__objc_data _OBJC_CLASS_$_TestClass
96+
; SYMS-ALL-LOAD-NEXT: g F __TEXT,__text __mh_execute_header
97+
; SYMS-ALL-LOAD-NEXT: *UND* dyld_stub_binder
98+
; SYMS-ALL-LOAD-EMPTY:
9999

100100
;; Make sure -force_load has effect when libraries are loaded via LC_LINKER_OPTION flags and explicitly passed as well
101101
; RUN: %lld %t/load-library-foo.o %t/main.o -o %t/main -F%t -L%t -force_load %t/libfoo.a
102-
; RUN: llvm-objdump --macho --syms %t/main | FileCheck %s --check-prefix=SYMS_FORCE_LOAD
102+
; RUN: llvm-objdump --macho --syms %t/main | FileCheck %s --check-prefix=SYMS-FORCE-LOAD
103103

104104
;; Note that _OBJC_CLASS_$_TestClass is *included* here.
105-
; SYMS_FORCE_LOAD: SYMBOL TABLE:
106-
; SYMS_FORCE_LOAD-NEXT: g F __TEXT,__text _main
107-
; SYMS_FORCE_LOAD-NEXT: g O __DATA,__objc_data _OBJC_CLASS_$_TestClass
108-
; SYMS_FORCE_LOAD-NEXT: g F __TEXT,__text __mh_execute_header
109-
; SYMS_FORCE_LOAD-NEXT: *UND* dyld_stub_binder
110-
; SYMS_FORCE_LOAD-EMPTY:
105+
; SYMS-FORCE-LOAD: SYMBOL TABLE:
106+
; SYMS-FORCE-LOAD-NEXT: g F __TEXT,__text _main
107+
; SYMS-FORCE-LOAD-NEXT: g O __DATA,__objc_data _OBJC_CLASS_$_TestClass
108+
; SYMS-FORCE-LOAD-NEXT: g F __TEXT,__text __mh_execute_header
109+
; SYMS-FORCE-LOAD-NEXT: *UND* dyld_stub_binder
110+
; SYMS-FORCE-LOAD-EMPTY:
111111

112112
;; Make sure -ObjC has effect when frameworks are loaded via LC_LINKER_OPTION flags and explicitly passed as well
113113
; RUN: %lld -ObjC %t/load-framework-foo.o %t/load-library-foo.o %t/main.o -o %t/main -F%t -L%t -framework Foo
114-
; RUN: llvm-objdump --macho --syms %t/main | FileCheck %s --check-prefix=SYMS_OBJC_LOAD
114+
; RUN: llvm-objdump --macho --syms %t/main | FileCheck %s --check-prefix=SYMS-OBJC-LOAD
115115

116116
;; Note that _OBJC_CLASS_$_TestClass is *included* here.
117-
; SYMS_OBJC_LOAD: SYMBOL TABLE:
118-
; SYMS_OBJC_LOAD-NEXT: g F __TEXT,__text _main
119-
; SYMS_OBJC_LOAD-NEXT: g O __DATA,__objc_data _OBJC_CLASS_$_TestClass
120-
; SYMS_OBJC_LOAD-NEXT: g F __TEXT,__text __mh_execute_header
121-
; SYMS_OBJC_LOAD-NEXT: *UND* dyld_stub_binder
122-
; SYMS_OBJC_LOAD-EMPTY:
117+
; SYMS-OBJC-LOAD: SYMBOL TABLE:
118+
; SYMS-OBJC-LOAD-NEXT: g F __TEXT,__text _main
119+
; SYMS-OBJC-LOAD-NEXT: g O __DATA,__objc_data _OBJC_CLASS_$_TestClass
120+
; SYMS-OBJC-LOAD-NEXT: g F __TEXT,__text __mh_execute_header
121+
; SYMS-OBJC-LOAD-NEXT: *UND* dyld_stub_binder
122+
; SYMS-OBJC-LOAD-EMPTY:
123123

124124
;; Make sure that frameworks containing object files or bitcode instead of
125125
;; dylibs or archives do not cause duplicate symbol errors

‎lld/test/MachO/local-symbol-output.s

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@
1313
# CONFLICT: error: cannot use both -non_global_symbols_no_strip_list and -non_global_symbols_strip_list
1414

1515
## Check that -x causes none of the local symbols to be emitted.
16-
# RUN: %lld %t/main.o -x -o %t/no_local.out
17-
# RUN: llvm-nm %t/no_local.out | FileCheck --check-prefix NO_LOCAL %s
16+
# RUN: %lld %t/main.o -x -o %t/NO-LOCAL.out
17+
# RUN: llvm-nm %t/NO-LOCAL.out | FileCheck --check-prefix NO-LOCAL %s
1818

19-
# NO_LOCAL-NOT: t _foo
20-
# NO_LOCAL-NOT: t _bar
21-
# NO_LOCAL-NOT: t _baz
22-
# NO_LOCAL: T _main
19+
# NO-LOCAL-NOT: t _foo
20+
# NO-LOCAL-NOT: t _bar
21+
# NO-LOCAL-NOT: t _baz
22+
# NO-LOCAL: T _main
2323

2424
## Check that when using -x with -non_global_symbols_no_strip_list, whichever appears
2525
## last in the command line arg list will take precedence.
2626
# RUN: %lld %t/main.o -x -non_global_symbols_no_strip_list %t/foo.txt -o %t/x_then_no_strip.out
2727
# RUN: llvm-nm %t/x_then_no_strip.out | FileCheck --check-prefix X-NO-STRIP %s
2828

2929
# RUN: %lld %t/main.o -non_global_symbols_no_strip_list %t/foo.txt -x -o %t/no_strip_then_x.out
30-
# RUN: llvm-nm %t/no_strip_then_x.out | FileCheck --check-prefix NO_LOCAL %s
30+
# RUN: llvm-nm %t/no_strip_then_x.out | FileCheck --check-prefix NO-LOCAL %s
3131

3232
# X-NO-STRIP-NOT: t _bar
3333
# X-NO-STRIP-DAG: t _foo
@@ -51,7 +51,7 @@
5151
# RUN: llvm-nm %t/x_then_strip.out | FileCheck --check-prefix X-STRIP %s
5252

5353
# RUN: %lld %t/main.o -non_global_symbols_strip_list %t/foo.txt -x -o %t/strip_then_x.out
54-
# RUN: llvm-nm %t/no_strip_then_x.out | FileCheck --check-prefix NO_LOCAL %s
54+
# RUN: llvm-nm %t/no_strip_then_x.out | FileCheck --check-prefix NO-LOCAL %s
5555

5656
# X-STRIP-NOT: t _foo
5757
# X-STRIP-DAG: t _bar

0 commit comments

Comments
 (0)