Skip to content

Commit f855764

Browse files
committed
test: make the static library test actually test something
It was previously capturing the output but not checking it. Actually validate the output. Fix the windows invocation check. Ensure that we disable the logo for the librarian on Windows.
1 parent 79c909d commit f855764

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

test/Driver/static-archive.swift

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
1-
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -emit-library %s -module-name ARCHIVER -static 2>&1 > %t.macos.txt
1+
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -emit-library %s -module-name ARCHIVER -static 2>&1 | %FileCheck -check-prefix CHECK-MACOS %s
22

3-
// CHECK: swift
4-
// CHECK: -o [[OBJECTFILE:.*]]
3+
// CHECK-MACOS: swift
4+
// CHECK-MACOS: -o [[OBJECTFILE:.*]]
55

6-
// CHECK-NEXT: {{(bin/)?}}libtool{{"? }} -static
7-
// CHECK-DAG: [[OBJECTFILE]]
8-
// CHECK: -o {{[^ ]+}}
6+
// CHECK-MACOS-NEXT: {{(bin/)?}}libtool{{"?}} -static
7+
// CHECK-MACOS-DAG: [[OBJECTFILE]]
8+
// CHECK-MACOS: -o {{[^ ]+}}
99

10-
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-linux-gnu -emit-library %s -module-name ARCHIVER -static 2>&1 > %t.linux.txt
10+
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-linux-gnu -emit-library %s -module-name ARCHIVER -static 2>&1 | %FileCheck -check-prefix CHECK-LINUX %s
1111

12-
// CHECK: swift
13-
// CHECK: -o [[OBJECTFILE:.*]]
12+
// CHECK-LINUX: swift
13+
// CHECK-LINUX: -o [[OBJECTFILE:.*]]
1414

15-
// CHECK-NEXT: {{(bin/)?}}{{(llvm-)?}}ar{{"? }} crs
16-
// CHECK-NEXT: {{[^ ]+}}
15+
// CHECK-LINUX: {{(bin/)?(llvm-)?}}ar{{"?}} crs
1716

18-
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-windows-msvc -emit-library %s -module-name ARCHIVER -static 2>&1 > %t.windows.txt
17+
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-windows-msvc -emit-library %s -module-name ARCHIVER -static 2>&1 | %FileCheck -check-prefix CHECK-WINDOWS %s
1918

20-
// CHECK: swift
21-
// CHECK: -o [[OBJECTFILE:.*]]
19+
// CHECK-WINDOWS: swift
20+
// CHECK-WINDOWS: -o [[OBJECTFILE:.*]]
2221

23-
// CHECK-NEXT: lib -link
24-
// CHECK-DAG: [[OBJECTFILE]]
25-
// CHECK: /OUT:{{[^ ]+}}
22+
// CHECK-WINDOWS-NEXT: link{{(.exe)?"?}} -lib
23+
// CHECK-WINDOWS-DAG: [[OBJECTFILE]]
24+
// CHECK-WINDOWS: /OUT:{{[^ ]+}}
2625

2726
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -emit-library %s -module-name ARCHIVER -static | %FileCheck -check-prefix INFERRED_NAME_DARWIN %s
2827
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-linux-gnu -emit-library %s -module-name ARCHIVER -static | %FileCheck -check-prefix INFERRED_NAME_LINUX %s

0 commit comments

Comments
 (0)