Skip to content

Commit 9ea94d1

Browse files
phoebewangphoebewang
committed
Add concrete target triple to codeview tests
1 parent e6a326d commit 9ea94d1

File tree

5 files changed

+36
-40
lines changed

5 files changed

+36
-40
lines changed

‎clang/test/Driver/cl-options.c

+12
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,18 @@
545545
// RTTI-NOT: "-fno-rtti-data"
546546
// RTTI-NOT: "-fno-rtti"
547547

548+
// RUN: %clang_cl -target x86_64-windows /Zi /c -### -- %s 2>&1 | FileCheck -check-prefix=Zi %s
549+
// Zi: "-gcodeview"
550+
// Zi: "-debug-info-kind=constructor"
551+
552+
// RUN: %clang_cl -target x86_64-windows /Z7 /c -### -- %s 2>&1 | FileCheck -check-prefix=Z7 %s
553+
// Z7: "-gcodeview"
554+
// Z7: "-debug-info-kind=constructor"
555+
556+
// RUN: %clang_cl -target x86_64-windows -gline-tables-only /c -### -- %s 2>&1 | FileCheck -check-prefix=ZGMLT %s
557+
// ZGMLT: "-gcodeview"
558+
// ZGMLT: "-debug-info-kind=line-tables-only"
559+
548560
// RUN: %clang_cl /c -### -- %s 2>&1 | FileCheck -check-prefix=BreproDefault %s
549561
// BreproDefault: "-mincremental-linker-compatible"
550562

‎clang/test/Driver/cl-outputs.c

+12
Original file line numberDiff line numberDiff line change
@@ -294,3 +294,15 @@
294294
// RUN: %clang_cl /P /Fifoo.x /obar.x -### -- %s 2>&1 | FileCheck -check-prefix=FioRACE2 %s
295295
// FioRACE2: "-E"
296296
// FioRACE2: "-o" "foo.x"
297+
298+
// RUN: %clang_cl -target x86_64-windows /Z7 /Foa.obj -### -- %s 2>&1 | FileCheck -check-prefix=ABSOLUTE_OBJPATH %s
299+
// ABSOLUTE_OBJPATH: "-object-file-name={{.*}}a.obj"
300+
301+
// RUN: %clang_cl -target x86_64-windows -fdebug-compilation-dir=. /Z7 /Foa.obj -### -- %s 2>&1 | FileCheck -check-prefix=RELATIVE_OBJPATH1 %s
302+
// RELATIVE_OBJPATH1: "-object-file-name=a.obj"
303+
304+
// RUN: %clang_cl -target x86_64-windows -fdebug-compilation-dir=. /Z7 /Fo:a.obj -### -- %s 2>&1 | FileCheck -check-prefix=RELATIVE_OBJPATH1_COLON %s
305+
// RELATIVE_OBJPATH1_COLON: "-object-file-name=a.obj"
306+
307+
// RUN: %clang_cl -target x86_64-windows -fdebug-compilation-dir=. /Z7 /Fofoo/a.obj -### -- %s 2>&1 | FileCheck -check-prefix=RELATIVE_OBJPATH2 %s
308+
// RELATIVE_OBJPATH2: "-object-file-name=foo\\a.obj"

‎clang/test/Driver/gcodeview-command-line.c

+6-31
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,19 @@
11
// Note: %s must be preceded by --, otherwise it may be interpreted as a
22
// command-line option, e.g. on Mac where %s is commonly under /Users.
3-
// REQUIRES: coff-supported-target
43

54
// ON-NOT: "-gno-codview-commandline"
65
// OFF: "-gno-codeview-command-line"
76

87
// default
9-
// RUN: %clang_cl /Z7 -### -- %s 2>&1 | FileCheck -check-prefix=ON %s
8+
// RUN: %clang_cl -target x86_64-windows /Z7 -### -- %s 2>&1 | FileCheck -check-prefix=ON %s
109
// enabled
11-
// RUN: %clang_cl /Z7 -gno-codeview-command-line -gcodeview-command-line -### -- %s 2>&1 | FileCheck -check-prefix=ON %s
10+
// RUN: %clang_cl -target x86_64-windows /Z7 -gno-codeview-command-line -gcodeview-command-line -### -- %s 2>&1 | FileCheck -check-prefix=ON %s
1211
// disabled
13-
// RUN: %clang_cl /Z7 -gcodeview-command-line -gno-codeview-command-line -### -- %s 2>&1 | FileCheck -check-prefix=OFF %s
12+
// RUN: %clang_cl -target x86_64-windows /Z7 -gcodeview-command-line -gno-codeview-command-line -### -- %s 2>&1 | FileCheck -check-prefix=OFF %s
1413

1514
// enabled, no /Z7
16-
// RUN: %clang_cl -gcodeview-command-line -### -- %s 2>&1 | FileCheck -check-prefix=ON %s
15+
// RUN: %clang_cl -target x86_64-windows -gcodeview-command-line -### -- %s 2>&1 | FileCheck -check-prefix=ON %s
1716

1817
// GCC-style driver
19-
// RUN: %clang -g -gcodeview -gno-codeview-command-line -gcodeview-command-line -### -- %s 2>&1 | FileCheck -check-prefix=ON %s
20-
// RUN: %clang -g -gcodeview -gcodeview-command-line -gno-codeview-command-line -### -- %s 2>&1 | FileCheck -check-prefix=OFF %s
21-
22-
// RUN: %clang_cl /Zi /c -### -- %s 2>&1 | FileCheck -check-prefix=Zi %s
23-
// Zi: "-gcodeview"
24-
// Zi: "-debug-info-kind=constructor"
25-
26-
// RUN: %clang_cl /Z7 /c -### -- %s 2>&1 | FileCheck -check-prefix=Z7 %s
27-
// Z7: "-gcodeview"
28-
// Z7: "-debug-info-kind=constructor"
29-
30-
// RUN: %clang_cl -gline-tables-only /c -### -- %s 2>&1 | FileCheck -check-prefix=ZGMLT %s
31-
// ZGMLT: "-gcodeview"
32-
// ZGMLT: "-debug-info-kind=line-tables-only"
33-
34-
// RUN: %clang_cl /Z7 /Foa.obj -### -- %s 2>&1 | FileCheck -check-prefix=ABSOLUTE_OBJPATH %s
35-
// ABSOLUTE_OBJPATH: "-object-file-name={{.*}}a.obj"
36-
37-
// RUN: %clang_cl -fdebug-compilation-dir=. /Z7 /Foa.obj -### -- %s 2>&1 | FileCheck -check-prefix=RELATIVE_OBJPATH1 %s
38-
// RELATIVE_OBJPATH1: "-object-file-name=a.obj"
39-
40-
// RUN: %clang_cl -fdebug-compilation-dir=. /Z7 /Fo:a.obj -### -- %s 2>&1 | FileCheck -check-prefix=RELATIVE_OBJPATH1_COLON %s
41-
// RELATIVE_OBJPATH1_COLON: "-object-file-name=a.obj"
42-
43-
// RUN: %clang_cl -fdebug-compilation-dir=. /Z7 /Fofoo/a.obj -### -- %s 2>&1 | FileCheck -check-prefix=RELATIVE_OBJPATH2 %s
44-
// RELATIVE_OBJPATH2: "-object-file-name=foo\\a.obj"
18+
// RUN: %clang -target x86_64-windows -g -gcodeview -gno-codeview-command-line -gcodeview-command-line -### -- %s 2>&1 | FileCheck -check-prefix=ON %s
19+
// RUN: %clang -target x86_64-windows -g -gcodeview -gcodeview-command-line -gno-codeview-command-line -### -- %s 2>&1 | FileCheck -check-prefix=OFF %s

‎clang/test/Driver/gcodeview-ghash.c

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
// Note: %s must be preceded by --, otherwise it may be interpreted as a
22
// command-line option, e.g. on Mac where %s is commonly under /Users.
3-
// REQUIRES: coff-supported-target
43

54
// GHASH: "-gcodeview-ghash"
65
// NO_GHASH-NOT: "-gcodeview-ghash"
76

87
// default
9-
// RUN: %clang_cl /Z7 -### -- %s 2>&1 | FileCheck -check-prefix=NO_GHASH %s
8+
// RUN: %clang_cl -target x86_64-windows /Z7 -### -- %s 2>&1 | FileCheck -check-prefix=NO_GHASH %s
109
// enabled
11-
// RUN: %clang_cl /Z7 -gcodeview-ghash -### -- %s 2>&1 | FileCheck -check-prefix=GHASH %s
10+
// RUN: %clang_cl -target x86_64-windows /Z7 -gcodeview-ghash -### -- %s 2>&1 | FileCheck -check-prefix=GHASH %s
1211
// disabled
13-
// RUN: %clang_cl /Z7 -gcodeview-ghash -gno-codeview-ghash -### -- %s 2>&1 | FileCheck -check-prefix=NO_GHASH %s
12+
// RUN: %clang_cl -target x86_64-windows /Z7 -gcodeview-ghash -gno-codeview-ghash -### -- %s 2>&1 | FileCheck -check-prefix=NO_GHASH %s
1413

1514
// enabled, no /Z7
16-
// RUN: %clang_cl -gcodeview-ghash -### -- %s 2>&1 | FileCheck -check-prefix=NO_GHASH %s
15+
// RUN: %clang_cl -target x86_64-windows -gcodeview-ghash -### -- %s 2>&1 | FileCheck -check-prefix=NO_GHASH %s
1716

1817
// GCC-style driver
19-
// RUN: %clang -g -gcodeview -gcodeview-ghash -### -- %s 2>&1 | FileCheck -check-prefix=GHASH %s
20-
// RUN: %clang -g -gcodeview -gcodeview-ghash -gno-codeview-ghash -### -- %s 2>&1 | FileCheck -check-prefix=NO_GHASH %s
18+
// RUN: %clang -target x86_64-windows -g -gcodeview -gcodeview-ghash -### -- %s 2>&1 | FileCheck -check-prefix=GHASH %s
19+
// RUN: %clang -target x86_64-windows -g -gcodeview -gcodeview-ghash -gno-codeview-ghash -### -- %s 2>&1 | FileCheck -check-prefix=NO_GHASH %s

‎clang/test/lit.cfg.py

-2
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,6 @@ def is_filesystem_case_insensitive():
285285
if any(config.target_triple.startswith(x) for x in known_arches):
286286
config.available_features.add("clang-target-64-bits")
287287

288-
if re.match(r"^(aarch64-|arm|x86).*-windows-msvc$", config.target_triple):
289-
config.available_features.add("coff-supported-target")
290288

291289
def calculate_arch_features(arch_string):
292290
features = []

0 commit comments

Comments
 (0)