Merge pull request #23040 from jmittert/Use-The-Force-Luke-16

Fix Unicode Tests on Windows

Author: jrose-apple

test/Driver/Inputs/unicode-filenames.rsp

@@ -0,0 +1 @@
+𝔼-file-01.swift  😂-file-02.swift Ω-file-03.swift

test/Driver/Inputs/unicode.txt

@@ -0,0 +1 @@
+你好.swift

test/Driver/batch_mode_with_supplementary_filelist_unicode.swift

@@ -1,9 +1,27 @@
 // RUN: %empty-directory(%t)
 // RUN: echo 'print("Hello, World!")' >%t/main.swift
-// RUN: touch %t/𝔼-file-01.swift %t/😂-file-02.swift %t/Ω-file-03.swift
+// RUN: echo "" > %t/𝔼-file-01.swift 
+// RUN: echo "" > %t/😂-file-02.swift 
+// RUN: echo "" > %t/Ω-file-03.swift
 //
 // If the supplementary output file map does not escape the characters in the
 // source files, the frontend won't recognize the desired outputs.
 //
-// RUN: cd %t && %target-build-swift -c -emit-dependencies -serialize-diagnostics -driver-filelist-threshold=0 -j2 main.swift  𝔼-file-01.swift 😂-file-02.swift Ω-file-03.swift -module-name mod
-// RUN: cd %t && test -e 😂-file-02.d -a -e 😂-file-02.dia -a -e 😂-file-02.o -a -e 😂-file-02.swift -a -e 𝔼-file-01.d -a -e 𝔼-file-01.dia -a -e 𝔼-file-01.o -a -e 𝔼-file-01.swift -a -e main.d -a -e main.dia -a -e Ω-file-03.d -a -e Ω-file-03.dia -a -e Ω-file-03.o -a -e Ω-file-03.swift
+// RUN: cd %t && %target-build-swift -c -emit-dependencies -serialize-diagnostics -driver-filelist-threshold=0 -j2 main.swift  @%S/Inputs/unicode-filenames.rsp -module-name mod
+//
+// All these files should exist and should successfully be deleted
+// RUN: rm main.d
+// RUN: rm main.dia
+// RUN: rm main.o
+// RUN: rm Ω-file-03.d
+// RUN: rm Ω-file-03.dia
+// RUN: rm Ω-file-03.o
+// RUN: rm Ω-file-03.swift
+// RUN: rm 𝔼-file-01.d
+// RUN: rm 𝔼-file-01.dia
+// RUN: rm 𝔼-file-01.o
+// RUN: rm 𝔼-file-01.swift
+// RUN: rm 😂-file-02.d
+// RUN: rm 😂-file-02.dia
+// RUN: rm 😂-file-02.o
+// RUN: rm 😂-file-02.swift

test/Driver/parseable_output_unicode.swift

@@ -1,4 +1,6 @@
-// RUN: %swiftc_driver_plain -emit-executable "%S/Inputs/你好.swift" -o %t.out -emit-module -emit-module-path %t.swiftmodule -emit-objc-header-path %t.h -serialize-diagnostics -emit-dependencies -parseable-output -driver-skip-execution 2>&1 | %FileCheck %s
+// RUN: echo -n "%S/Inputs/" > %t.rsp
+// RUN: cat "%S/Inputs/unicode.txt" >> %t.rsp
+// RUN: %swiftc_driver_plain -emit-executable @%t.rsp -o %t.out -emit-module -emit-module-path %t.swiftmodule -emit-objc-header-path %t.h -serialize-diagnostics -emit-dependencies -parseable-output -driver-skip-execution 2>&1 | %FileCheck %s
 
 // XFAIL: freebsd, linux
 
@@ -63,8 +65,8 @@
 // CHECK-NEXT: {
 // CHECK-NEXT:   "kind": "began",
 // CHECK-NEXT:   "name": "merge-module",
-// CHECK-NEXT:   "command": "{{.*[\\/]}}swift{{c?}} -frontend -merge-modules -emit-module {{.*[\\/]}}你好-[[OUTPUT]].swiftmodule {{.*}} -o {{.*[\\/]}}parseable_output_unicode.swift.tmp.swiftmodule",
-// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{c?}}",
+// CHECK-NEXT:   "command": "{{.*[\\/]}}swift{{c?(\.EXE)?(\\")?}} -frontend -merge-modules -emit-module {{.*[\\/]}}你好-[[OUTPUT]].swiftmodule{{(\\")?}} {{.*}} -o {{.*[\\/]}}parseable_output_unicode.swift.tmp.swiftmodule{{(\\")?}}",
+// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{c?(\.EXE)?(\\")?}}",
 // CHECK-NEXT:   "command_arguments": [
 // CHECK-NEXT:     "-frontend",
 // CHECK-NEXT:     "-merge-modules",
@@ -112,10 +114,10 @@
 // CHECK-NEXT: {
 // CHECK-NEXT:   "kind": "began",
 // CHECK-NEXT:   "name": "link",
-// CHECK-NEXT:   "command": "{{.*[\\/]}}ld{{(\\")?}} {{.*[\\/]}}你好-[[OUTPUT]].o {{.*}} -o {{.*[\\/]}}parseable_output_unicode.swift.tmp.out",
-// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}ld{{(\\")?}}",
+// CHECK-NEXT:   "command": "{{.*[\\/](ld|clang\+\+.exe)(\\")?}} {{.*[\\/]}}你好-[[OUTPUT]].o{{(\\")?}}{{.*}}-o {{.*[\\/]}}parseable_output_unicode.swift.tmp.out{{(\\")?}}",
+// CHECK-NEXT:   "command_executable": "{{.*[\\/](ld|clang\+\+.exe)(\\")?}}",
 // CHECK-NEXT:   "command_arguments": [
-// CHECK-NEXT:     "{{.*[\\/]}}你好-[[OUTPUT]].o",
+// CHECK:          "{{.*[\\/]}}你好-[[OUTPUT]].o",
 // CHECK:          "-o",
 // CHECK-NEXT:     "{{.*[\\/]}}parseable_output_unicode.swift.tmp.out"
 // CHECK-NEXT:   ],

test/stdlib/Inputs/Unicode.rsp

@@ -0,0 +1 @@
+-module-name="日本語01"

test/stdlib/UnicodeMetadata.swift

@@ -1,4 +1,4 @@
-// RUN: %target-build-swift -module-name="日本語01" %s -o %t.out
+// RUN: %target-build-swift "@%/S/Inputs/Unicode.rsp" %s -o %t.out
 // RUN: %target-codesign %t.out
 // RUN: %target-run %t.out | %FileCheck %s
 // REQUIRES: executable_test