Skip to content

Commit 936309e

Browse files
compnerdcompnerd
committed
test: adjust quoting of arguments
When running the tests with a toolchain built with the "early swift driver", we would incorrectly process the command line, losing the empty string argument to `-sdk` which would then incorrectly process the remainder of the command line. This allows most of the remaining tests to pass with the early swift driver on Windows (assuming that the paths are adjusted properly).
1 parent 8a6a5d3 commit 936309e

File tree

6 files changed

+74
-74
lines changed

6 files changed

+74
-74
lines changed

‎test/Driver/driver_mode.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %swift_driver_plain --driver-mode=swiftc -sdk "" -driver-print-actions %s 2>&1 | %FileCheck -check-prefix=CHECK-SWIFTC-%target-object-format %s
2-
// RUN: %swift_driver_plain -sdk "" -driver-print-actions %s --driver-mode=swiftc 2>&1 | %FileCheck -check-prefix=CHECK-SWIFT %s
1+
// RUN: %swift_driver_plain --driver-mode=swiftc -sdk '""' -driver-print-actions %s 2>&1 | %FileCheck -check-prefix=CHECK-SWIFTC-%target-object-format %s
2+
// RUN: %swift_driver_plain -sdk '""' -driver-print-actions %s --driver-mode=swiftc 2>&1 | %FileCheck -check-prefix=CHECK-SWIFT %s
33

44
// CHECK-SWIFTC-macho: 0: input, "{{.*}}driver_mode.swift", swift
55
// CHECK-SWIFTC-macho: 1: compile, {0}, object

‎test/Driver/infer-simulator.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Test the inference of the "simulator" environment within the driver.
22

3-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-ios11.0 %s > %t.simple.txt 2>&1
3+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -target x86_64-apple-ios11.0 %s > %t.simple.txt 2>&1
44
// RUN: %FileCheck -check-prefix WARN_IOS_SIMULATOR %s < %t.simple.txt
55
// WARN_IOS_SIMULATOR: warning: inferring simulator environment for target 'x86_64-apple-ios11.0'; use '-target x86_64-apple-ios11.0-simulator' instead
66

7-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-tvos10.0 %s > %t.simple.txt 2>&1
7+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -target x86_64-apple-tvos10.0 %s > %t.simple.txt 2>&1
88
// RUN: %FileCheck -check-prefix WARN_TVOS_SIMULATOR %s < %t.simple.txt
99
// WARN_TVOS_SIMULATOR: inferring simulator environment for target 'x86_64-apple-tvos10.0'; use '-target x86_64-apple-tvos10.0-simulator' instead
1010

11-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target i386-apple-watchos4.0 %s > %t.simple.txt 2>&1
11+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -target i386-apple-watchos4.0 %s > %t.simple.txt 2>&1
1212
// RUN: %FileCheck -check-prefix WARN_WATCHOS_SIMULATOR %s < %t.simple.txt
1313
// WARN_WATCHOS_SIMULATOR: warning: inferring simulator environment for target 'i386-apple-watchos4.0'; use '-target i386-apple-watchos4.0-simulator' instead

‎test/Driver/linker-library-with-space.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-unknown-linux-gnu -Ffoo -Fsystem car -F cdr -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.linux.txt
1+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -target x86_64-unknown-linux-gnu -Ffoo -Fsystem car -F cdr -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.linux.txt
22
// RUN: %FileCheck -check-prefix LINUX-lib-flag-space %s < %t.linux.txt
33

44
// LINUX-lib-flag-space: swift

‎test/Driver/os-deployment.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
// RUN: not %swiftc_driver -sdk "" -target x86_64-apple-macosx10.8 %s 2>&1 | %FileCheck --check-prefix=CHECK-OSX %s
2-
// RUN: not %swiftc_driver -sdk "" -target x86_64-apple-ios6.0 %s 2>&1 | %FileCheck --check-prefix=CHECK-IOS %s
3-
// RUN: not %swiftc_driver -sdk "" -target x86_64-apple-tvos8.0 %s 2>&1 | %FileCheck --check-prefix=CHECK-tvOS %s
4-
// RUN: not %swiftc_driver -sdk "" -target x86_64-apple-watchos1.0 %s 2>&1 | %FileCheck --check-prefix=CHECK-watchOS %s
1+
// RUN: not %swiftc_driver -sdk '""' -target x86_64-apple-macosx10.8 %s 2>&1 | %FileCheck --check-prefix=CHECK-OSX %s
2+
// RUN: not %swiftc_driver -sdk '""' -target x86_64-apple-ios6.0 %s 2>&1 | %FileCheck --check-prefix=CHECK-IOS %s
3+
// RUN: not %swiftc_driver -sdk '""' -target x86_64-apple-tvos8.0 %s 2>&1 | %FileCheck --check-prefix=CHECK-tvOS %s
4+
// RUN: not %swiftc_driver -sdk '""' -target x86_64-apple-watchos1.0 %s 2>&1 | %FileCheck --check-prefix=CHECK-watchOS %s
55

6-
// RUN: not %swiftc_driver -sdk "" -target i386-apple-ios11.0 %s -### 2>&1 | %FileCheck --check-prefix=CHECK-IOS-11 %s
7-
// RUN: not %swiftc_driver -sdk "" -target armv7-apple-ios11.0 %s -### 2>&1 | %FileCheck --check-prefix=CHECK-IOS-11 %s
8-
// RUN: not %swiftc_driver -sdk "" -target i386-apple-ios12.0 %s -### 2>&1 | %FileCheck --check-prefix=CHECK-IOS-12 %s
9-
// RUN: not %swiftc_driver -sdk "" -target armv7-apple-ios12.0 %s -### 2>&1 | %FileCheck --check-prefix=CHECK-IOS-12 %s
10-
// RUN: %swiftc_driver -sdk "" -target i386-apple-ios10.3 %s -### >/dev/null
11-
// RUN: %swiftc_driver -sdk "" -target armv7-apple-ios10.3 %s -### >/dev/null
12-
// RUN: %swiftc_driver -sdk "" -target x86_64-apple-ios11.0 %s -### >/dev/null
13-
// RUN: %swiftc_driver -sdk "" -target arm64-apple-ios11.0 %s -### >/dev/null
6+
// RUN: not %swiftc_driver -sdk '""' -target i386-apple-ios11.0 %s -### 2>&1 | %FileCheck --check-prefix=CHECK-IOS-11 %s
7+
// RUN: not %swiftc_driver -sdk '""' -target armv7-apple-ios11.0 %s -### 2>&1 | %FileCheck --check-prefix=CHECK-IOS-11 %s
8+
// RUN: not %swiftc_driver -sdk '""' -target i386-apple-ios12.0 %s -### 2>&1 | %FileCheck --check-prefix=CHECK-IOS-12 %s
9+
// RUN: not %swiftc_driver -sdk '""' -target armv7-apple-ios12.0 %s -### 2>&1 | %FileCheck --check-prefix=CHECK-IOS-12 %s
10+
// RUN: %swiftc_driver -sdk '""' -target i386-apple-ios10.3 %s -### >/dev/null
11+
// RUN: %swiftc_driver -sdk '""' -target armv7-apple-ios10.3 %s -### >/dev/null
12+
// RUN: %swiftc_driver -sdk '""' -target x86_64-apple-ios11.0 %s -### >/dev/null
13+
// RUN: %swiftc_driver -sdk '""' -target arm64-apple-ios11.0 %s -### >/dev/null
1414

1515

1616
// CHECK-OSX: Swift requires a minimum deployment target of OS X 10.9

‎test/Driver/profiling.swift

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=CHECK -check-prefix=OSX %s
1+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -profile-generate -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=CHECK -check-prefix=OSX %s
22

3-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target x86_64-apple-ios7.1-simulator -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=IOS %s
4-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target arm64-apple-ios7.1 -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=IOS %s
3+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -profile-generate -target x86_64-apple-ios7.1-simulator -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=IOS %s
4+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -profile-generate -target arm64-apple-ios7.1 -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=IOS %s
55

6-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target x86_64-apple-ios7.1-simulator -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=IOSSIM %s
7-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target arm64-apple-ios7.1 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=IOS %s
6+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -profile-generate -target x86_64-apple-ios7.1-simulator -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=IOSSIM %s
7+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -profile-generate -target arm64-apple-ios7.1 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=IOS %s
88

9-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target x86_64-apple-tvos9.0-simulator -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=tvOS %s
10-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target arm64-apple-tvos9.0 -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=tvOS %s
9+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -profile-generate -target x86_64-apple-tvos9.0-simulator -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=tvOS %s
10+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -profile-generate -target arm64-apple-tvos9.0 -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=tvOS %s
1111

12-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target x86_64-apple-tvos9.0-simulator -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=tvOS_SIM %s
13-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target arm64-apple-tvos9.0 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=tvOS %s
12+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -profile-generate -target x86_64-apple-tvos9.0-simulator -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=tvOS_SIM %s
13+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -profile-generate -target arm64-apple-tvos9.0 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=tvOS %s
1414

15-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target i386-apple-watchos2.0-simulator -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=watchOS %s
16-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target armv7k-apple-watchos2.0 -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=watchOS %s
17-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target i386-apple-watchos2.0-simulator -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=watchOS_SIM %s
18-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target armv7k-apple-watchos2.0 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=watchOS %s
15+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -profile-generate -target i386-apple-watchos2.0-simulator -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=watchOS %s
16+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -profile-generate -target armv7k-apple-watchos2.0 -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=watchOS %s
17+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -profile-generate -target i386-apple-watchos2.0-simulator -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=watchOS_SIM %s
18+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -profile-generate -target armv7k-apple-watchos2.0 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=watchOS %s
1919

20-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target x86_64-unknown-linux-gnu %s | %FileCheck -check-prefix=CHECK -check-prefix=LINUX %s
21-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target x86_64-unknown-windows-msvc %s | %FileCheck -check-prefix=CHECK -check-prefix=WINDOWS %s
20+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -profile-generate -target x86_64-unknown-linux-gnu %s | %FileCheck -check-prefix=CHECK -check-prefix=LINUX %s
21+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -profile-generate -target x86_64-unknown-windows-msvc %s | %FileCheck -check-prefix=CHECK -check-prefix=WINDOWS %s
2222

23-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target wasm32-unknown-wasi -resource-dir %S/Inputs/fake-resource-dir/lib/swift_static %s | %FileCheck -check-prefix CHECK -check-prefix WASI %s
23+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -profile-generate -target wasm32-unknown-wasi -resource-dir %S/Inputs/fake-resource-dir/lib/swift_static %s | %FileCheck -check-prefix CHECK -check-prefix WASI %s
2424

2525
// CHECK: swift
2626
// CHECK: -profile-generate
@@ -58,12 +58,12 @@
5858
// WASI: lib{{(\\\\|/)}}{{swift|swift_static}}{{(\\\\|/)}}clang{{(\\\\|/)}}lib{{(\\\\|/)}}wasi{{(\\\\|/)}}libclang_rt.profile-wasm32.a
5959
// WASI: -u__llvm_profile_runtime
6060

61-
// RUN: not %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -profile-use=/dev/null %s 2>&1 | %FileCheck -check-prefix=MIX_GEN_USE %s
61+
// RUN: not %swiftc_driver -sdk '""' -driver-print-jobs -profile-generate -profile-use=/dev/null %s 2>&1 | %FileCheck -check-prefix=MIX_GEN_USE %s
6262
// MIX_GEN_USE: conflicting options '-profile-generate' and '-profile-use'
6363

64-
// RUN: not %swiftc_driver -sdk "" -driver-print-jobs -profile-use=%t.does_not_exist %s 2>&1 | %FileCheck -check-prefix=USE_MISSING_FILE %s
64+
// RUN: not %swiftc_driver -sdk '""' -driver-print-jobs -profile-use=%t.does_not_exist %s 2>&1 | %FileCheck -check-prefix=USE_MISSING_FILE %s
6565
// USE_MISSING_FILE: no profdata file exists at '{{[^']+}}.does_not_exist'
6666

67-
// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-use=/dev/null %s | %FileCheck -check-prefix=USE_DEVNULL %s
67+
// RUN: %swiftc_driver -sdk '""' -driver-print-jobs -profile-use=/dev/null %s | %FileCheck -check-prefix=USE_DEVNULL %s
6868
// USE_DEVNULL: swift
6969
// USE_DEVNULL: -profile-use={{/dev/null|(.*profiling-[^ ]*.o)}}

0 commit comments

Comments
 (0)