diff --git a/docs/Testing.rst b/docs/Testing.rst index 75f347465620d..3987f00a4ab0d 100644 --- a/docs/Testing.rst +++ b/docs/Testing.rst @@ -358,10 +358,16 @@ Other substitutions: * ``%{python}``: run the same Python interpreter that's being used to run the current ``lit`` test. +* ``%FileCheck``: like the LLVM ``FileCheck`` utility, but occurrences of full + paths to the source and build directories in the input text are replaced with + path-independent constants. + +* ``%raw-FileCheck``: the LLVM ``FileCheck`` utility. + When writing a test where output (or IR, SIL) depends on the bitness of the target CPU, use this pattern:: - // RUN: %target-swift-frontend ... | FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize %s + // RUN: %target-swift-frontend ... | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize %s // CHECK: common line // CHECK-32: only for 32-bit @@ -377,7 +383,7 @@ target CPU, use this pattern:: When writing a test where output (or IR, SIL) depends on the target CPU itself, use this pattern:: - // RUN: %target-swift-frontend ... | FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-cpu %s + // RUN: %target-swift-frontend ... | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-cpu %s // CHECK: common line // CHECK-i386: only for i386 diff --git a/test/1_stdlib/BridgeNonVerbatim.swift b/test/1_stdlib/BridgeNonVerbatim.swift index 67bb904371617..dc1e1675766ff 100644 --- a/test/1_stdlib/BridgeNonVerbatim.swift +++ b/test/1_stdlib/BridgeNonVerbatim.swift @@ -16,7 +16,7 @@ // outlive the array. // //===----------------------------------------------------------------------===// -// RUN: %target-run-stdlib-swift %s | FileCheck %s +// RUN: %target-run-stdlib-swift %s | %FileCheck %s // REQUIRES: executable_test // // REQUIRES: objc_interop diff --git a/test/1_stdlib/Bridgeable.swift b/test/1_stdlib/Bridgeable.swift index 6b91296a37592..420dfad4d9530 100644 --- a/test/1_stdlib/Bridgeable.swift +++ b/test/1_stdlib/Bridgeable.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/1_stdlib/FloatingPointIR.swift b/test/1_stdlib/FloatingPointIR.swift index 3c359b445d07b..ff1a1d78b916b 100644 --- a/test/1_stdlib/FloatingPointIR.swift +++ b/test/1_stdlib/FloatingPointIR.swift @@ -1,6 +1,6 @@ -// RUN: %target-build-swift -emit-ir %s | FileCheck -check-prefix=%target-cpu %s -// RUN: %target-build-swift -O -emit-ir %s | FileCheck -check-prefix=%target-cpu %s -// RUN: %target-build-swift -Ounchecked -emit-ir %s | FileCheck -check-prefix=%target-cpu %s +// RUN: %target-build-swift -emit-ir %s | %FileCheck -check-prefix=%target-cpu %s +// RUN: %target-build-swift -O -emit-ir %s | %FileCheck -check-prefix=%target-cpu %s +// RUN: %target-build-swift -Ounchecked -emit-ir %s | %FileCheck -check-prefix=%target-cpu %s var globalFloat32 : Float32 = 0.0 var globalFloat64 : Float64 = 0.0 diff --git a/test/1_stdlib/HeapBuffer.swift b/test/1_stdlib/HeapBuffer.swift index 63b9939ca1bd7..9512fb51afd8b 100644 --- a/test/1_stdlib/HeapBuffer.swift +++ b/test/1_stdlib/HeapBuffer.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test import Swift diff --git a/test/1_stdlib/ImplicitlyUnwrappedOptional.swift b/test/1_stdlib/ImplicitlyUnwrappedOptional.swift index 761a7e5565c05..b387f5f8960cd 100644 --- a/test/1_stdlib/ImplicitlyUnwrappedOptional.swift +++ b/test/1_stdlib/ImplicitlyUnwrappedOptional.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test var x : Int! = .none diff --git a/test/1_stdlib/KVO.swift b/test/1_stdlib/KVO.swift index 061ae98420eaa..6ce26ca8043e0 100644 --- a/test/1_stdlib/KVO.swift +++ b/test/1_stdlib/KVO.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/1_stdlib/Leak.swift b/test/1_stdlib/Leak.swift index 26d9afe89f15f..c083c5bb9bafc 100644 --- a/test/1_stdlib/Leak.swift +++ b/test/1_stdlib/Leak.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: leak-checker import StdlibUnittest diff --git a/test/1_stdlib/Map.swift b/test/1_stdlib/Map.swift index 080c7e9127281..b07410203fecb 100644 --- a/test/1_stdlib/Map.swift +++ b/test/1_stdlib/Map.swift @@ -9,7 +9,7 @@ // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors // //===----------------------------------------------------------------------===// -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // Check that the generic parameters are called 'Base' and 'Element'. diff --git a/test/1_stdlib/NSError.swift b/test/1_stdlib/NSError.swift index 121ca94ce9c41..9c37eee398475 100644 --- a/test/1_stdlib/NSError.swift +++ b/test/1_stdlib/NSError.swift @@ -4,7 +4,7 @@ // REQUIRES: objc_interop // RUN: %target-build-swift %s 2> %t.warnings.txt -// RUN: FileCheck -check-prefix=CHECK-WARNINGS %s < %t.warnings.txt +// RUN: %FileCheck -check-prefix=CHECK-WARNINGS %s < %t.warnings.txt import StdlibUnittest diff --git a/test/1_stdlib/NSObject.swift b/test/1_stdlib/NSObject.swift index b487589b48493..5156c2e57840f 100644 --- a/test/1_stdlib/NSObject.swift +++ b/test/1_stdlib/NSObject.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/1_stdlib/NSUndoManager.swift b/test/1_stdlib/NSUndoManager.swift index c6d20f333b45d..e7e011ca4b88c 100644 --- a/test/1_stdlib/NSUndoManager.swift +++ b/test/1_stdlib/NSUndoManager.swift @@ -1,5 +1,5 @@ // TODO: Relies on AnyObject lvalues -// R/UN: %target-run-simple-swift | FileCheck %s +// R/UN: %target-run-simple-swift | %FileCheck %s // RUN: not %target-build-swift -parse // REQUIRES: executable_test diff --git a/test/1_stdlib/NewString.swift b/test/1_stdlib/NewString.swift index 8eeb9f8b4c212..49d29be7bf90d 100644 --- a/test/1_stdlib/NewString.swift +++ b/test/1_stdlib/NewString.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-stdlib-swift | FileCheck %s +// RUN: %target-run-stdlib-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/1_stdlib/NewStringAppending.swift b/test/1_stdlib/NewStringAppending.swift index b4abfab8e6355..459da12d6beea 100644 --- a/test/1_stdlib/NewStringAppending.swift +++ b/test/1_stdlib/NewStringAppending.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-stdlib-swift | FileCheck %s +// RUN: %target-run-stdlib-swift | %FileCheck %s // REQUIRES: executable_test // // Parts of this test depend on memory allocator specifics. The test diff --git a/test/1_stdlib/Nil.swift b/test/1_stdlib/Nil.swift index b34a98155ff0f..84025f8b9d930 100644 --- a/test/1_stdlib/Nil.swift +++ b/test/1_stdlib/Nil.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // FIXME: rdar://problem/19648117 Needs splitting objc parts out diff --git a/test/1_stdlib/Reflection.swift b/test/1_stdlib/Reflection.swift index 2c9ed2f0aadc4..0cf3def3b6ea1 100644 --- a/test/1_stdlib/Reflection.swift +++ b/test/1_stdlib/Reflection.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-build-swift -parse-stdlib %s -module-name Reflection -o %t/a.out -// RUN: %S/timeout.sh 360 %target-run %t/a.out | FileCheck %s +// RUN: %S/timeout.sh 360 %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test // FIXME: timeout wrapper is necessary because the ASan test runs for hours diff --git a/test/1_stdlib/Reflection_jit.swift b/test/1_stdlib/Reflection_jit.swift index 7dc4e0b243a82..c36b6b6e8cc9f 100644 --- a/test/1_stdlib/Reflection_jit.swift +++ b/test/1_stdlib/Reflection_jit.swift @@ -1,4 +1,4 @@ // Test Reflection.swift in JIT mode. -// RUN: %target-jit-run -parse-stdlib %S/Reflection.swift -- %S/Inputs/shuffle.jpg | FileCheck %S/Reflection.swift +// RUN: %target-jit-run -parse-stdlib %S/Reflection.swift -- %S/Inputs/shuffle.jpg | %FileCheck %S/Reflection.swift // REQUIRES: swift_interpreter diff --git a/test/1_stdlib/Reflection_objc.swift b/test/1_stdlib/Reflection_objc.swift index b3673363f97b2..a50cdd3d233a0 100644 --- a/test/1_stdlib/Reflection_objc.swift +++ b/test/1_stdlib/Reflection_objc.swift @@ -2,7 +2,7 @@ // // RUN: %target-clang %S/Inputs/Mirror/Mirror.mm -c -o %t/Mirror.mm.o -g // RUN: %target-build-swift -parse-stdlib %s -module-name Reflection -I %S/Inputs/Mirror/ -Xlinker %t/Mirror.mm.o -o %t/a.out -// RUN: %S/timeout.sh 360 %target-run %t/a.out %S/Inputs/shuffle.jpg | FileCheck %s +// RUN: %S/timeout.sh 360 %target-run %t/a.out %S/Inputs/shuffle.jpg | %FileCheck %s // REQUIRES: executable_test // FIXME: timeout wrapper is necessary because the ASan test runs for hours diff --git a/test/1_stdlib/SegmentAlignment.c b/test/1_stdlib/SegmentAlignment.c index 7e728b6e50ef6..645f2e5e125d1 100644 --- a/test/1_stdlib/SegmentAlignment.c +++ b/test/1_stdlib/SegmentAlignment.c @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: xcrun -sdk %target-sdk-name %clang -c -arch %target-cpu %s -o %t/SegmentAlignment.o // RUN: %target-build-swift %S/Inputs/SegmentAlignment.swift -Xlinker %t/SegmentAlignment.o -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test // REQUIRES: CPU=armv7 diff --git a/test/1_stdlib/StringReallocation.swift b/test/1_stdlib/StringReallocation.swift index 98a208d8962c9..e774fbb532256 100644 --- a/test/1_stdlib/StringReallocation.swift +++ b/test/1_stdlib/StringReallocation.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // CHECK-NOT: Reallocations exceeded 30 diff --git a/test/1_stdlib/UIViewControllerAdditions.swift b/test/1_stdlib/UIViewControllerAdditions.swift index f9ffdd221756d..df57fb256b059 100644 --- a/test/1_stdlib/UIViewControllerAdditions.swift +++ b/test/1_stdlib/UIViewControllerAdditions.swift @@ -1,6 +1,6 @@ // RxUN: %target-build-swift -g %s -o %t/ViewControllerAdditions.out -// RxUN: %target-run %t/ViewControllerAdditions.out %S/Inputs/UIViewControllerAdditions | FileCheck %s -// RUN: %target-run-simple-swift %S/Inputs/UIViewControllerAdditions | FileCheck %s +// RxUN: %target-run %t/ViewControllerAdditions.out %S/Inputs/UIViewControllerAdditions | %FileCheck %s +// RUN: %target-run-simple-swift %S/Inputs/UIViewControllerAdditions | %FileCheck %s // REQUIRES: executable_test // REQUIRES: OS=ios diff --git a/test/1_stdlib/VarArgs.swift b/test/1_stdlib/VarArgs.swift index c46aec900a8cc..ee2801b0d62ae 100644 --- a/test/1_stdlib/VarArgs.swift +++ b/test/1_stdlib/VarArgs.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-stdlib-swift -parse-stdlib %s | FileCheck %s +// RUN: %target-run-stdlib-swift -parse-stdlib %s | %FileCheck %s // REQUIRES: executable_test import Swift diff --git a/test/1_stdlib/integer_conversions.swift b/test/1_stdlib/integer_conversions.swift index 76144e7875666..6bfeb91e17c6a 100644 --- a/test/1_stdlib/integer_conversions.swift +++ b/test/1_stdlib/integer_conversions.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test var a : Int diff --git a/test/1_stdlib/sort_integers.swift b/test/1_stdlib/sort_integers.swift index 29328fbd19e46..0717679a21d5c 100644 --- a/test/1_stdlib/sort_integers.swift +++ b/test/1_stdlib/sort_integers.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // Generate all possible permutes. diff --git a/test/AutolinkExtract/empty.swift b/test/AutolinkExtract/empty.swift index 2e3254611ea07..b9ae0068c07d6 100644 --- a/test/AutolinkExtract/empty.swift +++ b/test/AutolinkExtract/empty.swift @@ -1,5 +1,5 @@ // RUN: %target-swiftc_driver -c %s -o %t -// RUN: %target-swift-autolink-extract %t -o - | FileCheck --check-prefix CHECK-%target-object-format %s +// RUN: %target-swift-autolink-extract %t -o - | %FileCheck --check-prefix CHECK-%target-object-format %s // REQUIRES: autolink-extract diff --git a/test/AutolinkExtract/empty_archive.swift b/test/AutolinkExtract/empty_archive.swift index 030ef6371f7b5..ee66d6762610c 100644 --- a/test/AutolinkExtract/empty_archive.swift +++ b/test/AutolinkExtract/empty_archive.swift @@ -1,7 +1,7 @@ // RUN: %target-swiftc_driver -c %s -o %t // RUN: rm -f %t.a // RUN: llvm-ar cr %t.a %t -// RUN: %target-swift-autolink-extract %t.a -o - | FileCheck --check-prefix CHECK-%target-object-format %s +// RUN: %target-swift-autolink-extract %t.a -o - | %FileCheck --check-prefix CHECK-%target-object-format %s // REQUIRES: autolink-extract diff --git a/test/AutolinkExtract/error_no_inputs.swift b/test/AutolinkExtract/error_no_inputs.swift index 77ed3597f502d..d86b243686127 100644 --- a/test/AutolinkExtract/error_no_inputs.swift +++ b/test/AutolinkExtract/error_no_inputs.swift @@ -1,5 +1,5 @@ // RUN: %target-swiftc_driver -c %s -o %t -// RUN: not %target-swift-autolink-extract 2>&1 | FileCheck %s +// RUN: not %target-swift-autolink-extract 2>&1 | %FileCheck %s // REQUIRES: autolink-extract diff --git a/test/AutolinkExtract/import.swift b/test/AutolinkExtract/import.swift index c87a7bcf33fd2..5f55961ceba1f 100644 --- a/test/AutolinkExtract/import.swift +++ b/test/AutolinkExtract/import.swift @@ -2,7 +2,7 @@ // RUN: mkdir -p %t // RUN: %target-swiftc_driver -emit-library -emit-module -emit-module-path %t/empty.swiftmodule -module-name empty -module-link-name empty %S/empty.swift // RUN: %target-swiftc_driver -c %s -I %t -o %t/import_experimental.o -// RUN: %target-swift-autolink-extract %t/import_experimental.o -o - | FileCheck --check-prefix CHECK-%target-object-format %s +// RUN: %target-swift-autolink-extract %t/import_experimental.o -o - | %FileCheck --check-prefix CHECK-%target-object-format %s // REQUIRES: autolink-extract diff --git a/test/AutolinkExtract/import_archive.swift b/test/AutolinkExtract/import_archive.swift index d3fa6a6f716b1..d4bb89ebeb194 100644 --- a/test/AutolinkExtract/import_archive.swift +++ b/test/AutolinkExtract/import_archive.swift @@ -3,7 +3,7 @@ // RUN: %target-swiftc_driver -emit-library -emit-module -emit-module-path %t/empty.swiftmodule -module-name empty -module-link-name empty %S/empty.swift // RUN: %target-swiftc_driver -c %s -I %t -o %t/import_experimental.o // RUN: llvm-ar cr %t/import_experimental.a %t/import_experimental.o -// RUN: %target-swift-autolink-extract %t/import_experimental.a -o - | FileCheck --check-prefix CHECK-%target-object-format %s +// RUN: %target-swift-autolink-extract %t/import_experimental.a -o - | %FileCheck --check-prefix CHECK-%target-object-format %s // REQUIRES: autolink-extract diff --git a/test/AutolinkExtract/linker-order.ll b/test/AutolinkExtract/linker-order.ll index 7da7d6036aa0f..735add6f64d81 100644 --- a/test/AutolinkExtract/linker-order.ll +++ b/test/AutolinkExtract/linker-order.ll @@ -1,6 +1,6 @@ -; RUN: llc -mtriple armv7--linux-gnueabihf -filetype obj -o - %s | %target-swift-autolink-extract -o - - | FileCheck %s -; RUN: llc -mtriple x86_64--windows-gnu -filetype obj -o - %s | %target-swift-autolink-extract -o - - | FileCheck %s -; RUN: llc -mtriple x86_64--windows-cygnus -filetype obj -o - %s | %target-swift-autolink-extract -o - - | FileCheck %s +; RUN: llc -mtriple armv7--linux-gnueabihf -filetype obj -o - %s | %target-swift-autolink-extract -o - - | %FileCheck %s +; RUN: llc -mtriple x86_64--windows-gnu -filetype obj -o - %s | %target-swift-autolink-extract -o - - | %FileCheck %s +; RUN: llc -mtriple x86_64--windows-cygnus -filetype obj -o - %s | %target-swift-autolink-extract -o - - | %FileCheck %s ; REQUIRES: autolink-extract ; Ensure that the options in the object file preserve ordering. The linker diff --git a/test/ClangModules/CoreGraphics_test.swift b/test/ClangModules/CoreGraphics_test.swift index f90ef436a3af7..80b2613f8ed86 100644 --- a/test/ClangModules/CoreGraphics_test.swift +++ b/test/ClangModules/CoreGraphics_test.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -target x86_64-apple-macosx10.11 -emit-ir -O %s | FileCheck %s +// RUN: %target-swift-frontend -target x86_64-apple-macosx10.11 -emit-ir -O %s | %FileCheck %s // Test some imported CG APIs import CoreGraphics diff --git a/test/ClangModules/MixedSource/Xcc_include.swift b/test/ClangModules/MixedSource/Xcc_include.swift index ebfb4a47fdfc5..312e2e58d45a9 100644 --- a/test/ClangModules/MixedSource/Xcc_include.swift +++ b/test/ClangModules/MixedSource/Xcc_include.swift @@ -1,10 +1,10 @@ -// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xcc -include -Xcc %S/Inputs/Xcc_include.h -parse %s 2>&1 | FileCheck -check-prefix=CHECK-INCLUDE-ONLY %s +// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xcc -include -Xcc %S/Inputs/Xcc_include.h -parse %s 2>&1 | %FileCheck -check-prefix=CHECK-INCLUDE-ONLY %s -// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xcc -include -Xcc %S/Inputs/Xcc_include.h -import-objc-header %S/../../Inputs/empty.swift -parse %s 2>&1 | FileCheck -check-prefix=CHECK-INCLUDE-PLUS-BRIDGING %s +// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xcc -include -Xcc %S/Inputs/Xcc_include.h -import-objc-header %S/../../Inputs/empty.swift -parse %s 2>&1 | %FileCheck -check-prefix=CHECK-INCLUDE-PLUS-BRIDGING %s -// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xcc -include -Xcc %S/Inputs/Xcc_include.h -F %S/Inputs/mixed-target/ -module-name Mixed -import-underlying-module -parse %s -disable-objc-attr-requires-foundation-module 2>&1 | FileCheck -check-prefix=CHECK-INCLUDE-FRAMEWORK %s +// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xcc -include -Xcc %S/Inputs/Xcc_include.h -F %S/Inputs/mixed-target/ -module-name Mixed -import-underlying-module -parse %s -disable-objc-attr-requires-foundation-module 2>&1 | %FileCheck -check-prefix=CHECK-INCLUDE-FRAMEWORK %s -// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xcc -include -Xcc %S/Inputs/this_header_does_not_exist.h -parse %s 2>&1 | FileCheck -check-prefix=CHECK-INCLUDE-MISSING %s +// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xcc -include -Xcc %S/Inputs/this_header_does_not_exist.h -parse %s 2>&1 | %FileCheck -check-prefix=CHECK-INCLUDE-MISSING %s // REQUIRES: objc_interop diff --git a/test/ClangModules/MixedSource/broken-bridging-header.swift b/test/ClangModules/MixedSource/broken-bridging-header.swift index 2ca252110e710..14211d751c5fe 100644 --- a/test/ClangModules/MixedSource/broken-bridging-header.swift +++ b/test/ClangModules/MixedSource/broken-bridging-header.swift @@ -1,21 +1,21 @@ // RUN: rm -rf %t && mkdir -p %t -// RUN: not %target-swift-frontend -parse %S/../../Inputs/empty.swift -import-objc-header %t/fake.h 2>&1 | FileCheck -check-prefix=MISSING-HEADER %s +// RUN: not %target-swift-frontend -parse %S/../../Inputs/empty.swift -import-objc-header %t/fake.h 2>&1 | %FileCheck -check-prefix=MISSING-HEADER %s // RUN: cp %S/Inputs/error-on-define.h %t -// RUN: not %target-swift-frontend -parse %S/../../Inputs/empty.swift -import-objc-header %t/error-on-define.h 2>&1 | FileCheck -check-prefix=MISSING-OTHER-HEADER %s +// RUN: not %target-swift-frontend -parse %S/../../Inputs/empty.swift -import-objc-header %t/error-on-define.h 2>&1 | %FileCheck -check-prefix=MISSING-OTHER-HEADER %s // RUN: cp %S/Inputs/error-on-define-impl.h %t -// RUN: not %target-swift-frontend -parse %S/../../Inputs/empty.swift -import-objc-header %t/error-on-define.h -Xcc -DERROR 2>&1 | FileCheck -check-prefix=HEADER-ERROR %s +// RUN: not %target-swift-frontend -parse %S/../../Inputs/empty.swift -import-objc-header %t/error-on-define.h -Xcc -DERROR 2>&1 | %FileCheck -check-prefix=HEADER-ERROR %s // RUN: %target-swift-frontend -emit-module -o %t -module-name HasBridgingHeader %S/../../Inputs/empty.swift -import-objc-header %t/error-on-define.h // RUN: %target-swift-frontend -parse %s -I %t -Xcc -DERROR -verify -show-diagnostics-after-fatal -// RUN: not %target-swift-frontend -parse %s -I %t -Xcc -DERROR 2>&1 | FileCheck -check-prefix=HEADER-ERROR %s +// RUN: not %target-swift-frontend -parse %s -I %t -Xcc -DERROR 2>&1 | %FileCheck -check-prefix=HEADER-ERROR %s // RUN: rm %t/error-on-define-impl.h // RUN: %target-swift-frontend -parse %s -I %t -verify -show-diagnostics-after-fatal -// RUN: not %target-swift-frontend -parse %s -I %t 2>&1 | FileCheck -check-prefix=MISSING-OTHER-HEADER %s +// RUN: not %target-swift-frontend -parse %s -I %t 2>&1 | %FileCheck -check-prefix=MISSING-OTHER-HEADER %s // REQUIRES: objc_interop diff --git a/test/ClangModules/MixedSource/broken-modules.swift b/test/ClangModules/MixedSource/broken-modules.swift index 49a86abb445b6..635d719181a9e 100644 --- a/test/ClangModules/MixedSource/broken-modules.swift +++ b/test/ClangModules/MixedSource/broken-modules.swift @@ -1,11 +1,11 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: not %target-swift-frontend -parse %s -I %S/Inputs/broken-modules/ -enable-source-import -show-diagnostics-after-fatal 2> %t/err.txt -// RUN: FileCheck -check-prefix CHECK -check-prefix CLANG-CHECK %s < %t/err.txt +// RUN: %FileCheck -check-prefix CHECK -check-prefix CLANG-CHECK %s < %t/err.txt // RUN: not %target-swift-frontend -parse %s -import-objc-header %S/Inputs/broken-modules/BrokenClangModule.h -enable-source-import 2> %t/err.bridging-header.txt -// RUN: FileCheck -check-prefix CHECK-BRIDGING-HEADER -check-prefix CLANG-CHECK %s < %t/err.bridging-header.txt +// RUN: %FileCheck -check-prefix CHECK-BRIDGING-HEADER -check-prefix CLANG-CHECK %s < %t/err.bridging-header.txt -// RUN: not %target-swift-frontend -parse %s -import-objc-header %S/../../Inputs/empty.swift 2>&1 | FileCheck -check-prefix=EMPTY-HEADER %s +// RUN: not %target-swift-frontend -parse %s -import-objc-header %S/../../Inputs/empty.swift 2>&1 | %FileCheck -check-prefix=EMPTY-HEADER %s // REQUIRES: objc_interop diff --git a/test/ClangModules/MixedSource/import-mixed-with-header-twice.swift b/test/ClangModules/MixedSource/import-mixed-with-header-twice.swift index 15bd64aae562c..84728be218b86 100644 --- a/test/ClangModules/MixedSource/import-mixed-with-header-twice.swift +++ b/test/ClangModules/MixedSource/import-mixed-with-header-twice.swift @@ -6,7 +6,7 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/../Inputs/custom-modules -I %t -parse %s -verify // RUN: rm %t/mixed-target/header.h -// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %t -I %S/../Inputs/custom-modules -parse %s 2>&1 | FileCheck %s -check-prefix=USE-SERIALIZED-HEADER +// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %t -I %S/../Inputs/custom-modules -parse %s 2>&1 | %FileCheck %s -check-prefix=USE-SERIALIZED-HEADER // XFAIL: linux diff --git a/test/ClangModules/MixedSource/mixed-target-using-module.swift b/test/ClangModules/MixedSource/mixed-target-using-module.swift index f6fbd4fb05839..fdea0387489d0 100644 --- a/test/ClangModules/MixedSource/mixed-target-using-module.swift +++ b/test/ClangModules/MixedSource/mixed-target-using-module.swift @@ -1,6 +1,6 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -F %S/Inputs/mixed-target/ -module-name Mixed -import-underlying-module -parse %s -verify -disable-objc-attr-requires-foundation-module -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -F %S/Inputs/mixed-target/ -module-name Mixed -import-underlying-module -emit-ir %S/../../Inputs/empty.swift - | FileCheck -check-prefix=CHECK-AUTOLINK %s -// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -F %S/Inputs/mixed-target/ -module-name WrongName -import-underlying-module -parse %s -disable-objc-attr-requires-foundation-module 2>&1 | FileCheck -check-prefix=CHECK-WRONG-NAME %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -F %S/Inputs/mixed-target/ -module-name Mixed -import-underlying-module -emit-ir %S/../../Inputs/empty.swift - | %FileCheck -check-prefix=CHECK-AUTOLINK %s +// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -F %S/Inputs/mixed-target/ -module-name WrongName -import-underlying-module -parse %s -disable-objc-attr-requires-foundation-module 2>&1 | %FileCheck -check-prefix=CHECK-WRONG-NAME %s // REQUIRES: objc_interop diff --git a/test/ClangModules/attr-swift_name.swift b/test/ClangModules/attr-swift_name.swift index 0b02bffdb5daf..38b4d094ebb83 100644 --- a/test/ClangModules/attr-swift_name.swift +++ b/test/ClangModules/attr-swift_name.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules -Xcc -w -parse %s 2>&1 | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules -Xcc -w -parse %s 2>&1 | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/ClangModules/attr-swift_private.swift b/test/ClangModules/attr-swift_private.swift index d4c42ecedf737..440efc55a974e 100644 --- a/test/ClangModules/attr-swift_private.swift +++ b/test/ClangModules/attr-swift_private.swift @@ -2,10 +2,10 @@ // RUN: %build-clang-importer-objc-overlays // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/Inputs/custom-modules -parse %s -verify -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/Inputs/custom-modules -emit-ir %s -D IRGEN | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/Inputs/custom-modules -emit-ir %s -D IRGEN | %FileCheck %s // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/Inputs/custom-modules -print-module -source-filename="%s" -module-to-print SwiftPrivateAttr > %t.txt -// RUN: FileCheck -check-prefix=GENERATED-NEGATIVE %s < %t.txt +// RUN: %FileCheck -check-prefix=GENERATED-NEGATIVE %s < %t.txt // RUN: diff -U3 %S/Inputs/SwiftPrivateAttr.txt %t.txt // Look for identifiers with "Priv" in them that haven't been prefixed. diff --git a/test/ClangModules/autolinking.swift b/test/ClangModules/autolinking.swift index ba9e8a531e971..de873500ce13c 100644 --- a/test/ClangModules/autolinking.swift +++ b/test/ClangModules/autolinking.swift @@ -1,15 +1,15 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: %target-swift-frontend %s -sdk %S/Inputs -I %S/Inputs/custom-modules -emit-ir -o %t/without-adapter.ll -// RUN: FileCheck %s < %t/without-adapter.ll +// RUN: %FileCheck %s < %t/without-adapter.ll // RUN: %target-swift-frontend -emit-module %S/Inputs/adapter.swift -sdk %S/Inputs -module-link-name SwiftAdapter -module-name ClangModuleWithAdapter -I %S/Inputs/custom-modules -o %t // RUN: %target-swift-frontend %s -sdk %S/Inputs -I %S/Inputs/custom-modules -I %t -emit-ir -o %t/with-adapter.ll -// RUN: FileCheck %s < %t/with-adapter.ll -// RUN: FileCheck --check-prefix=CHECK-WITH-SWIFT %s < %t/with-adapter.ll +// RUN: %FileCheck %s < %t/with-adapter.ll +// RUN: %FileCheck --check-prefix=CHECK-WITH-SWIFT %s < %t/with-adapter.ll // RUN: %target-swift-frontend %s -sdk %S/Inputs -I %S/Inputs/custom-modules -emit-ir -disable-autolink-framework LinkFramework -o %t/with-disabled.ll -// RUN: FileCheck --check-prefix=CHECK-WITH-DISABLED %s < %t/with-disabled.ll +// RUN: %FileCheck --check-prefix=CHECK-WITH-DISABLED %s < %t/with-disabled.ll // Linux uses a different autolinking mechanism, based on // swift-autolink-extract. This file tests the Darwin mechanism. diff --git a/test/ClangModules/availability_implicit_macosx.swift b/test/ClangModules/availability_implicit_macosx.swift index 8c421cb4d2123..813d549b4fd50 100644 --- a/test/ClangModules/availability_implicit_macosx.swift +++ b/test/ClangModules/availability_implicit_macosx.swift @@ -1,5 +1,5 @@ // RUN: %swift -parse -verify -target x86_64-apple-macosx10.51 %clang-importer-sdk -I %S/Inputs/custom-modules %s %S/Inputs/availability_implicit_macosx_other.swift -// RUN: not %swift -parse -target x86_64-apple-macosx10.51 %clang-importer-sdk -I %S/Inputs/custom-modules %s %S/Inputs/availability_implicit_macosx_other.swift 2>&1 | FileCheck %s '--implicit-check-not=:0' +// RUN: not %swift -parse -target x86_64-apple-macosx10.51 %clang-importer-sdk -I %S/Inputs/custom-modules %s %S/Inputs/availability_implicit_macosx_other.swift 2>&1 | %FileCheck %s '--implicit-check-not=:0' // REQUIRES: OS=macosx diff --git a/test/ClangModules/broken-modules.swift b/test/ClangModules/broken-modules.swift index b6248cf1d3766..bd3fdd62664b5 100644 --- a/test/ClangModules/broken-modules.swift +++ b/test/ClangModules/broken-modules.swift @@ -1,13 +1,13 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: not %target-swift-frontend -parse %s -I %S/Inputs/custom-modules/ -show-diagnostics-after-fatal -D MISSING_FROM_MODULE 2> %t/err.txt -// RUN: FileCheck -check-prefix CHECK-MODULE-MAP %s < %t/err.txt +// RUN: %FileCheck -check-prefix CHECK-MODULE-MAP %s < %t/err.txt // RUN: not %target-swift-frontend -parse %s -I %S/Inputs/custom-modules/ -show-diagnostics-after-fatal 2> %t/err.txt -// RUN: FileCheck -check-prefix CHECK -check-prefix CHECK-DIRECT %s < %t/err.txt +// RUN: %FileCheck -check-prefix CHECK -check-prefix CHECK-DIRECT %s < %t/err.txt // RUN: not %target-swift-frontend -parse %s -I %S/Inputs/custom-modules/ -show-diagnostics-after-fatal -D INDIRECT 2> %t/err.txt -// RUN: FileCheck -check-prefix CHECK -check-prefix CHECK-INDIRECT %s < %t/err.txt +// RUN: %FileCheck -check-prefix CHECK -check-prefix CHECK-INDIRECT %s < %t/err.txt // FIXME: not every test here depends on Objective-C syntax, this test can be // split. diff --git a/test/ClangModules/cfuncs_ir.swift b/test/ClangModules/cfuncs_ir.swift index a3ab129b130a6..160daf3d9bc84 100644 --- a/test/ClangModules/cfuncs_ir.swift +++ b/test/ClangModules/cfuncs_ir.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir -o - | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir -o - | %FileCheck %s // REQUIRES: OS=macosx diff --git a/test/ClangModules/clang_builtin.swift b/test/ClangModules/clang_builtin.swift index 710f5f3f43f21..166639f7020bb 100644 --- a/test/ClangModules/clang_builtin.swift +++ b/test/ClangModules/clang_builtin.swift @@ -2,7 +2,7 @@ // // RUN: rm -rf %t/clang-module-cache // RUN: %target-swift-frontend -parse -verify -module-cache-path %t/clang-module-cache %s -// RUN: ls -lR %t/clang-module-cache | FileCheck %s +// RUN: ls -lR %t/clang-module-cache | %FileCheck %s // CHECK: _Builtin_intrinsics{{.*}}.pcm diff --git a/test/ClangModules/const_and_pure.swift b/test/ClangModules/const_and_pure.swift index 4f9064116699c..1574c688e1b80 100644 --- a/test/ClangModules/const_and_pure.swift +++ b/test/ClangModules/const_and_pure.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil %s -import-objc-header %S/Inputs/const_and_pure.h | FileCheck %s +// RUN: %target-swift-frontend -emit-sil %s -import-objc-header %S/Inputs/const_and_pure.h | %FileCheck %s func testit() { const_function() diff --git a/test/ClangModules/cstring_parse.swift b/test/ClangModules/cstring_parse.swift index 02814545cc9cc..912d8a65c71c8 100644 --- a/test/ClangModules/cstring_parse.swift +++ b/test/ClangModules/cstring_parse.swift @@ -3,7 +3,7 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse -verify -module-cache-path %t/clang-module-cache -I %S/Inputs %s -// RUN: ls -lR %t/clang-module-cache | FileCheck %s +// RUN: ls -lR %t/clang-module-cache | %FileCheck %s // XFAIL: linux diff --git a/test/ClangModules/ctypes_ir.swift b/test/ClangModules/ctypes_ir.swift index c8af8bdce3c37..a1328d7022c44 100644 --- a/test/ClangModules/ctypes_ir.swift +++ b/test/ClangModules/ctypes_ir.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir -o - -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir -o - -primary-file %s | %FileCheck %s // REQUIRES: OS=macosx diff --git a/test/ClangModules/cvars_ir.swift b/test/ClangModules/cvars_ir.swift index 10a52c49faf7d..79e0872890bef 100644 --- a/test/ClangModules/cvars_ir.swift +++ b/test/ClangModules/cvars_ir.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir -o - | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir -o - | %FileCheck %s // REQUIRES: OS=macosx diff --git a/test/ClangModules/diags_from_module.swift b/test/ClangModules/diags_from_module.swift index 493175f6eec6b..2b404fd12ab5b 100644 --- a/test/ClangModules/diags_from_module.swift +++ b/test/ClangModules/diags_from_module.swift @@ -1,5 +1,5 @@ // RUN: not %target-swift-frontend -parse %s -F %S/Inputs/frameworks -Xcc -D -Xcc FOO 2> %t.err.txt -// RUN: FileCheck -input-file=%t.err.txt %s +// RUN: %FileCheck -input-file=%t.err.txt %s // XFAIL: linux @@ -10,7 +10,7 @@ import Module // CHECK: diags_from_module.swift:[[@LINE-4]]:8: error: could not build Objective-C module 'Module' // RUN: %target-swift-frontend -parse %s -F %S/Inputs/frameworks 2> %tw.err.txt -// RUN: FileCheck -input-file=%tw.err.txt %s -check-prefix=CHECK-WARN +// RUN: %FileCheck -input-file=%tw.err.txt %s -check-prefix=CHECK-WARN // CHECK-WARN: Sub2.h:7:2: warning: here is some warning about something // FIXME: show the clang warning: :1:1: warning: umbrella header for module 'Module' does not include header 'NotInModule.h' [-Wincomplete-umbrella] diff --git a/test/ClangModules/enum-error-execute.swift b/test/ClangModules/enum-error-execute.swift index 29a726d1dd6da..13f628a2f06d5 100644 --- a/test/ClangModules/enum-error-execute.swift +++ b/test/ClangModules/enum-error-execute.swift @@ -1,7 +1,7 @@ // RUN: mkdir -p %t // RUN: %target-clang %S/Inputs/enum-error.m -c -o %t/enum-error.o // RUN: %target-build-swift -import-objc-header %S/Inputs/enum-error.h -Xlinker %t/enum-error.o %s -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test // REQUIRES: OS=macosx diff --git a/test/ClangModules/enum-error.swift b/test/ClangModules/enum-error.swift index 362fecb47514b..5e77a243de514 100644 --- a/test/ClangModules/enum-error.swift +++ b/test/ClangModules/enum-error.swift @@ -1,18 +1,18 @@ // REQUIRES: OS=macosx -// RUN: %target-swift-frontend -DVALUE -emit-sil %s -import-objc-header %S/Inputs/enum-error.h | FileCheck %s -check-prefix=VALUE -// RUN: %target-swift-frontend -DEMPTYCATCH -emit-sil %s -import-objc-header %S/Inputs/enum-error.h | FileCheck %s -check-prefix=EMPTYCATCH -// RUN: %target-swift-frontend -DASQEXPR -emit-sil %s -import-objc-header %S/Inputs/enum-error.h | FileCheck %s -check-prefix=ASQEXPR -// RUN: %target-swift-frontend -DASBANGEXPR -emit-sil %s -import-objc-header %S/Inputs/enum-error.h | FileCheck %s -check-prefix=ASBANGEXPR -// RUN: %target-swift-frontend -DCATCHIS -emit-sil %s -import-objc-header %S/Inputs/enum-error.h | FileCheck %s -check-prefix=CATCHIS -// RUN: %target-swift-frontend -DCATCHAS -emit-sil %s -import-objc-header %S/Inputs/enum-error.h | FileCheck %s -check-prefix=CATCHAS -// RUN: %target-swift-frontend -DGENERICONLY -emit-sil %s -import-objc-header %S/Inputs/enum-error.h | FileCheck %s -check-prefix=GENERICONLY +// RUN: %target-swift-frontend -DVALUE -emit-sil %s -import-objc-header %S/Inputs/enum-error.h | %FileCheck %s -check-prefix=VALUE +// RUN: %target-swift-frontend -DEMPTYCATCH -emit-sil %s -import-objc-header %S/Inputs/enum-error.h | %FileCheck %s -check-prefix=EMPTYCATCH +// RUN: %target-swift-frontend -DASQEXPR -emit-sil %s -import-objc-header %S/Inputs/enum-error.h | %FileCheck %s -check-prefix=ASQEXPR +// RUN: %target-swift-frontend -DASBANGEXPR -emit-sil %s -import-objc-header %S/Inputs/enum-error.h | %FileCheck %s -check-prefix=ASBANGEXPR +// RUN: %target-swift-frontend -DCATCHIS -emit-sil %s -import-objc-header %S/Inputs/enum-error.h | %FileCheck %s -check-prefix=CATCHIS +// RUN: %target-swift-frontend -DCATCHAS -emit-sil %s -import-objc-header %S/Inputs/enum-error.h | %FileCheck %s -check-prefix=CATCHAS +// RUN: %target-swift-frontend -DGENERICONLY -emit-sil %s -import-objc-header %S/Inputs/enum-error.h | %FileCheck %s -check-prefix=GENERICONLY // RUN: %target-swift-frontend -emit-sil %s -import-objc-header %S/Inputs/enum-error.h -verify // RUN: echo '#include "enum-error.h"' > %t.m // RUN: %target-swift-ide-test -source-filename %s -print-header -header-to-print %S/Inputs/enum-error.h -import-objc-header %S/Inputs/enum-error.h -print-regular-comments --cc-args %target-cc-options -fsyntax-only %t.m -I %S/Inputs > %t.txt -// RUN: FileCheck -check-prefix=HEADER %s < %t.txt +// RUN: %FileCheck -check-prefix=HEADER %s < %t.txt import Foundation diff --git a/test/ClangModules/invalid_bridging_header.swift b/test/ClangModules/invalid_bridging_header.swift index 6ede330893a8b..7ae08edd15aa4 100644 --- a/test/ClangModules/invalid_bridging_header.swift +++ b/test/ClangModules/invalid_bridging_header.swift @@ -1,5 +1,5 @@ // RUN: not %target-swift-frontend-parse -import-objc-header %S/Inputs/invalid_bridging_header.h %s > %t.out 2>&1 -// RUN: FileCheck %s < %t.out +// RUN: %FileCheck %s < %t.out // REQUIRES: objc_interop diff --git a/test/ClangModules/non-modular-include.swift b/test/ClangModules/non-modular-include.swift index ac9a692e1ad0f..ee443c3759554 100644 --- a/test/ClangModules/non-modular-include.swift +++ b/test/ClangModules/non-modular-include.swift @@ -1,5 +1,5 @@ // RUN: rm -rf %t && mkdir -p %t -// RUN: not %target-swift-frontend -parse %s -I %S/Inputs/non-modular -F %S/Inputs/non-modular 2>&1 | FileCheck %s +// RUN: not %target-swift-frontend -parse %s -I %S/Inputs/non-modular -F %S/Inputs/non-modular 2>&1 | %FileCheck %s // CHECK: {{.+}}/non-modular/Foo.framework/Headers/Foo.h:1:9: error: include of non-modular header inside framework module 'Foo' // CHECK: error: could not build Objective-C module 'Foo' diff --git a/test/ClangModules/nullability_silgen.swift b/test/ClangModules/nullability_silgen.swift index cb84318c0e331..1fe29aff9758f 100644 --- a/test/ClangModules/nullability_silgen.swift +++ b/test/ClangModules/nullability_silgen.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-clang-importer-objc-overlays -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-silgen -I %S/Inputs/custom-modules %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-silgen -I %S/Inputs/custom-modules %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/ClangModules/objc_init_redundant.swift b/test/ClangModules/objc_init_redundant.swift index 00a2ba70a55f7..0be9993e7d560 100644 --- a/test/ClangModules/objc_init_redundant.swift +++ b/test/ClangModules/objc_init_redundant.swift @@ -1,6 +1,6 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk -I %S/Inputs/custom-modules) -emit-sil %s -verify // RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk -I %S/Inputs/custom-modules) -emit-sil %s > %t.log 2>&1 -// RUN: FileCheck %s < %t.log +// RUN: %FileCheck %s < %t.log // REQUIRES: objc_interop diff --git a/test/ClangModules/objc_ir.swift b/test/ClangModules/objc_ir.swift index 79799199dacf1..dcc35364aa5c0 100644 --- a/test/ClangModules/objc_ir.swift +++ b/test/ClangModules/objc_ir.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-clang-importer-objc-overlays -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/Inputs/custom-modules -emit-ir -o - -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/Inputs/custom-modules -emit-ir -o - -primary-file %s | %FileCheck %s // REQUIRES: objc_interop // REQUIRES: OS=macosx diff --git a/test/ClangModules/optional.swift b/test/ClangModules/optional.swift index 80f3de48ce57f..4fd67afa9bf71 100644 --- a/test/ClangModules/optional.swift +++ b/test/ClangModules/optional.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules -emit-silgen -o - %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules -emit-silgen -o - %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/ClangModules/requires.swift b/test/ClangModules/requires.swift index 084ade05b7b81..8e8d5328dfe54 100644 --- a/test/ClangModules/requires.swift +++ b/test/ClangModules/requires.swift @@ -1,4 +1,4 @@ -// RUN: not %target-swift-frontend -parse %s -I %S/Inputs/custom-modules 2>&1 | FileCheck %s +// RUN: not %target-swift-frontend -parse %s -I %S/Inputs/custom-modules 2>&1 | %FileCheck %s import Requires.Swift // OK import Requires.NotSwift diff --git a/test/ClangModules/sdk-bridging-header.swift b/test/ClangModules/sdk-bridging-header.swift index d3838d02b9e16..72cec54a68f1a 100644 --- a/test/ClangModules/sdk-bridging-header.swift +++ b/test/ClangModules/sdk-bridging-header.swift @@ -1,11 +1,11 @@ // RUN: %target-swift-frontend -parse -verify %s -import-objc-header %S/Inputs/sdk-bridging-header.h -// RUN: not %target-swift-frontend -parse %s -import-objc-header %S/Inputs/bad-bridging-header.h 2>&1 | FileCheck -check-prefix=CHECK-FATAL %s +// RUN: not %target-swift-frontend -parse %s -import-objc-header %S/Inputs/bad-bridging-header.h 2>&1 | %FileCheck -check-prefix=CHECK-FATAL %s // RUN: %target-swift-frontend -parse -verify %s -Xcc -include -Xcc %S/Inputs/sdk-bridging-header.h -import-objc-header %S/../Inputs/empty.swift -// RUN: not %target-swift-frontend -parse %s -Xcc -include -Xcc %S/Inputs/bad-bridging-header.h 2>&1 | FileCheck -check-prefix=CHECK-INCLUDE %s -// RUN: not %target-swift-frontend -parse %s -Xcc -include -Xcc %S/Inputs/bad-bridging-header.h -import-objc-header %S/../Inputs/empty.swift 2>&1 | FileCheck -check-prefix=CHECK-INCLUDE %s -// RUN: not %target-swift-frontend -parse %s -Xcc -include -Xcc %S/Inputs/bad-bridging-header.h -import-objc-header %S/Inputs/sdk-bridging-header.h 2>&1 | FileCheck -check-prefix=CHECK-INCLUDE %s +// RUN: not %target-swift-frontend -parse %s -Xcc -include -Xcc %S/Inputs/bad-bridging-header.h 2>&1 | %FileCheck -check-prefix=CHECK-INCLUDE %s +// RUN: not %target-swift-frontend -parse %s -Xcc -include -Xcc %S/Inputs/bad-bridging-header.h -import-objc-header %S/../Inputs/empty.swift 2>&1 | %FileCheck -check-prefix=CHECK-INCLUDE %s +// RUN: not %target-swift-frontend -parse %s -Xcc -include -Xcc %S/Inputs/bad-bridging-header.h -import-objc-header %S/Inputs/sdk-bridging-header.h 2>&1 | %FileCheck -check-prefix=CHECK-INCLUDE %s // CHECK-FATAL: failed to import bridging header diff --git a/test/ClangModules/serialization-sil.swift b/test/ClangModules/serialization-sil.swift index 527e41bff7b5a..7cf5997b2b891 100644 --- a/test/ClangModules/serialization-sil.swift +++ b/test/ClangModules/serialization-sil.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-swift-frontend -emit-module-path %t/Test.swiftmodule -emit-sil -o /dev/null -module-name Test %s -sdk "" -import-objc-header %S/Inputs/serialization-sil.h -// RUN: %target-sil-extract %t/Test.swiftmodule -func=_TF4Test16testPartialApplyFPSo4Test_T_ -o - | FileCheck %s +// RUN: %target-sil-extract %t/Test.swiftmodule -func=_TF4Test16testPartialApplyFPSo4Test_T_ -o - | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/ClangModules/static_inline.swift b/test/ClangModules/static_inline.swift index 118c5de69bb2b..c1c86f6faeba2 100644 --- a/test/ClangModules/static_inline.swift +++ b/test/ClangModules/static_inline.swift @@ -3,8 +3,8 @@ // Check if SIL printing+parsing of a clang imported function works. // RUN: %target-swift-frontend -parse-as-library -module-name=test -emit-sil %s -import-objc-header %S/Inputs/static_inline.h -o %t/test.sil -// RUN: FileCheck < %t/test.sil %s -// RUN: %target-swift-frontend -parse-as-library -module-name=test -O -emit-ir %t/test.sil -import-objc-header %S/Inputs/static_inline.h | FileCheck --check-prefix=CHECK-IR %s +// RUN: %FileCheck < %t/test.sil %s +// RUN: %target-swift-frontend -parse-as-library -module-name=test -O -emit-ir %t/test.sil -import-objc-header %S/Inputs/static_inline.h | %FileCheck --check-prefix=CHECK-IR %s // CHECK: sil shared [clang c_inline_func] @c_inline_func : $@convention(c) (Int32) -> Int32 diff --git a/test/ClangModules/submodules.swift b/test/ClangModules/submodules.swift index 1e0907741712b..44506378f84a0 100644 --- a/test/ClangModules/submodules.swift +++ b/test/ClangModules/submodules.swift @@ -6,7 +6,7 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module-path %t/submodules.swiftmodule %s -DNO_ERRORS // RUN: echo 'import submodules; let s = "\(x), \(y)"' | %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse - -I %t -// RUN: echo 'import submodules; let s = "\(x), \(y)"' | not %target-swift-frontend -parse - -I %t 2>&1 | FileCheck -check-prefix=MISSING %s +// RUN: echo 'import submodules; let s = "\(x), \(y)"' | not %target-swift-frontend -parse - -I %t 2>&1 | %FileCheck -check-prefix=MISSING %s #if IMPORT_TOP_LEVEL import ctypes diff --git a/test/ClangModules/submodules_indirect.swift b/test/ClangModules/submodules_indirect.swift index 9c2183c3c0a8d..ff8a3361ad50d 100644 --- a/test/ClangModules/submodules_indirect.swift +++ b/test/ClangModules/submodules_indirect.swift @@ -3,7 +3,7 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse -verify -I %S/Inputs/custom-modules/ %s // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -o %t -emit-module -I %S/Inputs/custom-modules/ %s -module-name submodules // RUN: echo 'import submodules; let s = "\(x), \(y)"' | %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse - -I %t -I %S/Inputs/custom-modules/ -// RUN: echo 'import submodules; let s = "\(x), \(y)"' | not %target-swift-frontend -parse - -I %t -I %S/Inputs/custom-modules/ 2>&1 | FileCheck -check-prefix=MISSING %s +// RUN: echo 'import submodules; let s = "\(x), \(y)"' | not %target-swift-frontend -parse - -I %t -I %S/Inputs/custom-modules/ 2>&1 | %FileCheck -check-prefix=MISSING %s // XFAIL: linux diff --git a/test/ClangModules/submodules_scoped.swift b/test/ClangModules/submodules_scoped.swift index 84eb1e7c356ae..98aba3019016d 100644 --- a/test/ClangModules/submodules_scoped.swift +++ b/test/ClangModules/submodules_scoped.swift @@ -3,7 +3,7 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse -verify %s -DCHECK_SCOPING // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module -o %t %s -module-name submodules // RUN: echo 'import submodules; let s = "\(x), \(y)"' | %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse - -I %t -// RUN: echo 'import submodules; let s = "\(x), \(y)"' | not %target-swift-frontend -parse - -I %t 2>&1 | FileCheck -check-prefix=MISSING %s +// RUN: echo 'import submodules; let s = "\(x), \(y)"' | not %target-swift-frontend -parse - -I %t 2>&1 | %FileCheck -check-prefix=MISSING %s import typealias ctypes.bits.DWORD // MISSING: missing required modules: diff --git a/test/ClangModules/working-directory.swift b/test/ClangModules/working-directory.swift index 1ba6f0a969a16..14d0b43d2ebbd 100644 --- a/test/ClangModules/working-directory.swift +++ b/test/ClangModules/working-directory.swift @@ -1,4 +1,4 @@ -// RUN: cd %S/Inputs/ && %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse -Xcc -I -Xcc custom-modules %s -dump-clang-diagnostics 2>&1 | FileCheck %s +// RUN: cd %S/Inputs/ && %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse -Xcc -I -Xcc custom-modules %s -dump-clang-diagnostics 2>&1 | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/Constraints/diag_ambiguities_module.swift b/test/Constraints/diag_ambiguities_module.swift index 1006d7ed623ef..6d862bb724e6c 100644 --- a/test/Constraints/diag_ambiguities_module.swift +++ b/test/Constraints/diag_ambiguities_module.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/has_ambiguities.swift -// RUN: not %target-swift-frontend -parse %s -I %t 2>&1 | FileCheck %s +// RUN: not %target-swift-frontend -parse %s -I %t 2>&1 | %FileCheck %s import has_ambiguities diff --git a/test/DebugInfo/ASTSection.swift b/test/DebugInfo/ASTSection.swift index 4d4813483bf23..6dcf030fa4bef 100644 --- a/test/DebugInfo/ASTSection.swift +++ b/test/DebugInfo/ASTSection.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-build-swift -emit-executable %s -g -o %t/ASTSection -emit-module -// RUN: %lldb-moduleimport-test %t/ASTSection | FileCheck %s +// RUN: %lldb-moduleimport-test %t/ASTSection | %FileCheck %s // REQUIRES: executable_test diff --git a/test/DebugInfo/ASTSection_ObjC.swift b/test/DebugInfo/ASTSection_ObjC.swift index d4e9a9566f606..241d31d6137c8 100644 --- a/test/DebugInfo/ASTSection_ObjC.swift +++ b/test/DebugInfo/ASTSection_ObjC.swift @@ -2,13 +2,13 @@ // RUN: cp %S/Inputs/serialized-objc-header.h %t // RUN: %target-build-swift -emit-executable %S/ASTSection.swift -g -o %t/ASTSection-with-ObjC -import-objc-header %t/serialized-objc-header.h -DOBJC -module-name ASTSection -emit-module -// RUN: %lldb-moduleimport-test %t/ASTSection-with-ObjC | FileCheck %s +// RUN: %lldb-moduleimport-test %t/ASTSection-with-ObjC | %FileCheck %s // RUN: rm %t/serialized-objc-header.h -// RUN: %lldb-moduleimport-test %t/ASTSection-with-ObjC | FileCheck %s +// RUN: %lldb-moduleimport-test %t/ASTSection-with-ObjC | %FileCheck %s // RUN: %target-build-swift -emit-executable %S/ASTSection.swift -gline-tables-only -o %t/ASTSection -emit-module -// RUN: %lldb-moduleimport-test %t/ASTSection | FileCheck %s --allow-empty --check-prefix=LINETABLE-CHECK +// RUN: %lldb-moduleimport-test %t/ASTSection | %FileCheck %s --allow-empty --check-prefix=LINETABLE-CHECK // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/DebugInfo/ASTSection_linker.swift b/test/DebugInfo/ASTSection_linker.swift index 3f33269b3224d..6b022b025b5dc 100644 --- a/test/DebugInfo/ASTSection_linker.swift +++ b/test/DebugInfo/ASTSection_linker.swift @@ -8,11 +8,11 @@ // Test the inline section mechanism. // RUN: %target-ld %t/ASTSection.o -sectcreate __SWIFT __ast %t/ASTSection.swiftmodule -o %t/ASTSection.dylib -dylib -lSystem -lobjc -// RUN: %lldb-moduleimport-test %t/ASTSection.dylib | FileCheck %s +// RUN: %lldb-moduleimport-test %t/ASTSection.dylib | %FileCheck %s // Test the symbol table entry. // RUN: %target-ld %t/ASTSection.o -add_ast_path %t/ASTSection.swiftmodule -o %t/ASTSection.dylib -dylib -lSystem -lobjc -// RUN: %lldb-moduleimport-test %t/ASTSection.dylib | FileCheck %s +// RUN: %lldb-moduleimport-test %t/ASTSection.dylib | %FileCheck %s // REQUIRES: OS=macosx diff --git a/test/DebugInfo/Constructors.swift b/test/DebugInfo/Constructors.swift index 63369eb24c282..ce5813ee9a9bb 100644 --- a/test/DebugInfo/Constructors.swift +++ b/test/DebugInfo/Constructors.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s struct Foo { // Allocating constructor - should have no line table info. // CHECK: !DISubprogram(name: "init", linkageName: "_TFV12Constructors3FooCfT1xVs5Int64_S0_", diff --git a/test/DebugInfo/Destructors.swift b/test/DebugInfo/Destructors.swift index 277aae6fbdc6c..9810954e23489 100644 --- a/test/DebugInfo/Destructors.swift +++ b/test/DebugInfo/Destructors.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s public class Foo { // CHECK: !DISubprogram(name: "deinit", linkageName: "_TFC11Destructors3FooD" diff --git a/test/DebugInfo/DoubleCapture.swift b/test/DebugInfo/DoubleCapture.swift index 5f34ae4f28cd2..6321f21b61767 100644 --- a/test/DebugInfo/DoubleCapture.swift +++ b/test/DebugInfo/DoubleCapture.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s class C { func foo() { func bar() { diff --git a/test/DebugInfo/DynamicSelf.swift b/test/DebugInfo/DynamicSelf.swift index 2e2b7ca0f4e17..d2b410939da37 100644 --- a/test/DebugInfo/DynamicSelf.swift +++ b/test/DebugInfo/DynamicSelf.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s class C { let n : Int64 diff --git a/test/DebugInfo/EagerTypeMetadata.swift b/test/DebugInfo/EagerTypeMetadata.swift index 4400ed2d7d8c3..a53cedc4070a3 100644 --- a/test/DebugInfo/EagerTypeMetadata.swift +++ b/test/DebugInfo/EagerTypeMetadata.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -Onone -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -Onone -emit-ir -g -o - | %FileCheck %s public class C { diff --git a/test/DebugInfo/Errors.swift b/test/DebugInfo/Errors.swift index 426a87f624e16..9427ee7fcd7f4 100644 --- a/test/DebugInfo/Errors.swift +++ b/test/DebugInfo/Errors.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s class Obj {} enum MyError : Error { diff --git a/test/DebugInfo/GlobalMetatype.swift b/test/DebugInfo/GlobalMetatype.swift index 8356be741c9c7..e0a562e6cd26f 100644 --- a/test/DebugInfo/GlobalMetatype.swift +++ b/test/DebugInfo/GlobalMetatype.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s class Foo {} let x = "Hello World!" diff --git a/test/DebugInfo/GuardVar.swift b/test/DebugInfo/GuardVar.swift index 6758d0f2f7dd4..9bc05407d8c06 100644 --- a/test/DebugInfo/GuardVar.swift +++ b/test/DebugInfo/GuardVar.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} public func f(_ i : Int?) diff --git a/test/DebugInfo/ImportClangSubmodule.swift b/test/DebugInfo/ImportClangSubmodule.swift index 87c44836da25e..ff4d274a4ceb1 100644 --- a/test/DebugInfo/ImportClangSubmodule.swift +++ b/test/DebugInfo/ImportClangSubmodule.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // REQUIRES: OS=macosx -// RUN: %target-swift-frontend -emit-ir %s -g -o - | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s -g -o - | %FileCheck %s // CHECK: !DIImportedEntity( // CHECK: tag: DW_TAG_imported_module{{.*}}entity: ![[C:.*]], line: [[@LINE+1]]) diff --git a/test/DebugInfo/Imports.swift b/test/DebugInfo/Imports.swift index 08688294c4586..cd36f01a391a1 100644 --- a/test/DebugInfo/Imports.swift +++ b/test/DebugInfo/Imports.swift @@ -1,9 +1,9 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-swift-frontend -emit-module-path %t/basic.swiftmodule %S/basic.swift -// RUN: %target-swift-frontend -emit-ir -module-name Foo %s -I %t -g -o - | FileCheck %s +// RUN: %target-swift-frontend -emit-ir -module-name Foo %s -I %t -g -o - | %FileCheck %s // RUN: %target-swift-frontend -c -module-name Foo %s -I %t -g -o %t.o -// RUN: llvm-dwarfdump %t.o | FileCheck --check-prefix=DWARF %s +// RUN: llvm-dwarfdump %t.o | %FileCheck --check-prefix=DWARF %s // CHECK-DAG: ![[FOOMODULE:[0-9]+]] = !DIModule({{.*}}, name: "Foo", includePath: "{{.*}}test{{.*}}DebugInfo{{.*}}" // CHECK-DAG: !DIImportedEntity(tag: DW_TAG_imported_module, scope: ![[THISFILE:[0-9]+]], entity: ![[FOOMODULE]] diff --git a/test/DebugInfo/InlineBridgingHeader.swift b/test/DebugInfo/InlineBridgingHeader.swift index 6697e08c9b81f..90cad41da8d63 100644 --- a/test/DebugInfo/InlineBridgingHeader.swift +++ b/test/DebugInfo/InlineBridgingHeader.swift @@ -1,6 +1,6 @@ // RUN: %target-swift-frontend \ // RUN: -import-objc-header %S/Inputs/InlineBridgingHeader.h \ -// RUN: -emit-ir -g %s -o - | FileCheck %s +// RUN: -emit-ir -g %s -o - | %FileCheck %s // REQUIRES: objc_interop // The Swift CU must come first. diff --git a/test/DebugInfo/LinetableArtificialFn.swift b/test/DebugInfo/LinetableArtificialFn.swift index 592e780dca97a..820d15bf2921a 100644 --- a/test/DebugInfo/LinetableArtificialFn.swift +++ b/test/DebugInfo/LinetableArtificialFn.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - -disable-sil-linking | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - -disable-sil-linking | %FileCheck %s // Verify that a helper function that is generated on-the-fly does // not mess up the linetable of the calling function. diff --git a/test/DebugInfo/NestedTypes.swift b/test/DebugInfo/NestedTypes.swift index f52d4d80b7c82..e5834ecd33361 100644 --- a/test/DebugInfo/NestedTypes.swift +++ b/test/DebugInfo/NestedTypes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -gdwarf-types -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -gdwarf-types -o - | %FileCheck %s // Verify that the size of a class that has not been created before // its outer type is emitted is emitted correctly. diff --git a/test/DebugInfo/PrivateDiscriminator.swift b/test/DebugInfo/PrivateDiscriminator.swift index 803d3a4375d7a..1db03e178277f 100644 --- a/test/DebugInfo/PrivateDiscriminator.swift +++ b/test/DebugInfo/PrivateDiscriminator.swift @@ -1,9 +1,9 @@ // Private discriminators should only be emitted for multi-file projects. -// RUN: %target-swift-frontend -emit-ir %s -g -o - | FileCheck --check-prefix=SINGLE %s +// RUN: %target-swift-frontend -emit-ir %s -g -o - | %FileCheck --check-prefix=SINGLE %s // SINGLE-NOT: !DICompileUnit({{.*}}-private-discriminator -// RUN: %target-swift-frontend %S/../Inputs/empty.swift -primary-file %s -emit-ir -g | FileCheck %s +// RUN: %target-swift-frontend %S/../Inputs/empty.swift -primary-file %s -emit-ir -g | %FileCheck %s // CHECK: !DICompileUnit({{.*}}flags: {{[^,]*}}-private-discriminator [[DISCRIMINATOR:_[A-Z0-9]+]] func markUsed(_ t: T) {} diff --git a/test/DebugInfo/ProtocolContainer.swift b/test/DebugInfo/ProtocolContainer.swift index 0c0ca4425f84c..7ccd786235881 100644 --- a/test/DebugInfo/ProtocolContainer.swift +++ b/test/DebugInfo/ProtocolContainer.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/WeakCapture.swift b/test/DebugInfo/WeakCapture.swift index d0e91ff23e01c..4cf3643cd7082 100644 --- a/test/DebugInfo/WeakCapture.swift +++ b/test/DebugInfo/WeakCapture.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s class A { init(handler: (() -> ())) { } } diff --git a/test/DebugInfo/accessors.swift b/test/DebugInfo/accessors.swift index 840cbd8d95068..6a040cd263f7b 100644 --- a/test/DebugInfo/accessors.swift +++ b/test/DebugInfo/accessors.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s // Verify that we generate appropriate names for accessors. // CHECK: !DISubprogram(name: "x.get" diff --git a/test/DebugInfo/alloca-init.swift b/test/DebugInfo/alloca-init.swift index 5a8cbbb696892..9c9edeefb982d 100644 --- a/test/DebugInfo/alloca-init.swift +++ b/test/DebugInfo/alloca-init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/allocstack.swift b/test/DebugInfo/allocstack.swift index 4534f3cd9efdf..98808cc4c931d 100644 --- a/test/DebugInfo/allocstack.swift +++ b/test/DebugInfo/allocstack.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s -// RUN: %target-swift-frontend %s -emit-sil -g -o - | FileCheck -check-prefix=CHECK-SIL %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-sil -g -o - | %FileCheck -check-prefix=CHECK-SIL %s import StdlibUnittest // Test that debug info for local variables is preserved by the diff --git a/test/DebugInfo/anonymous.swift b/test/DebugInfo/anonymous.swift index 7e94b1a7e5a13..c1734d9ad9311 100644 --- a/test/DebugInfo/anonymous.swift +++ b/test/DebugInfo/anonymous.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s // CHECK: !DILocalVariable(name: "_0", arg: 1 // CHECK: !DILocalVariable(name: "_1", arg: 2 diff --git a/test/DebugInfo/any.swift b/test/DebugInfo/any.swift index 25343be6f31e0..e16ff8e3da5d9 100644 --- a/test/DebugInfo/any.swift +++ b/test/DebugInfo/any.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/apple-types-accel.swift b/test/DebugInfo/apple-types-accel.swift index 536e02ced19ba..dc2b4ee49a42a 100644 --- a/test/DebugInfo/apple-types-accel.swift +++ b/test/DebugInfo/apple-types-accel.swift @@ -1,7 +1,7 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s // RUN: %target-swift-frontend %s -c -g -o %t.o -// RUN: dwarfdump --verify --apple-types %t.o | FileCheck --check-prefix=CHECK-ACCEL %s -// RUN: dwarfdump --debug-info %t.o | FileCheck --check-prefix=CHECK-DWARF %s +// RUN: dwarfdump --verify --apple-types %t.o | %FileCheck --check-prefix=CHECK-ACCEL %s +// RUN: dwarfdump --debug-info %t.o | %FileCheck --check-prefix=CHECK-DWARF %s // REQUIRES: OS=macosx diff --git a/test/DebugInfo/archetype.swift b/test/DebugInfo/archetype.swift index d880552688c08..11550019b9d15 100644 --- a/test/DebugInfo/archetype.swift +++ b/test/DebugInfo/archetype.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s protocol IntegerArithmetic { static func uncheckedSubtract(_ lhs: Self, rhs: Self) -> (Self, Bool) diff --git a/test/DebugInfo/archetypes2.swift b/test/DebugInfo/archetypes2.swift index ebccba0af0366..c6f25d8bf324e 100644 --- a/test/DebugInfo/archetypes2.swift +++ b/test/DebugInfo/archetypes2.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -verify -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -verify -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/arg-debug_value.swift b/test/DebugInfo/arg-debug_value.swift index 475bbae69a1d1..2e156c43e0f86 100644 --- a/test/DebugInfo/arg-debug_value.swift +++ b/test/DebugInfo/arg-debug_value.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s // Verify that arguments described by debug_value intrinsics are only // emitted once. diff --git a/test/DebugInfo/argument.swift b/test/DebugInfo/argument.swift index cba77e4b8138d..3a1559d249bc4 100644 --- a/test/DebugInfo/argument.swift +++ b/test/DebugInfo/argument.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/attributes.swift b/test/DebugInfo/attributes.swift index 79555977c0b0e..16a61a5370f1f 100644 --- a/test/DebugInfo/attributes.swift +++ b/test/DebugInfo/attributes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -disable-objc-attr-requires-foundation-module %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend -disable-objc-attr-requires-foundation-module %s -emit-ir -g -o - | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/DebugInfo/atype.swift b/test/DebugInfo/atype.swift index a141fefb0d09f..8566191ee2b6f 100644 --- a/test/DebugInfo/atype.swift +++ b/test/DebugInfo/atype.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/autoclosure.swift b/test/DebugInfo/autoclosure.swift index 6358bdfdcbec2..6d757f229c6e0 100644 --- a/test/DebugInfo/autoclosure.swift +++ b/test/DebugInfo/autoclosure.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s // CHECK: define{{.*}}@_TF11autoclosure7call_meFVs5Int64T_ // CHECK-NOT: ret void diff --git a/test/DebugInfo/basic.swift b/test/DebugInfo/basic.swift index af27e9315e546..9028feacb5767 100644 --- a/test/DebugInfo/basic.swift +++ b/test/DebugInfo/basic.swift @@ -2,29 +2,29 @@ // -------------------------------------------------------------------- // Verify that we don't emit any debug info by default. // RUN: %target-swift-frontend %s -emit-ir -o - \ -// RUN: | FileCheck %s --check-prefix NDEBUG +// RUN: | %FileCheck %s --check-prefix NDEBUG // NDEBUG-NOT: !dbg // NDEBUG-NOT: DW_TAG // -------------------------------------------------------------------- // Verify that we don't emit any debug info with -gnone. // RUN: %target-swift-frontend %s -emit-ir -gnone -o - \ -// RUN: | FileCheck %s --check-prefix NDEBUG +// RUN: | %FileCheck %s --check-prefix NDEBUG // -------------------------------------------------------------------- // Verify that we don't emit any type info with -gline-tables-only. // RUN: %target-swift-frontend %s -emit-ir -gline-tables-only -o - \ -// RUN: | FileCheck %s --check-prefix CHECK-LINETABLES +// RUN: | %FileCheck %s --check-prefix CHECK-LINETABLES // CHECK: !dbg // CHECK-LINETABLES-NOT: DW_TAG_{{.*}}variable // CHECK-LINETABLES-NOT: DW_TAG_structure_type // CHECK-LINETABLES-NOT: DW_TAG_basic_type // -------------------------------------------------------------------- // Now check that we do generate line+scope info with -g. -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s // RUN: %target-swift-frontend %s -emit-ir -g -o - -disable-sil-linking \ -// RUN: | FileCheck %s --check-prefix=CHECK-NOSIL +// RUN: | %FileCheck %s --check-prefix=CHECK-NOSIL // -------------------------------------------------------------------- // Currently -gdwarf-types should give the same results as -g. -// RUN: %target-swift-frontend %s -emit-ir -gdwarf-types -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -gdwarf-types -o - | %FileCheck %s // -------------------------------------------------------------------- // // CHECK: foo diff --git a/test/DebugInfo/bbentry-location.swift b/test/DebugInfo/bbentry-location.swift index 47fd6ddb02879..1b52e1097ff6b 100644 --- a/test/DebugInfo/bbentry-location.swift +++ b/test/DebugInfo/bbentry-location.swift @@ -1,6 +1,6 @@ // REQUIRES: OS=ios // REQUIRES: objc_interop -// RUN: %target-swift-frontend -emit-ir -g %s -o - | FileCheck %s +// RUN: %target-swift-frontend -emit-ir -g %s -o - | %FileCheck %s import UIKit @available(iOS, introduced: 8.0) diff --git a/test/DebugInfo/bool.swift b/test/DebugInfo/bool.swift index 95e6ae23bc19f..a1c554673fd47 100644 --- a/test/DebugInfo/bool.swift +++ b/test/DebugInfo/bool.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -gdwarf-types -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -gdwarf-types -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/bound-namealiastype.swift b/test/DebugInfo/bound-namealiastype.swift index cae0f7c365095..cc2112fadb301 100644 --- a/test/DebugInfo/bound-namealiastype.swift +++ b/test/DebugInfo/bound-namealiastype.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir -g %s -o - | FileCheck %s +// RUN: %target-swift-frontend -emit-ir -g %s -o - | %FileCheck %s public protocol OS_dispatch_queue { } diff --git a/test/DebugInfo/byref-capture.swift b/test/DebugInfo/byref-capture.swift index 05007658e1e3b..438d2d7ab7b92 100644 --- a/test/DebugInfo/byref-capture.swift +++ b/test/DebugInfo/byref-capture.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func makeIncrementor(_ inc : Int64) -> () -> Int64 { diff --git a/test/DebugInfo/callexpr.swift b/test/DebugInfo/callexpr.swift index 3d08ed43e6d2d..4b738f2edb5f6 100644 --- a/test/DebugInfo/callexpr.swift +++ b/test/DebugInfo/callexpr.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -g -emit-ir -o - | FileCheck %s +// RUN: %target-swift-frontend %s -g -emit-ir -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/capturelist.swift b/test/DebugInfo/capturelist.swift index cac7e8b4414e3..6c02abded80ae 100644 --- a/test/DebugInfo/capturelist.swift +++ b/test/DebugInfo/capturelist.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s class C { func withClosure(_ : () -> ()) -> () {} diff --git a/test/DebugInfo/closure-arg-linetable.swift b/test/DebugInfo/closure-arg-linetable.swift index ebcca4b358cee..3ad6faab21e1c 100644 --- a/test/DebugInfo/closure-arg-linetable.swift +++ b/test/DebugInfo/closure-arg-linetable.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s public class C { diff --git a/test/DebugInfo/closure-args.swift b/test/DebugInfo/closure-args.swift index ca30f0099e3ea..1c306ccddd215 100644 --- a/test/DebugInfo/closure-args.swift +++ b/test/DebugInfo/closure-args.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s import Swift diff --git a/test/DebugInfo/closure-args2.swift b/test/DebugInfo/closure-args2.swift index 353d815540fe6..5014cf587a250 100644 --- a/test/DebugInfo/closure-args2.swift +++ b/test/DebugInfo/closure-args2.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func main () -> Void { diff --git a/test/DebugInfo/closure-multivalue.swift b/test/DebugInfo/closure-multivalue.swift index 0381bf8998018..5c7fe7fe34fe5 100644 --- a/test/DebugInfo/closure-multivalue.swift +++ b/test/DebugInfo/closure-multivalue.swift @@ -1,5 +1,5 @@ // rdar://problem/23727705: -// RUN-DISABLED: %target-swift-frontend -O %s -disable-llvm-optzns -emit-ir -g -o - | FileCheck %s +// RUN-DISABLED: %target-swift-frontend -O %s -disable-llvm-optzns -emit-ir -g -o - | %FileCheck %s import StdlibUnittest // CHECK: define {{.*}}i1 {{.*}}4main4sort @@ -31,7 +31,7 @@ public func demo() { demo() // At -O0, we should have a single aggregate argument. -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s --check-prefix=CHECK-O0 +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s --check-prefix=CHECK-O0 // Verify that a reabstraction thunk does not have a line number. // CHECK-O0-NOT: DW_OP_bit_piece // CHECK-O0-NOT: DW_OP_bit_piece diff --git a/test/DebugInfo/closure.swift b/test/DebugInfo/closure.swift index d876e6568217b..300d09705b21e 100644 --- a/test/DebugInfo/closure.swift +++ b/test/DebugInfo/closure.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/debug_value_addr.swift b/test/DebugInfo/debug_value_addr.swift index e50b33c510051..56d22b537e98a 100644 --- a/test/DebugInfo/debug_value_addr.swift +++ b/test/DebugInfo/debug_value_addr.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | FileCheck %s -// RUN: %target-swift-frontend %s -emit-sil -g -o - | FileCheck -check-prefix=CHECK-SIL %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-sil -g -o - | %FileCheck -check-prefix=CHECK-SIL %s // Verify that -Onone shadow copies are emitted for debug_value_addr // instructions. diff --git a/test/DebugInfo/dynamic_layout.swift b/test/DebugInfo/dynamic_layout.swift index 73448ea0c1a0d..104c84a32b98a 100644 --- a/test/DebugInfo/dynamic_layout.swift +++ b/test/DebugInfo/dynamic_layout.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/enum.swift b/test/DebugInfo/enum.swift index 65e1101e88b3d..98c257863150d 100644 --- a/test/DebugInfo/enum.swift +++ b/test/DebugInfo/enum.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | FileCheck %s -// RUN: %target-swift-frontend -primary-file %s -emit-ir -gdwarf-types -o - | FileCheck %s --check-prefix=DWARF +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -gdwarf-types -o - | %FileCheck %s --check-prefix=DWARF // CHECK: ![[EMPTY:.*]] = !{} diff --git a/test/DebugInfo/external-global.swift b/test/DebugInfo/external-global.swift index d7f1c40d57354..0a73297705c35 100644 --- a/test/DebugInfo/external-global.swift +++ b/test/DebugInfo/external-global.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-swift-frontend -emit-module-path %t/Globals.swiftmodule %S/Globals.swift -// RUN: %target-swift-frontend -I %t %s -g -emit-ir -o - | FileCheck %s +// RUN: %target-swift-frontend -I %t %s -g -emit-ir -o - | %FileCheck %s import Globals // No debug info should be emitted for an externally defined global variable. // CHECK-NOT: !DIGlobalVariable({{.*}}global diff --git a/test/DebugInfo/fnptr.swift b/test/DebugInfo/fnptr.swift index bb412dbe4de98..62e8d5e5ab5c9 100644 --- a/test/DebugInfo/fnptr.swift +++ b/test/DebugInfo/fnptr.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend %s -emit-ir -gdwarf-types -o - | FileCheck %s -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s --check-prefix=AST +// RUN: %target-swift-frontend %s -emit-ir -gdwarf-types -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s --check-prefix=AST // CHECK-DAG: ![[SINODE:.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Int64",{{.*}} identifier: [[SI:.*]]) // CHECK-DAG: ![[SFNODE:.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Float",{{.*}} identifier: [[SF:.*]]) diff --git a/test/DebugInfo/for.swift b/test/DebugInfo/for.swift index 9c141cf419b62..a0ea094982d92 100644 --- a/test/DebugInfo/for.swift +++ b/test/DebugInfo/for.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -g -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -g -emit-ir %s | %FileCheck %s // Verify that variables bound in the for statements are in distinct scopes. diff --git a/test/DebugInfo/foreach.swift b/test/DebugInfo/foreach.swift index b322a847dd372..248e95a1bc6bf 100644 --- a/test/DebugInfo/foreach.swift +++ b/test/DebugInfo/foreach.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -g -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -g -emit-ir %s | %FileCheck %s // Verify that variables bound in the foreach statements are in distinct scopes. let values = [1, 2, 3] diff --git a/test/DebugInfo/generic_arg.swift b/test/DebugInfo/generic_arg.swift index bcd29c4d1fd03..9d260f2bbb549 100644 --- a/test/DebugInfo/generic_arg.swift +++ b/test/DebugInfo/generic_arg.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s import StdlibUnittest func foo(_ x: T) -> () { // CHECK: define {{.*}} @_TF11generic_arg3foourFxT_ diff --git a/test/DebugInfo/generic_arg2.swift b/test/DebugInfo/generic_arg2.swift index e429e917a1113..a7750af703716 100644 --- a/test/DebugInfo/generic_arg2.swift +++ b/test/DebugInfo/generic_arg2.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s // CHECK: define hidden void @_TFC12generic_arg25Class3foo{{.*}}, %swift.type* %U // CHECK: [[Y:%.*]] = getelementptr inbounds %C12generic_arg25Class, %C12generic_arg25Class* %2, i32 0, i32 0, i32 0 diff --git a/test/DebugInfo/generic_arg3.swift b/test/DebugInfo/generic_arg3.swift index ed333fa844542..8ff043fedbbd5 100644 --- a/test/DebugInfo/generic_arg3.swift +++ b/test/DebugInfo/generic_arg3.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func apply(_ T : Type, fn: (Type) -> Type) -> Type { return fn(T) } diff --git a/test/DebugInfo/generic_arg4.swift b/test/DebugInfo/generic_arg4.swift index 156f8fac4eb51..72783dee04099 100644 --- a/test/DebugInfo/generic_arg4.swift +++ b/test/DebugInfo/generic_arg4.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s // REQUIRES: objc_interop public struct Q { let x: T diff --git a/test/DebugInfo/generic_arg5.swift b/test/DebugInfo/generic_arg5.swift index b47fa1eb87a8f..ebed49e5474e2 100644 --- a/test/DebugInfo/generic_arg5.swift +++ b/test/DebugInfo/generic_arg5.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s public struct S { let value : Type diff --git a/test/DebugInfo/generic_args.swift b/test/DebugInfo/generic_args.swift index 7c01a122a56be..ce2331c6c87aa 100644 --- a/test/DebugInfo/generic_args.swift +++ b/test/DebugInfo/generic_args.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -verify -g -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -verify -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/generic_enum.swift b/test/DebugInfo/generic_enum.swift index 6fca022ce9170..3485c99bea9f1 100644 --- a/test/DebugInfo/generic_enum.swift +++ b/test/DebugInfo/generic_enum.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/generic_enum_closure.swift b/test/DebugInfo/generic_enum_closure.swift index 4e7d0df6760b9..9945a645d6f56 100644 --- a/test/DebugInfo/generic_enum_closure.swift +++ b/test/DebugInfo/generic_enum_closure.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s struct __CurrentErrno {} struct CErrorOr diff --git a/test/DebugInfo/gsil.swift b/test/DebugInfo/gsil.swift index 9866e0f54ce51..a760bceaf0385 100644 --- a/test/DebugInfo/gsil.swift +++ b/test/DebugInfo/gsil.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend %s -O -gsil -emit-ir -o %t/out.ir -// RUN: FileCheck %s < %t/out.ir -// RUN: FileCheck %s --check-prefix=CHECK_OUT_SIL < %t/out.ir.gsil_0.sil +// RUN: %FileCheck %s < %t/out.ir +// RUN: %FileCheck %s --check-prefix=CHECK_OUT_SIL < %t/out.ir.gsil_0.sil // CHECK: [[F:![0-9]+]] = !DIFile(filename: "out.ir.gsil_0.sil", directory: "{{.+}}") // CHECK: !DISubprogram(linkageName: "_TF3out6testitFT_T_", scope: !{{[0-9]+}}, file: [[F]], line: {{[1-9][0-9]+}}, diff --git a/test/DebugInfo/guard-let.swift b/test/DebugInfo/guard-let.swift index 8d5fd03e06aaf..da54e8efad7df 100644 --- a/test/DebugInfo/guard-let.swift +++ b/test/DebugInfo/guard-let.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s --check-prefix=CHECK2 +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s --check-prefix=CHECK2 func use(_ t: T) {} public func f(_ i : Int?) diff --git a/test/DebugInfo/if-branchlocations.swift b/test/DebugInfo/if-branchlocations.swift index f5cd0fa888da1..d7b5be2430ed2 100644 --- a/test/DebugInfo/if-branchlocations.swift +++ b/test/DebugInfo/if-branchlocations.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-sil -emit-verbose-sil -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-sil -emit-verbose-sil -g -o - | %FileCheck %s class NSURL {} diff --git a/test/DebugInfo/if-var.swift b/test/DebugInfo/if-var.swift index 33fdd91e4e73a..137392fbc4039 100644 --- a/test/DebugInfo/if-var.swift +++ b/test/DebugInfo/if-var.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} public func f(_ s : String?) diff --git a/test/DebugInfo/if.swift b/test/DebugInfo/if.swift index b531ac85a5e0f..2b478dad00190 100644 --- a/test/DebugInfo/if.swift +++ b/test/DebugInfo/if.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -g -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -g -emit-ir %s | %FileCheck %s func yieldValue() -> Int64? { return 23 } diff --git a/test/DebugInfo/implicitdecl.swift b/test/DebugInfo/implicitdecl.swift index b42cf62845071..e805fbccf6ce0 100644 --- a/test/DebugInfo/implicitdecl.swift +++ b/test/DebugInfo/implicitdecl.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir -g %s -o - | FileCheck %s +// RUN: %target-swift-frontend -emit-ir -g %s -o - | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/DebugInfo/implicitreturn.swift b/test/DebugInfo/implicitreturn.swift index 0c75f1599ca10..3501f902d468d 100644 --- a/test/DebugInfo/implicitreturn.swift +++ b/test/DebugInfo/implicitreturn.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -S -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -S -g -o - | %FileCheck %s func app() { // Make sure we don't jump back to before the prologue. diff --git a/test/DebugInfo/initializer.swift b/test/DebugInfo/initializer.swift index e9e3dc0228039..fda6d35e1b2c5 100644 --- a/test/DebugInfo/initializer.swift +++ b/test/DebugInfo/initializer.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -import-objc-header %S/Inputs/serialized-objc-header.h -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -import-objc-header %S/Inputs/serialized-objc-header.h -emit-ir -g -o - | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/DebugInfo/inlinedAt.swift b/test/DebugInfo/inlinedAt.swift index f93316003bbba..44c0f834b8aa1 100644 --- a/test/DebugInfo/inlinedAt.swift +++ b/test/DebugInfo/inlinedAt.swift @@ -1,6 +1,6 @@ // RUN: %target-swift-frontend %s -O -I %t -emit-sil -emit-verbose-sil -o - \ -// RUN: | FileCheck %s --check-prefix=CHECK-SIL -// RUN: %target-swift-frontend %s -O -I %t -emit-ir -g -o - | FileCheck %s +// RUN: | %FileCheck %s --check-prefix=CHECK-SIL +// RUN: %target-swift-frontend %s -O -I %t -emit-ir -g -o - | %FileCheck %s public var glob : Int = 0 @inline(never) public func hold(_ n : Int) { glob = n } diff --git a/test/DebugInfo/inlinescopes.swift b/test/DebugInfo/inlinescopes.swift index e67f81e23e905..9a05d5edfe491 100644 --- a/test/DebugInfo/inlinescopes.swift +++ b/test/DebugInfo/inlinescopes.swift @@ -3,8 +3,8 @@ // RUN: echo "public var x = Int64()" \ // RUN: | %target-swift-frontend -module-name FooBar -emit-module -o %t - // RUN: %target-swift-frontend %s -O -I %t -emit-ir -g -o %t.ll -// RUN: FileCheck %s < %t.ll -// RUN: FileCheck %s -check-prefix=TRANSPARENT-CHECK < %t.ll +// RUN: %FileCheck %s < %t.ll +// RUN: %FileCheck %s -check-prefix=TRANSPARENT-CHECK < %t.ll // CHECK: define{{( protected)?( signext)?}} i32 @main // CHECK: call {{.*}}noinline{{.*}}, !dbg ![[CALL:.*]] diff --git a/test/DebugInfo/inout.swift b/test/DebugInfo/inout.swift index 544aef0429f4e..3b66e7c576f1c 100644 --- a/test/DebugInfo/inout.swift +++ b/test/DebugInfo/inout.swift @@ -1,7 +1,7 @@ // RUN: %target-swift-frontend %s -emit-ir -g -module-name inout -o %t.ll -// RUN: cat %t.ll | FileCheck %s -// RUN: cat %t.ll | FileCheck %s --check-prefix=PROMO-CHECK -// RUN: cat %t.ll | FileCheck %s --check-prefix=FOO-CHECK +// RUN: cat %t.ll | %FileCheck %s +// RUN: cat %t.ll | %FileCheck %s --check-prefix=PROMO-CHECK +// RUN: cat %t.ll | %FileCheck %s --check-prefix=FOO-CHECK // LValues are direct values, too. They are reference types, though. diff --git a/test/DebugInfo/inout2.swift b/test/DebugInfo/inout2.swift index 82e7cca2f977e..7e776e309018f 100644 --- a/test/DebugInfo/inout2.swift +++ b/test/DebugInfo/inout2.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s // LValues are direct values, too. They are reference types, though. diff --git a/test/DebugInfo/iteration.swift b/test/DebugInfo/iteration.swift index f40f220bfc104..a884ea060d7ff 100644 --- a/test/DebugInfo/iteration.swift +++ b/test/DebugInfo/iteration.swift @@ -1,5 +1,5 @@ // RUN: %target-swift-frontend %s -emit-ir -g -o %t.ll -// RUN: FileCheck %s < %t.ll +// RUN: %FileCheck %s < %t.ll func markUsed(_ t: T) {} @@ -29,7 +29,7 @@ func count() { count() // End-to-end test: -// RUN: llc %t.ll -filetype=obj -o - | llvm-dwarfdump - | FileCheck %s --check-prefix DWARF-CHECK +// RUN: llc %t.ll -filetype=obj -o - | llvm-dwarfdump - | %FileCheck %s --check-prefix DWARF-CHECK // DWARF-CHECK: DW_TAG_variable // DWARF-CHECK: DW_AT_name {{.*}} "letter" // diff --git a/test/DebugInfo/iuo_arg.swift b/test/DebugInfo/iuo_arg.swift index a9c25d1386860..7088d1a1a932b 100644 --- a/test/DebugInfo/iuo_arg.swift +++ b/test/DebugInfo/iuo_arg.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s class CGImageRef {} class UIImage { diff --git a/test/DebugInfo/let.swift b/test/DebugInfo/let.swift index 604ed55a9b6e9..55a9b665c5a40 100644 --- a/test/DebugInfo/let.swift +++ b/test/DebugInfo/let.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s class DeepThought { func query() -> Int64 { return 42 } diff --git a/test/DebugInfo/letclause.swift b/test/DebugInfo/letclause.swift index 1d48191d7fdb2..2dd62f116b2e9 100644 --- a/test/DebugInfo/letclause.swift +++ b/test/DebugInfo/letclause.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s // Test debug info for storageless variables. struct Symbol {} diff --git a/test/DebugInfo/letstring.swift b/test/DebugInfo/letstring.swift index 68868fe5b6816..9cb8b299cb941 100644 --- a/test/DebugInfo/letstring.swift +++ b/test/DebugInfo/letstring.swift @@ -1,5 +1,5 @@ // RUN: %target-swift-frontend %s -emit-ir -g -o %t.ll -// RUN: FileCheck %s < %t.ll +// RUN: %FileCheck %s < %t.ll class UIWindow {} class AppDelegate { @@ -25,7 +25,7 @@ class AppDelegate { // End-to-end test: // RUN: llc %t.ll -filetype=obj -o %t.o -// RUN: llvm-dwarfdump %t.o | FileCheck %s --check-prefix DWARF-CHECK +// RUN: llvm-dwarfdump %t.o | %FileCheck %s --check-prefix DWARF-CHECK // DWARF-CHECK: DW_AT_name {{.*}} "f" // // DWARF-CHECK: DW_TAG_formal_parameter diff --git a/test/DebugInfo/line-directive.swift b/test/DebugInfo/line-directive.swift index 7785cee983143..f3b4866dfa124 100644 --- a/test/DebugInfo/line-directive.swift +++ b/test/DebugInfo/line-directive.swift @@ -12,7 +12,7 @@ func f() { markUsed("jump directly to def") } -// RUN: %target-swift-frontend -primary-file %s -S -g -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -S -g -o - | %FileCheck %s // CHECK: .file [[MAIN:.*]] "{{.*}}line-directive.swift" // CHECK: .loc [[MAIN]] 1 // CHECK: .file [[ABC:.*]] "abc.swift" diff --git a/test/DebugInfo/linetable-cleanups.swift b/test/DebugInfo/linetable-cleanups.swift index 843b39d6fa3dc..aaa569bacdb4c 100644 --- a/test/DebugInfo/linetable-cleanups.swift +++ b/test/DebugInfo/linetable-cleanups.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/linetable-do.swift b/test/DebugInfo/linetable-do.swift index 49c5d2688387e..327435328b7dc 100644 --- a/test/DebugInfo/linetable-do.swift +++ b/test/DebugInfo/linetable-do.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle %s -emit-ir -g -o - | FileCheck %s -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle %s -emit-sil -emit-verbose-sil -g -o - | FileCheck -check-prefix=CHECK-SIL %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle %s -emit-sil -emit-verbose-sil -g -o - | %FileCheck -check-prefix=CHECK-SIL %s import StdlibUnittest class Obj {} diff --git a/test/DebugInfo/linetable.swift b/test/DebugInfo/linetable.swift index 6ca493fa6bb06..c8ebbc318cc84 100644 --- a/test/DebugInfo/linetable.swift +++ b/test/DebugInfo/linetable.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s -// RUN: %target-swift-frontend %s -S -g -o - | FileCheck %s --check-prefix ASM-CHECK +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -S -g -o - | %FileCheck %s --check-prefix ASM-CHECK // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/DebugInfo/liverange-extension.swift b/test/DebugInfo/liverange-extension.swift index ba2bad51e68e2..bc4864bc46d6f 100644 --- a/test/DebugInfo/liverange-extension.swift +++ b/test/DebugInfo/liverange-extension.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -g -emit-ir -o - | FileCheck %s +// RUN: %target-swift-frontend %s -g -emit-ir -o - | %FileCheck %s func use(_ x: T) {} diff --git a/test/DebugInfo/local-vars.swift.gyb b/test/DebugInfo/local-vars.swift.gyb index d22becda46606..c4e7404cba584 100644 --- a/test/DebugInfo/local-vars.swift.gyb +++ b/test/DebugInfo/local-vars.swift.gyb @@ -3,12 +3,12 @@ // all. There are other tests testing liveness and representation. // RUN: %gyb %s -o %t.swift -// RUN: %target-swift-frontend %t.swift -g -emit-ir -o - | FileCheck %t.swift +// RUN: %target-swift-frontend %t.swift -g -emit-ir -o - | %FileCheck %t.swift // RUN: %target-swift-frontend %t.swift -g -c -o %t.o // RUN: llvm-dwarfdump --debug-dump=info %t.o \ -// RUN: | FileCheck %t.swift --check-prefix=DWARF +// RUN: | %FileCheck %t.swift --check-prefix=DWARF // RUN: %target-swift-frontend %t.swift -O -g -emit-ir -o - \ -// RUN: | FileCheck %t.swift --check-prefix=OPTZNS +// RUN: | %FileCheck %t.swift --check-prefix=OPTZNS // OPTZNS-NOT: alloca{{.*}}.addr diff --git a/test/DebugInfo/mangling-stdlib.swift b/test/DebugInfo/mangling-stdlib.swift index c9df647e01f41..2f8f14f6fb7dd 100644 --- a/test/DebugInfo/mangling-stdlib.swift +++ b/test/DebugInfo/mangling-stdlib.swift @@ -1,3 +1,3 @@ -// RUN: %target-swift-frontend -parse-stdlib %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib %s -emit-ir -g -o - | %FileCheck %s // CHECK: !DIDerivedType(tag: DW_TAG_typedef, name: "_TtBb", var bo : Builtin.BridgeObject diff --git a/test/DebugInfo/mangling.swift b/test/DebugInfo/mangling.swift index fc5c810573fd1..0f8c3fe619a0d 100644 --- a/test/DebugInfo/mangling.swift +++ b/test/DebugInfo/mangling.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s // Type: // Swift.Dictionary diff --git a/test/DebugInfo/multi-file.swift b/test/DebugInfo/multi-file.swift index 72067218eeba4..a45d0786c6235 100644 --- a/test/DebugInfo/multi-file.swift +++ b/test/DebugInfo/multi-file.swift @@ -1,7 +1,7 @@ -// RUN: %target-swift-frontend -primary-file %s %S/../Inputs/empty.swift -emit-ir -g -module-name multi | FileCheck %s -// RUN: %target-swift-frontend %S/../Inputs/empty.swift -primary-file %s -emit-ir -g -module-name multi | FileCheck %s -// RUN: %target-swift-frontend -primary-file %S/../Inputs/empty.swift %s -emit-ir -g -module-name multi | FileCheck %s --check-prefix=CHECK-OTHER -// RUN: %target-swift-frontend %s -primary-file %S/../Inputs/empty.swift -emit-ir -g -module-name multi | FileCheck %s --check-prefix=CHECK-OTHER +// RUN: %target-swift-frontend -primary-file %s %S/../Inputs/empty.swift -emit-ir -g -module-name multi | %FileCheck %s +// RUN: %target-swift-frontend %S/../Inputs/empty.swift -primary-file %s -emit-ir -g -module-name multi | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %S/../Inputs/empty.swift %s -emit-ir -g -module-name multi | %FileCheck %s --check-prefix=CHECK-OTHER +// RUN: %target-swift-frontend %s -primary-file %S/../Inputs/empty.swift -emit-ir -g -module-name multi | %FileCheck %s --check-prefix=CHECK-OTHER // CHECK: !DICompileUnit(language: DW_LANG_Swift, file: ![[FILE:[0-9]+]] // CHECK: ![[FILE]] = !DIFile(filename: "{{.*}}multi-file.swift" // CHECK-OTHER: !DICompileUnit(language: DW_LANG_Swift, file: ![[FILE:[0-9]+]] diff --git a/test/DebugInfo/nested_functions.swift b/test/DebugInfo/nested_functions.swift index 8e72819433f6b..bc2ede8500e00 100644 --- a/test/DebugInfo/nested_functions.swift +++ b/test/DebugInfo/nested_functions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s // CHECK: ![[OUTER:.*]] = distinct !DISubprogram(name: "outer", // CHECK-SAME: line: [[@LINE+1]] diff --git a/test/DebugInfo/nostorage.swift b/test/DebugInfo/nostorage.swift index 8fd15ebe475a9..e7760bb800cd3 100644 --- a/test/DebugInfo/nostorage.swift +++ b/test/DebugInfo/nostorage.swift @@ -1,7 +1,7 @@ // RUN: %target-swift-frontend %s -emit-ir -g -o %t -// RUN: cat %t | FileCheck %s --check-prefix=CHECK1 -// RUN: cat %t | FileCheck %s --check-prefix=CHECK2 -// RUN: cat %t | FileCheck %s --check-prefix=CHECK3 +// RUN: cat %t | %FileCheck %s --check-prefix=CHECK1 +// RUN: cat %t | %FileCheck %s --check-prefix=CHECK2 +// RUN: cat %t | %FileCheck %s --check-prefix=CHECK3 func used(_ t: T) {} diff --git a/test/DebugInfo/parent-scope.swift b/test/DebugInfo/parent-scope.swift index d95b2d6809dc6..9717de0de154a 100644 --- a/test/DebugInfo/parent-scope.swift +++ b/test/DebugInfo/parent-scope.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -g -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -g -emit-ir %s | %FileCheck %s public protocol P { associatedtype AT; diff --git a/test/DebugInfo/patternmatching.swift b/test/DebugInfo/patternmatching.swift index e77b31b568a52..2d45ed08c384a 100644 --- a/test/DebugInfo/patternmatching.swift +++ b/test/DebugInfo/patternmatching.swift @@ -1,7 +1,7 @@ // RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o %t.ll -// RUN: FileCheck %s < %t.ll -// RUN: FileCheck --check-prefix=CHECK-SCOPES %s < %t.ll -// RUN: %target-swift-frontend -emit-sil -emit-verbose-sil -primary-file %s -o - | FileCheck %s --check-prefix=SIL-CHECK +// RUN: %FileCheck %s < %t.ll +// RUN: %FileCheck --check-prefix=CHECK-SCOPES %s < %t.ll +// RUN: %target-swift-frontend -emit-sil -emit-verbose-sil -primary-file %s -o - | %FileCheck %s --check-prefix=SIL-CHECK func markUsed(_ t: T) {} diff --git a/test/DebugInfo/pcomp.swift b/test/DebugInfo/pcomp.swift index db0c2769c964e..69c14937e6e4f 100644 --- a/test/DebugInfo/pcomp.swift +++ b/test/DebugInfo/pcomp.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/prologue.swift b/test/DebugInfo/prologue.swift index 491df54e3ad0b..fce6cb9bcf1ef 100644 --- a/test/DebugInfo/prologue.swift +++ b/test/DebugInfo/prologue.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -S -g -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -S -g -o - | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/DebugInfo/protocol-sugar.swift b/test/DebugInfo/protocol-sugar.swift index 99fa9edba40a1..367eba3c64b74 100644 --- a/test/DebugInfo/protocol-sugar.swift +++ b/test/DebugInfo/protocol-sugar.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s protocol A {} protocol B {} typealias C = B & A diff --git a/test/DebugInfo/protocol.swift b/test/DebugInfo/protocol.swift index cbf586d0760b0..9748673cc39e3 100644 --- a/test/DebugInfo/protocol.swift +++ b/test/DebugInfo/protocol.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s protocol PointUtils { func distanceFromOrigin() -> Float diff --git a/test/DebugInfo/protocolarg.swift b/test/DebugInfo/protocolarg.swift index 27bdbe34adb6b..6e1df0c6f9d57 100644 --- a/test/DebugInfo/protocolarg.swift +++ b/test/DebugInfo/protocolarg.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} func use(_ t: inout T) {} diff --git a/test/DebugInfo/return.swift b/test/DebugInfo/return.swift index 6667bfaa3ed6d..77db8057eb261 100644 --- a/test/DebugInfo/return.swift +++ b/test/DebugInfo/return.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -g -emit-ir -o - | FileCheck %s +// RUN: %target-swift-frontend %s -g -emit-ir -o - | %FileCheck %s class X { init (i : Int64) { x = i } diff --git a/test/DebugInfo/returnlocation.swift b/test/DebugInfo/returnlocation.swift index e0b23d75a8fab..3f07a51e21fb0 100644 --- a/test/DebugInfo/returnlocation.swift +++ b/test/DebugInfo/returnlocation.swift @@ -8,7 +8,7 @@ import Foundation // of simple/complex/empty return expressions, // cleanups/no cleanups, single / multiple return locations. -// RUN: FileCheck %s --check-prefix=CHECK_NONE < %t.ll +// RUN: %FileCheck %s --check-prefix=CHECK_NONE < %t.ll // CHECK_NONE: define{{( protected)?}} void {{.*}}none public func none(_ a: inout Int64) { // CHECK_NONE: call void @llvm.dbg{{.*}}, !dbg @@ -19,7 +19,7 @@ public func none(_ a: inout Int64) { // CHECK_NONE: ![[NONE_RET]] = !DILocation(line: [[@LINE+1]], column: 1, } -// RUN: FileCheck %s --check-prefix=CHECK_EMPTY < %t.ll +// RUN: %FileCheck %s --check-prefix=CHECK_EMPTY < %t.ll // CHECK_EMPTY: define {{.*}}empty public func empty(_ a: inout Int64) { if a > 24 { @@ -36,7 +36,7 @@ public func empty(_ a: inout Int64) { // CHECK-DAG_EMPTY: ![[EMPTY_RET]] = !DILocation(line: [[@LINE+1]], column: 1, } -// RUN: FileCheck %s --check-prefix=CHECK_EMPTY_NONE < %t.ll +// RUN: %FileCheck %s --check-prefix=CHECK_EMPTY_NONE < %t.ll // CHECK_EMPTY_NONE: define {{.*}}empty_none public func empty_none(_ a: inout Int64) { if a > 24 { @@ -48,7 +48,7 @@ public func empty_none(_ a: inout Int64) { // CHECK_EMPTY_NONE: ![[EMPTY_NONE_RET]] = !DILocation(line: [[@LINE+1]], column: 1, } -// RUN: FileCheck %s --check-prefix=CHECK_SIMPLE_RET < %t.ll +// RUN: %FileCheck %s --check-prefix=CHECK_SIMPLE_RET < %t.ll // CHECK_SIMPLE_RET: define {{.*}}simple public func simple(_ a: Int64) -> Int64 { if a > 24 { @@ -59,7 +59,7 @@ public func simple(_ a: Int64) -> Int64 { // CHECK_SIMPLE_RET: ![[SIMPLE_RET]] = !DILocation(line: [[@LINE+1]], column: 1, } -// RUN: FileCheck %s --check-prefix=CHECK_COMPLEX_RET < %t.ll +// RUN: %FileCheck %s --check-prefix=CHECK_COMPLEX_RET < %t.ll // CHECK_COMPLEX_RET: define {{.*}}complex public func complex(_ a: Int64) -> Int64 { if a > 24 { @@ -70,7 +70,7 @@ public func complex(_ a: Int64) -> Int64 { // CHECK_COMPLEX_RET: ![[COMPLEX_RET]] = !DILocation(line: [[@LINE+1]], column: 1, } -// RUN: FileCheck %s --check-prefix=CHECK_COMPLEX_SIMPLE < %t.ll +// RUN: %FileCheck %s --check-prefix=CHECK_COMPLEX_SIMPLE < %t.ll // CHECK_COMPLEX_SIMPLE: define {{.*}}complex_simple public func complex_simple(_ a: Int64) -> Int64 { if a > 24 { @@ -81,7 +81,7 @@ public func complex_simple(_ a: Int64) -> Int64 { // CHECK_COMPLEX_SIMPLE: ![[COMPLEX_SIMPLE_RET]] = !DILocation(line: [[@LINE+1]], column: 1, } -// RUN: FileCheck %s --check-prefix=CHECK_SIMPLE_COMPLEX < %t.ll +// RUN: %FileCheck %s --check-prefix=CHECK_SIMPLE_COMPLEX < %t.ll // CHECK_SIMPLE_COMPLEX: define {{.*}}simple_complex public func simple_complex(_ a: Int64) -> Int64 { if a > 24 { @@ -96,7 +96,7 @@ public func simple_complex(_ a: Int64) -> Int64 { // --------------------------------------------------------------------- -// RUN: FileCheck %s --check-prefix=CHECK_CLEANUP_NONE < %t.ll +// RUN: %FileCheck %s --check-prefix=CHECK_CLEANUP_NONE < %t.ll // CHECK_CLEANUP_NONE: define {{.*}}cleanup_none public func cleanup_none(_ a: inout NSString) { a = "empty" @@ -104,7 +104,7 @@ public func cleanup_none(_ a: inout NSString) { // CHECK_CLEANUP_NONE: ![[CLEANUP_NONE_RET]] = !DILocation(line: [[@LINE+1]], column: 1, } -// RUN: FileCheck %s --check-prefix=CHECK_CLEANUP_EMPTY < %t.ll +// RUN: %FileCheck %s --check-prefix=CHECK_CLEANUP_EMPTY < %t.ll // CHECK_CLEANUP_EMPTY: define {{.*}}cleanup_empty public func cleanup_empty(_ a: inout NSString) { if a.length > 24 { @@ -117,7 +117,7 @@ public func cleanup_empty(_ a: inout NSString) { // CHECK_CLEANUP_EMPTY: ![[CLEANUP_EMPTY_RET]] = !DILocation(line: [[@LINE+1]], column: 1, } -// RUN: FileCheck %s --check-prefix=CHECK_CLEANUP_EMPTY_NONE < %t.ll +// RUN: %FileCheck %s --check-prefix=CHECK_CLEANUP_EMPTY_NONE < %t.ll // CHECK_CLEANUP_EMPTY_NONE: define {{.*}}cleanup_empty_none public func cleanup_empty_none(_ a: inout NSString) { if a.length > 24 { @@ -129,7 +129,7 @@ public func cleanup_empty_none(_ a: inout NSString) { // CHECK_CLEANUP_EMPTY_NONE: ![[CLEANUP_EMPTY_NONE_RET]] = !DILocation(line: [[@LINE+1]], column: 1, } -// RUN: FileCheck %s --check-prefix=CHECK_CLEANUP_SIMPLE_RET < %t.ll +// RUN: %FileCheck %s --check-prefix=CHECK_CLEANUP_SIMPLE_RET < %t.ll // CHECK_CLEANUP_SIMPLE_RET: define {{.*}}cleanup_simple public func cleanup_simple(_ a: NSString) -> Int64 { if a.length > 24 { @@ -141,7 +141,7 @@ public func cleanup_simple(_ a: NSString) -> Int64 { // CHECK_CLEANUP_SIMPLE_RET: ![[CLEANUP_SIMPLE_RET]] = !DILocation(line: [[@LINE+1]], column: 1, } -// RUN: FileCheck %s --check-prefix=CHECK_CLEANUP_COMPLEX < %t.ll +// RUN: %FileCheck %s --check-prefix=CHECK_CLEANUP_COMPLEX < %t.ll // CHECK_CLEANUP_COMPLEX: define {{.*}}cleanup_complex public func cleanup_complex(_ a: NSString) -> Int64 { if a.length > 24 { @@ -153,7 +153,7 @@ public func cleanup_complex(_ a: NSString) -> Int64 { // CHECK_CLEANUP_COMPLEX: ![[CLEANUP_COMPLEX_RET]] = !DILocation(line: [[@LINE+1]], column: 1, } -// RUN: FileCheck %s --check-prefix=CHECK_CLEANUP_COMPLEX_SIMPLE < %t.ll +// RUN: %FileCheck %s --check-prefix=CHECK_CLEANUP_COMPLEX_SIMPLE < %t.ll // CHECK_CLEANUP_COMPLEX_SIMPLE: define {{.*}}cleanup_complex_simple public func cleanup_complex_simple(_ a: NSString) -> Int64 { if a.length > 24 { @@ -165,7 +165,7 @@ public func cleanup_complex_simple(_ a: NSString) -> Int64 { // CHECK_CLEANUP_COMPLEX_SIMPLE: ![[CLEANUP_COMPLEX_SIMPLE_RET]] = !DILocation(line: [[@LINE+1]], column: 1, } -// RUN: FileCheck %s --check-prefix=CHECK_CLEANUP_SIMPLE_COMPLEX < %t.ll +// RUN: %FileCheck %s --check-prefix=CHECK_CLEANUP_SIMPLE_COMPLEX < %t.ll // CHECK_CLEANUP_SIMPLE_COMPLEX: define {{.*}}cleanup_simple_complex public func cleanup_simple_complex(_ a: NSString) -> Int64 { if a.length > 24 { diff --git a/test/DebugInfo/scopes.swift b/test/DebugInfo/scopes.swift index a703b292b4a33..0b7c1a8f0509b 100644 --- a/test/DebugInfo/scopes.swift +++ b/test/DebugInfo/scopes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -g -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -g -emit-ir %s | %FileCheck %s class UIViewController { } diff --git a/test/DebugInfo/sdk.swift b/test/DebugInfo/sdk.swift index 06cd83e32e5ba..f7a0b0700d1fc 100644 --- a/test/DebugInfo/sdk.swift +++ b/test/DebugInfo/sdk.swift @@ -1,6 +1,6 @@ // Check that the sdk and resource dirs end up in the debug info. -// RUN: %target-swiftc_driver %s -emit-ir -g -o - | FileCheck %s -// RUN: %target-swiftc_driver %s -emit-ir -sdk "/Weird Location/SDK" -g -o - | FileCheck --check-prefix CHECK-EXPLICIT %s +// RUN: %target-swiftc_driver %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swiftc_driver %s -emit-ir -sdk "/Weird Location/SDK" -g -o - | %FileCheck --check-prefix CHECK-EXPLICIT %s // CHECK: !DICompileUnit({{.*}}producer: "{{(Apple )?Swift version [^"]+}}" // CHECK-SAME: flags: " // CHECK-NOT: " diff --git a/test/DebugInfo/self-nostorage.swift b/test/DebugInfo/self-nostorage.swift index f8dec438846b7..4ae706968b8e1 100644 --- a/test/DebugInfo/self-nostorage.swift +++ b/test/DebugInfo/self-nostorage.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s public struct S { func f() { diff --git a/test/DebugInfo/self.swift b/test/DebugInfo/self.swift index 76fcd0f3c6666..3c53575f67bfc 100644 --- a/test/DebugInfo/self.swift +++ b/test/DebugInfo/self.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s public struct stuffStruct { var a: Int64 = 6 diff --git a/test/DebugInfo/shadow_copies.swift b/test/DebugInfo/shadow_copies.swift index e152aa034836b..49417a420864a 100644 --- a/test/DebugInfo/shadow_copies.swift +++ b/test/DebugInfo/shadow_copies.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -Onone -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -Onone -emit-ir -g -o - | %FileCheck %s class ClassA { diff --git a/test/DebugInfo/shadowcopy-linetable.swift b/test/DebugInfo/shadowcopy-linetable.swift index 92f3a369060db..3fd1444322b99 100644 --- a/test/DebugInfo/shadowcopy-linetable.swift +++ b/test/DebugInfo/shadowcopy-linetable.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/simple.sil b/test/DebugInfo/simple.sil index c5fdc1785af98..b5cb8f93fc148 100644 --- a/test/DebugInfo/simple.sil +++ b/test/DebugInfo/simple.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -g -emit-ir -o - | FileCheck %s +// RUN: %target-swift-frontend %s -g -emit-ir -o - | %FileCheck %s sil_stage canonical diff --git a/test/DebugInfo/specialization.swift b/test/DebugInfo/specialization.swift index d42d528577c0d..0920cd0ff02d1 100644 --- a/test/DebugInfo/specialization.swift +++ b/test/DebugInfo/specialization.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O %s -disable-llvm-optzns -emit-sil -g -o - | FileCheck %s +// RUN: %target-swift-frontend -O %s -disable-llvm-optzns -emit-sil -g -o - | %FileCheck %s // CHECK: sil shared [noinline] @_TTSg5V14specialization7AddableS0_S_5ProtoS____TF14specialization3sumuRxS_5ProtorFTxx_x // CHECK-SAME: $@convention(thin) (Addable, Addable) -> Addable { diff --git a/test/DebugInfo/structs.swift b/test/DebugInfo/structs.swift index 4eb1f5817cc6b..1da16ff56f615 100644 --- a/test/DebugInfo/structs.swift +++ b/test/DebugInfo/structs.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s // Capture the pointer size from type Int // CHECK: %Si = type <{ i[[PTRSIZE:[0-9]+]] }> diff --git a/test/DebugInfo/test-foundation.swift b/test/DebugInfo/test-foundation.swift index dff20bc1a390f..c09ce3635dce1 100644 --- a/test/DebugInfo/test-foundation.swift +++ b/test/DebugInfo/test-foundation.swift @@ -1,8 +1,8 @@ // RUN: %target-swift-frontend -emit-ir -g %s -o %t.ll -// RUN: FileCheck %s --check-prefix IMPORT-CHECK < %t.ll -// RUN: FileCheck %s --check-prefix LOC-CHECK < %t.ll +// RUN: %FileCheck %s --check-prefix IMPORT-CHECK < %t.ll +// RUN: %FileCheck %s --check-prefix LOC-CHECK < %t.ll // RUN: llc %t.ll -filetype=obj -o %t.o -// RUN: llvm-dwarfdump %t.o | FileCheck %s --check-prefix DWARF-CHECK +// RUN: llvm-dwarfdump %t.o | %FileCheck %s --check-prefix DWARF-CHECK // RUN: dwarfdump --verify %t.o // REQUIRES: OS=macosx diff --git a/test/DebugInfo/test_ints.swift b/test/DebugInfo/test_ints.swift index be203598dcfdf..81444ff239ae4 100644 --- a/test/DebugInfo/test_ints.swift +++ b/test/DebugInfo/test_ints.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s // These two should not have the same type. // CHECK: !DIGlobalVariable(name: "a",{{.*}} line: [[@LINE+2]] diff --git a/test/DebugInfo/thunks.swift b/test/DebugInfo/thunks.swift index 8211868c20fad..b1b6558d4d8e0 100644 --- a/test/DebugInfo/thunks.swift +++ b/test/DebugInfo/thunks.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -emit-ir -g %s -o - | FileCheck %s -// RUN: %target-swift-frontend -emit-sil -emit-verbose-sil -g %s -o - | FileCheck %s --check-prefix=SIL-CHECK +// RUN: %target-swift-frontend -emit-ir -g %s -o - | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -emit-verbose-sil -g %s -o - | %FileCheck %s --check-prefix=SIL-CHECK // REQUIRES: objc_interop import Foundation diff --git a/test/DebugInfo/top_level_code.swift b/test/DebugInfo/top_level_code.swift index 86dae8dbf40ef..8b6d70202cb74 100644 --- a/test/DebugInfo/top_level_code.swift +++ b/test/DebugInfo/top_level_code.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -S -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -S -g -o - | %FileCheck %s // XFAIL: linux diff --git a/test/DebugInfo/top_level_var.swift b/test/DebugInfo/top_level_var.swift index 0ac5ec19aa5a7..c9af74f31184c 100644 --- a/test/DebugInfo/top_level_var.swift +++ b/test/DebugInfo/top_level_var.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} var a = 1 diff --git a/test/DebugInfo/trap.swift b/test/DebugInfo/trap.swift index a754569eb3fbc..bd8ef6448abca 100644 --- a/test/DebugInfo/trap.swift +++ b/test/DebugInfo/trap.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -parse-stdlib -primary-file %s -emit-ir -g -o - | FileCheck %s -// RUN: %target-swift-frontend -O -parse-stdlib -primary-file %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -primary-file %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend -O -parse-stdlib -primary-file %s -emit-ir -g -o - | %FileCheck %s import Swift // CHECK: define{{.*}}1f diff --git a/test/DebugInfo/tuple.swift b/test/DebugInfo/tuple.swift index 095054c6e8ed2..3c591eca2f746 100644 --- a/test/DebugInfo/tuple.swift +++ b/test/DebugInfo/tuple.swift @@ -1,6 +1,6 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s // RUN: %target-swift-frontend -primary-file %s -emit-ir -gdwarf-types -o - \ -// RUN: | FileCheck %s --check-prefix=DWARF +// RUN: | %FileCheck %s --check-prefix=DWARF // Don't emit a line number for tuple types. They are unnamed // and have no declaration, so the line number is nonsensical. diff --git a/test/DebugInfo/typealias.swift b/test/DebugInfo/typealias.swift index 7ab2b6f99e5ec..2031f1c122cfc 100644 --- a/test/DebugInfo/typealias.swift +++ b/test/DebugInfo/typealias.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/typearg.swift b/test/DebugInfo/typearg.swift index f1d195bd43a82..5b1acfca3c54f 100644 --- a/test/DebugInfo/typearg.swift +++ b/test/DebugInfo/typearg.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s protocol AProtocol { func f() -> String @@ -35,7 +35,7 @@ class Foo { // Verify that the backend doesn't elide the debug intrinsics. // RUN: %target-swift-frontend %s -c -g -o %t.o -// RUN: llvm-dwarfdump %t.o | FileCheck %s --check-prefix=CHECK-LLVM +// RUN: llvm-dwarfdump %t.o | %FileCheck %s --check-prefix=CHECK-LLVM // CHECK-LLVM-DAG: .debug_str[{{.*}}] = "x" // CHECK-LLVM-DAG: .debug_str[{{.*}}] = "$swift.type.T" // CHECK- FIXME -LLVM-DAG: .debug_str[{{.*}}] = "$swift.type.Bar" diff --git a/test/DebugInfo/unowned-capture.swift b/test/DebugInfo/unowned-capture.swift index 9a3474defce24..1b3160d0af800 100644 --- a/test/DebugInfo/unowned-capture.swift +++ b/test/DebugInfo/unowned-capture.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s class Foo { diff --git a/test/DebugInfo/value-update.sil b/test/DebugInfo/value-update.sil index be66b1427db11..adbf8125d3c44 100644 --- a/test/DebugInfo/value-update.sil +++ b/test/DebugInfo/value-update.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -module-name test -g -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -module-name test -g -o - | %FileCheck %s // REQUIRES: CPU=x86_64 sil_stage canonical diff --git a/test/DebugInfo/value-witness-table.swift b/test/DebugInfo/value-witness-table.swift index bb14dda46efd0..ce04cd2206085 100644 --- a/test/DebugInfo/value-witness-table.swift +++ b/test/DebugInfo/value-witness-table.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -g -emit-ir %s | FileCheck %s --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK +// RUN: %target-swift-frontend -g -emit-ir %s | %FileCheck %s --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK // Test that we don't generate debug info for hidden global variables. diff --git a/test/DebugInfo/variables-interpreter.swift b/test/DebugInfo/variables-interpreter.swift index 04498fc73d8aa..8ecf3558e035a 100644 --- a/test/DebugInfo/variables-interpreter.swift +++ b/test/DebugInfo/variables-interpreter.swift @@ -1,4 +1,4 @@ // Run test variables.swift, verifying that the combination of -interpret and -g works. -// RUN: %target-jit-run -g %S/variables.swift | FileCheck %s +// RUN: %target-jit-run -g %S/variables.swift | %FileCheck %s // CHECK: 8, 16, 32 // REQUIRES: swift_interpreter diff --git a/test/DebugInfo/variables-repl.swift b/test/DebugInfo/variables-repl.swift index 3b26c166a2363..0348a26f566f9 100644 --- a/test/DebugInfo/variables-repl.swift +++ b/test/DebugInfo/variables-repl.swift @@ -1,4 +1,4 @@ // Run test variables.swift, verifying that the combination of repl and -g works -// RUN: %swift -g -repl < %S/variables.swift | FileCheck %s +// RUN: %swift -g -repl < %S/variables.swift | %FileCheck %s // CHECK: 8, 16, 32 // REQUIRES: swift_repl diff --git a/test/DebugInfo/variables.swift b/test/DebugInfo/variables.swift index 00e6f474e6842..ee5e3750a7ef4 100644 --- a/test/DebugInfo/variables.swift +++ b/test/DebugInfo/variables.swift @@ -1,7 +1,7 @@ -// RUN: %target-swift-frontend %s -g -emit-ir -o - | FileCheck %s +// RUN: %target-swift-frontend %s -g -emit-ir -o - | %FileCheck %s // Ensure that the debug info we're emitting passes the back end verifier. -// RUN: %target-swift-frontend %s -g -S -o - | FileCheck %s --check-prefix ASM-%target-object-format +// RUN: %target-swift-frontend %s -g -S -o - | %FileCheck %s --check-prefix ASM-%target-object-format // ASM-macho: .section __DWARF,__debug_info // ASM-elf: .section .debug_info,"",{{[@%]}}progbits diff --git a/test/DebugInfo/while.swift b/test/DebugInfo/while.swift index cdc4e59569a6a..343b7f2d357bf 100644 --- a/test/DebugInfo/while.swift +++ b/test/DebugInfo/while.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -g -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -g -emit-ir %s | %FileCheck %s func yieldValues() -> Int64? { return .none } diff --git a/test/Demangle/demangle.swift b/test/Demangle/demangle.swift index a64d29d9c231d..f7ed70d137c9d 100644 --- a/test/Demangle/demangle.swift +++ b/test/Demangle/demangle.swift @@ -9,6 +9,6 @@ RUN: sed -ne '/--->/s/^.*---> *//p' < %S/Inputs/manglings.txt > %t.check RUN: swift-demangle < %t.input > %t.output RUN: diff %t.check %t.output -; RUN: swift-demangle __TtSi | FileCheck %s -check-prefix=DOUBLE +; RUN: swift-demangle __TtSi | %FileCheck %s -check-prefix=DOUBLE ; DOUBLE: _TtSi ---> Swift.Int diff --git a/test/Demangle/lookup.swift b/test/Demangle/lookup.swift index 28a213ce8c74b..643c990f8e6c9 100644 --- a/test/Demangle/lookup.swift +++ b/test/Demangle/lookup.swift @@ -6,7 +6,7 @@ // RUN: %target-swift-ide-test -source-filename=%s -print-ast-typechecked -find-mangled=_TtV14swift_ide_test14InternalStruct // RUN: not %target-swift-ide-test -source-filename=%s -print-ast-typechecked -find-mangled=_TtV14swift_ide_testP13PrivateStruct // RUN: not %target-swift-ide-test -source-filename=%s -print-ast-typechecked -find-mangled=_TtV14swift_ide_testP1_13PrivateStruct -// RUN: %target-swift-ide-test -source-filename=%s -print-ast-typechecked -find-mangled=_TtV14swift_ide_testP33_5CB4BCC03C4B9CB2AEEDDFF10FE7BD1E13PrivateStruct | FileCheck -check-prefix=THIS-FILE %s +// RUN: %target-swift-ide-test -source-filename=%s -print-ast-typechecked -find-mangled=_TtV14swift_ide_testP33_5CB4BCC03C4B9CB2AEEDDFF10FE7BD1E13PrivateStruct | %FileCheck -check-prefix=THIS-FILE %s // RUN: %target-swift-ide-test -source-filename=%s -print-ast-typechecked -find-mangled=_TtCC14swift_ide_test5Outer5Inner // RUN: not %target-swift-ide-test -source-filename=%s -print-ast-typechecked -find-mangled=_TtCC14swift_ide_test5Outer6Absent @@ -23,8 +23,8 @@ // RUN: %target-swift-ide-test -source-filename=%t/test.swift -print-ast-typechecked -I %t -find-mangled=_TtV6Lookup12PublicStruct // RUN: %target-swift-ide-test -source-filename=%t/test.swift -print-ast-typechecked -I %t -find-mangled=_TtV6Lookup14InternalStruct -// RUN: %target-swift-ide-test -source-filename=%t/test.swift -print-ast-typechecked -I %t -find-mangled=_TtV6LookupP33_FB24ABFEF851D18A6D2510DCD3FD6D6013PrivateStruct | FileCheck -check-prefix=THIS-FILE %s -// RUN: %target-swift-ide-test -source-filename=%t/test.swift -print-ast-typechecked -I %t -find-mangled=_TtV6LookupP33_F999E3591DC4FCB0EC84CD4166BF8EDB13PrivateStruct | FileCheck -check-prefix=OTHER-FILE %s +// RUN: %target-swift-ide-test -source-filename=%t/test.swift -print-ast-typechecked -I %t -find-mangled=_TtV6LookupP33_FB24ABFEF851D18A6D2510DCD3FD6D6013PrivateStruct | %FileCheck -check-prefix=THIS-FILE %s +// RUN: %target-swift-ide-test -source-filename=%t/test.swift -print-ast-typechecked -I %t -find-mangled=_TtV6LookupP33_F999E3591DC4FCB0EC84CD4166BF8EDB13PrivateStruct | %FileCheck -check-prefix=OTHER-FILE %s public struct PublicStruct {} internal struct InternalStruct {} diff --git a/test/Driver/Dependencies/bindings-build-record-options.swift b/test/Driver/Dependencies/bindings-build-record-options.swift index cffc3f1ab3442..550a454099404 100644 --- a/test/Driver/Dependencies/bindings-build-record-options.swift +++ b/test/Driver/Dependencies/bindings-build-record-options.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && cp -r %S/Inputs/bindings-build-record/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=MUST-EXEC-INITIAL +// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=MUST-EXEC-INITIAL // MUST-EXEC-INITIAL-NOT: warning // MUST-EXEC-INITIAL: inputs: ["./main.swift"], output: {{[{].*[}]}}, condition: run-without-cascading @@ -14,38 +14,38 @@ // MUST-EXEC-ALL: inputs: ["./yet-another.swift"], output: {{[{].*[}]$}} // RUN: cd %t && %swiftc_driver -c -module-name main -driver-use-frontend-path %S/Inputs/update-dependencies.py ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json -// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=NO-EXEC +// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=NO-EXEC // NO-EXEC: inputs: ["./main.swift"], output: {{[{].*[}]}}, condition: check-dependencies // NO-EXEC: inputs: ["./other.swift"], output: {{[{].*[}]}}, condition: check-dependencies // NO-EXEC: inputs: ["./yet-another.swift"], output: {{[{].*[}]}}, condition: check-dependencies -// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings -serialize-diagnostics ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=NO-EXEC -// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=NO-EXEC +// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings -serialize-diagnostics ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=NO-EXEC +// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=NO-EXEC -// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -O -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=MUST-EXEC-ALL +// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -O -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=MUST-EXEC-ALL // RUN: cd %t && %swiftc_driver -c -module-name main -driver-use-frontend-path %S/Inputs/update-dependencies.py ./main.swift ./other.swift ./yet-another.swift -incremental -O -output-file-map %t/output.json -// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -O -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=NO-EXEC -// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -O -serialize-diagnostics -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=NO-EXEC +// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -O -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=NO-EXEC +// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -O -serialize-diagnostics -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=NO-EXEC -// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -Onone -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=MUST-EXEC-ALL +// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -Onone -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=MUST-EXEC-ALL // RUN: cd %t && %swiftc_driver -c -module-name main -driver-use-frontend-path %S/Inputs/update-dependencies.py ./main.swift ./other.swift ./yet-another.swift -incremental -Onone -output-file-map %t/output.json -// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -Onone -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=NO-EXEC +// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -Onone -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=NO-EXEC -// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=MUST-EXEC-ALL +// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=MUST-EXEC-ALL // RUN: cd %t && %swiftc_driver -c -module-name main -driver-use-frontend-path %S/Inputs/update-dependencies.py ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json -// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=NO-EXEC +// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=NO-EXEC -// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -I. -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=MUST-EXEC-ALL +// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -I. -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=MUST-EXEC-ALL // RUN: cd %t && %swiftc_driver -c -module-name main -driver-use-frontend-path %S/Inputs/update-dependencies.py ./main.swift ./other.swift ./yet-another.swift -incremental -I. -output-file-map %t/output.json -// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -I. -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=NO-EXEC +// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -I. -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=NO-EXEC -// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -I. -I/ -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=MUST-EXEC-ALL +// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -I. -I/ -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=MUST-EXEC-ALL // RUN: cd %t && %swiftc_driver -c -module-name main -driver-use-frontend-path %S/Inputs/update-dependencies.py ./main.swift ./other.swift ./yet-another.swift -incremental -I. -I/ -output-file-map %t/output.json -// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -I. -I/ -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=NO-EXEC +// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -I. -I/ -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=NO-EXEC -// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -I. -DDEBUG -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=MUST-EXEC-ALL +// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -I. -DDEBUG -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=MUST-EXEC-ALL // RUN: cd %t && %swiftc_driver -c -module-name main -driver-use-frontend-path %S/Inputs/update-dependencies.py ./main.swift ./other.swift ./yet-another.swift -incremental -I. -DDEBUG -output-file-map %t/output.json -// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -I. -DDEBUG -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=NO-EXEC -// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -DDEBUG -I. -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=NO-EXEC +// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -I. -DDEBUG -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=NO-EXEC +// RUN: cd %t && %swiftc_driver -c -module-name main -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -DDEBUG -I. -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=NO-EXEC diff --git a/test/Driver/Dependencies/bindings-build-record.swift b/test/Driver/Dependencies/bindings-build-record.swift index c9fa63a75b692..85d275139c988 100644 --- a/test/Driver/Dependencies/bindings-build-record.swift +++ b/test/Driver/Dependencies/bindings-build-record.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && cp -r %S/Inputs/bindings-build-record/ %t // RUN: %S/Inputs/touch.py 443865900 %t/* -// RUN: cd %t && %swiftc_driver -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=MUST-EXEC +// RUN: cd %t && %swiftc_driver -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=MUST-EXEC // MUST-EXEC-NOT: warning // MUST-EXEC: inputs: ["./main.swift"], output: {{[{].*[}]}}, condition: run-without-cascading @@ -9,7 +9,7 @@ // MUST-EXEC: inputs: ["./yet-another.swift"], output: {{[{].*[}]}}, condition: run-without-cascading // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0], "./yet-another.swift": [443865900, 0]}, build_time: [443865901, 0]}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=NO-EXEC +// RUN: cd %t && %swiftc_driver -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=NO-EXEC // NO-EXEC: inputs: ["./main.swift"], output: {{[{].*[}]}}, condition: check-dependencies // NO-EXEC: inputs: ["./other.swift"], output: {{[{].*[}]}}, condition: check-dependencies @@ -17,33 +17,33 @@ // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": !private [443865900, 0], "./yet-another.swift": !dirty [443865900, 0]}, build_time: [443865901, 0]}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=BUILD-RECORD +// RUN: cd %t && %swiftc_driver -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=BUILD-RECORD // BUILD-RECORD: inputs: ["./main.swift"], output: {{[{].*[}]}}, condition: check-dependencies{{$}} // BUILD-RECORD: inputs: ["./other.swift"], output: {{[{].*[}]}}, condition: run-without-cascading{{$}} // BUILD-RECORD: inputs: ["./yet-another.swift"], output: {{[{].*[}]$}} // RUN: cd %t && %swiftc_driver -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift ./added.swift -incremental -output-file-map %t/output.json 2>&1 > %t/added.txt -// RUN: FileCheck %s -check-prefix=BUILD-RECORD < %t/added.txt -// RUN: FileCheck %s -check-prefix=FILE-ADDED < %t/added.txt +// RUN: %FileCheck %s -check-prefix=BUILD-RECORD < %t/added.txt +// RUN: %FileCheck %s -check-prefix=FILE-ADDED < %t/added.txt // FILE-ADDED: inputs: ["./added.swift"], output: {{[{].*[}]}}, condition: newly-added{{$}} // RUN: %S/Inputs/touch.py 443865960 %t/main.swift -// RUN: cd %t && %swiftc_driver -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=BUILD-RECORD-PLUS-CHANGE +// RUN: cd %t && %swiftc_driver -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=BUILD-RECORD-PLUS-CHANGE // BUILD-RECORD-PLUS-CHANGE: inputs: ["./main.swift"], output: {{[{].*[}]}}, condition: run-without-cascading // BUILD-RECORD-PLUS-CHANGE: inputs: ["./other.swift"], output: {{[{].*[}]}}, condition: run-without-cascading{{$}} // BUILD-RECORD-PLUS-CHANGE: inputs: ["./yet-another.swift"], output: {{[{].*[}]$}} // RUN: %S/Inputs/touch.py 443865900 %t/* -// RUN: cd %t && %swiftc_driver -driver-print-bindings ./main.swift ./other.swift -incremental -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=FILE-REMOVED +// RUN: cd %t && %swiftc_driver -driver-print-bindings ./main.swift ./other.swift -incremental -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=FILE-REMOVED // FILE-REMOVED: inputs: ["./main.swift"], output: {{[{].*[}]$}} // FILE-REMOVED: inputs: ["./other.swift"], output: {{[{].*[}]$}} // FILE-REMOVED-NOT: yet-another.swift // RUN: echo '{version: "bogus", inputs: {"./main.swift": [443865900, 0], "./other.swift": !private [443865900, 0], "./yet-another.swift": !dirty [443865900, 0]}}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | FileCheck %s -check-prefix=INVALID-RECORD +// RUN: cd %t && %swiftc_driver -driver-print-bindings ./main.swift ./other.swift ./yet-another.swift -incremental -output-file-map %t/output.json 2>&1 | %FileCheck %s -check-prefix=INVALID-RECORD // INVALID-RECORD-NOT: warning // INVALID-RECORD: inputs: ["./main.swift"], output: {{[{].*[}]$}} diff --git a/test/Driver/Dependencies/build-record-invalid.swift b/test/Driver/Dependencies/build-record-invalid.swift index e7f9543d95c6d..16ffbf89741ab 100644 --- a/test/Driver/Dependencies/build-record-invalid.swift +++ b/test/Driver/Dependencies/build-record-invalid.swift @@ -1,11 +1,11 @@ // RUN: rm -rf %t && cp -r %S/Inputs/bindings-build-record/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck %s -check-prefix=CHECK-ALL-BUILT +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s -check-prefix=CHECK-ALL-BUILT // CHECK-ALL-BUILT: Handled main.swift // CHECK-ALL-BUILT: Handled other.swift // RUN: echo '{version: "bogus", inputs: {"./main.swift": [443865900, 0], "./other.swift": !private [443865900, 0], "./yet-another.swift": !dirty [443865900, 0]}}' > %t/main~buildrecord.swiftdeps // RUN: echo 'provides-nominal: garbage' > %t/main.swiftdeps -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck %s -check-prefix=CHECK-ALL-BUILT +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s -check-prefix=CHECK-ALL-BUILT diff --git a/test/Driver/Dependencies/chained-additional-kinds.swift b/test/Driver/Dependencies/chained-additional-kinds.swift index f383668fa941a..5aad8ab51f5cf 100644 --- a/test/Driver/Dependencies/chained-additional-kinds.swift +++ b/test/Driver/Dependencies/chained-additional-kinds.swift @@ -3,25 +3,25 @@ // RUN: rm -rf %t && cp -r %S/Inputs/chained-additional-kinds/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift // CHECK-FIRST: Handled yet-another.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled other.swift // CHECK-THIRD-DAG: Handled main.swift // CHECK-THIRD-DAG: Handled yet-another.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240008 %t/other.swift diff --git a/test/Driver/Dependencies/chained-after.swift b/test/Driver/Dependencies/chained-after.swift index f4e8e8b856a30..901fb3c33393b 100644 --- a/test/Driver/Dependencies/chained-after.swift +++ b/test/Driver/Dependencies/chained-after.swift @@ -9,13 +9,13 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/chained-after/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled other.swift // CHECK-THIRD: Handled main.swift diff --git a/test/Driver/Dependencies/chained-private-after-multiple-nominal-members.swift b/test/Driver/Dependencies/chained-private-after-multiple-nominal-members.swift index 77a68b5202fdb..5bc9173d1d6c0 100644 --- a/test/Driver/Dependencies/chained-private-after-multiple-nominal-members.swift +++ b/test/Driver/Dependencies/chained-private-after-multiple-nominal-members.swift @@ -9,13 +9,13 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/chained-private-after-multiple-nominal-members/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: Handled other.swift // CHECK-SECOND: Handled main.swift diff --git a/test/Driver/Dependencies/chained-private-after-multiple.swift b/test/Driver/Dependencies/chained-private-after-multiple.swift index cde7c6bfc87b0..a203d7de5dd2a 100644 --- a/test/Driver/Dependencies/chained-private-after-multiple.swift +++ b/test/Driver/Dependencies/chained-private-after-multiple.swift @@ -9,13 +9,13 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/chained-private-after-multiple/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: Handled other.swift // CHECK-SECOND: Handled main.swift diff --git a/test/Driver/Dependencies/chained-private-after.swift b/test/Driver/Dependencies/chained-private-after.swift index df1d2d017dbf8..555bd64956b85 100644 --- a/test/Driver/Dependencies/chained-private-after.swift +++ b/test/Driver/Dependencies/chained-private-after.swift @@ -9,13 +9,13 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/chained-private-after/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: Handled other.swift // CHECK-SECOND: Handled main.swift diff --git a/test/Driver/Dependencies/chained-private.swift b/test/Driver/Dependencies/chained-private.swift index 4cfd6197984dd..9be747b6c09ea 100644 --- a/test/Driver/Dependencies/chained-private.swift +++ b/test/Driver/Dependencies/chained-private.swift @@ -3,19 +3,19 @@ // RUN: rm -rf %t && cp -r %S/Inputs/chained-private/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift // CHECK-FIRST: Handled yet-another.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-NOT: Handled yet-another.swift // CHECK-THIRD: Handled other.swift diff --git a/test/Driver/Dependencies/chained.swift b/test/Driver/Dependencies/chained.swift index c28ec03256c83..f1bcf7801b2ec 100644 --- a/test/Driver/Dependencies/chained.swift +++ b/test/Driver/Dependencies/chained.swift @@ -3,29 +3,29 @@ // RUN: rm -rf %t && cp -r %S/Inputs/chained/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift // CHECK-FIRST: Handled yet-another.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled other.swift // CHECK-THIRD-DAG: Handled main.swift // CHECK-THIRD-DAG: Handled yet-another.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240008 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./yet-another.swift ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./yet-another.swift ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240009 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift ./yet-another.swift ./main.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift ./yet-another.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s diff --git a/test/Driver/Dependencies/crash-added.swift b/test/Driver/Dependencies/crash-added.swift index 1f4f9786b6585..badb46a4429e2 100644 --- a/test/Driver/Dependencies/crash-added.swift +++ b/test/Driver/Dependencies/crash-added.swift @@ -3,14 +3,14 @@ // RUN: rm -rf %t && cp -r %S/Inputs/crash-simple/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s // CHECK-INITIAL-NOT: warning // CHECK-INITIAL: Handled main.swift // CHECK-INITIAL: Handled other.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./crash.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-ADDED %s -// RUN: FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./crash.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s +// RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps // CHECK-ADDED-NOT: Handled // CHECK-ADDED: Handled crash.swift @@ -24,7 +24,7 @@ // RUN: rm -rf %t && cp -r %S/Inputs/crash-simple/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-ADDED %s -// RUN: FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s +// RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps diff --git a/test/Driver/Dependencies/crash-new.swift b/test/Driver/Dependencies/crash-new.swift index 4bb967c9edceb..c68c185498d7a 100644 --- a/test/Driver/Dependencies/crash-new.swift +++ b/test/Driver/Dependencies/crash-new.swift @@ -3,20 +3,20 @@ // RUN: rm -rf %t && cp -r %S/Inputs/crash-simple/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s // CHECK-NOT: warning // CHECK: Handled main.swift // CHECK: Handled crash.swift // CHECK-NOT: Handled other.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-BAD-ONLY %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BAD-ONLY %s // CHECK-BAD-ONLY-NOT: warning // CHECK-BAD-ONLY-NOT: Handled // CHECK-BAD-ONLY: Handled crash.swift // CHECK-BAD-ONLY-NOT: Handled -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-OKAY %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s // CHECK-OKAY: Handled main.swift // CHECK-OKAY: Handled crash.swift // CHECK-OKAY: Handled other.swift @@ -24,10 +24,10 @@ // RUN: touch -t 201401240006 %t/crash.swift // RUN: rm %t/crash.swiftdeps -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-OKAY-2 %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY-2 %s // CHECK-OKAY-2: Handled crash.swift // CHECK-OKAY-2: Handled other.swift @@ -35,10 +35,10 @@ // RUN: touch -t 201401240006 %t/main.swift // RUN: rm %t/main.swiftdeps -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-OKAY %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s // RUN: touch -t 201401240006 %t/other.swift // RUN: rm %t/other.swiftdeps -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s diff --git a/test/Driver/Dependencies/crash-simple.swift b/test/Driver/Dependencies/crash-simple.swift index ce0eb9e04045f..394aaa819850f 100644 --- a/test/Driver/Dependencies/crash-simple.swift +++ b/test/Driver/Dependencies/crash-simple.swift @@ -3,7 +3,7 @@ // RUN: rm -rf %t && cp -r %S/Inputs/crash-simple/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift @@ -11,8 +11,8 @@ // CHECK-FIRST: Handled other.swift // RUN: touch -t 201401240006 %t/crash.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s -// RUN: FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps // CHECK-SECOND: Handled crash.swift // CHECK-SECOND-NOT: Handled main.swift diff --git a/test/Driver/Dependencies/embed-bitcode-parallel.swift b/test/Driver/Dependencies/embed-bitcode-parallel.swift index 97afcea8f4741..3005bd4c3f32b 100644 --- a/test/Driver/Dependencies/embed-bitcode-parallel.swift +++ b/test/Driver/Dependencies/embed-bitcode-parallel.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && cp -r %S/Inputs/one-way/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/fake-build-for-bitcode.py -output-file-map %t/output.json -incremental ./main.swift ./other.swift -embed-bitcode -module-name main -j1 -parseable-output 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/fake-build-for-bitcode.py -output-file-map %t/output.json -incremental ./main.swift ./other.swift -embed-bitcode -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: {{^{$}} @@ -54,7 +54,7 @@ // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/fake-build-for-bitcode.py -output-file-map %t/output.json -incremental ./main.swift ./other.swift -embed-bitcode -module-name main -j2 -parseable-output 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/fake-build-for-bitcode.py -output-file-map %t/output.json -incremental ./main.swift ./other.swift -embed-bitcode -module-name main -j2 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: "kind": "began" // CHECK-SECOND: "name": "compile" diff --git a/test/Driver/Dependencies/fail-added.swift b/test/Driver/Dependencies/fail-added.swift index a333078fcfb5c..e316a83c6af32 100644 --- a/test/Driver/Dependencies/fail-added.swift +++ b/test/Driver/Dependencies/fail-added.swift @@ -3,14 +3,14 @@ // RUN: rm -rf %t && cp -r %S/Inputs/fail-simple/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s // CHECK-INITIAL-NOT: warning // CHECK-INITIAL: Handled main.swift // CHECK-INITIAL: Handled other.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./bad.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-ADDED %s -// RUN: FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s +// RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps // CHECK-ADDED-NOT: Handled // CHECK-ADDED: Handled bad.swift @@ -24,7 +24,7 @@ // RUN: rm -rf %t && cp -r %S/Inputs/fail-simple/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-ADDED %s -// RUN: FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s +// RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps diff --git a/test/Driver/Dependencies/fail-chained.swift b/test/Driver/Dependencies/fail-chained.swift index f28cbd7fb7ef9..3bb7023bbc18d 100644 --- a/test/Driver/Dependencies/fail-chained.swift +++ b/test/Driver/Dependencies/fail-chained.swift @@ -3,8 +3,8 @@ // RUN: rm -rf %t && cp -r %S/Inputs/fail-chained/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s -// RUN: FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled a.swift @@ -26,9 +26,9 @@ // RUN: touch -t 201401240006 %t/a.swift // RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/a.txt 2>&1 -// RUN: FileCheck -check-prefix=CHECK-A %s < %t/a.txt -// RUN: FileCheck -check-prefix=NEGATIVE-A %s < %t/a.txt -// RUN: FileCheck -check-prefix=CHECK-RECORD-A %s < %t/main~buildrecord.swiftdeps +// RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt +// RUN: %FileCheck -check-prefix=NEGATIVE-A %s < %t/a.txt +// RUN: %FileCheck -check-prefix=CHECK-RECORD-A %s < %t/main~buildrecord.swiftdeps // CHECK-A: Handled a.swift // CHECK-A: Handled bad.swift @@ -47,9 +47,9 @@ // CHECK-RECORD-A-DAG: "./bad.swift": !dirty [ // RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/a2.txt 2>&1 -// RUN: FileCheck -check-prefix=CHECK-A2 %s < %t/a2.txt -// RUN: FileCheck -check-prefix=NEGATIVE-A2 %s < %t/a2.txt -// RUN: FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps +// RUN: %FileCheck -check-prefix=CHECK-A2 %s < %t/a2.txt +// RUN: %FileCheck -check-prefix=NEGATIVE-A2 %s < %t/a2.txt +// RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps // CHECK-A2-DAG: Handled c.swift // CHECK-A2-DAG: Handled d.swift @@ -63,13 +63,13 @@ // RUN: rm -rf %t && cp -r %S/Inputs/fail-chained/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/b.swift // RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b.txt 2>&1 -// RUN: FileCheck -check-prefix=CHECK-B %s < %t/b.txt -// RUN: FileCheck -check-prefix=NEGATIVE-B %s < %t/b.txt -// RUN: FileCheck -check-prefix=CHECK-RECORD-B %s < %t/main~buildrecord.swiftdeps +// RUN: %FileCheck -check-prefix=CHECK-B %s < %t/b.txt +// RUN: %FileCheck -check-prefix=NEGATIVE-B %s < %t/b.txt +// RUN: %FileCheck -check-prefix=CHECK-RECORD-B %s < %t/main~buildrecord.swiftdeps // CHECK-B: Handled b.swift // CHECK-B: Handled bad.swift @@ -88,9 +88,9 @@ // CHECK-RECORD-B-DAG: "./bad.swift": !private [ // RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b2.txt 2>&1 -// RUN: FileCheck -check-prefix=CHECK-B2 %s < %t/b2.txt -// RUN: FileCheck -check-prefix=NEGATIVE-B2 %s < %t/b2.txt -// RUN: FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps +// RUN: %FileCheck -check-prefix=CHECK-B2 %s < %t/b2.txt +// RUN: %FileCheck -check-prefix=NEGATIVE-B2 %s < %t/b2.txt +// RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps // CHECK-B2-DAG: Handled bad.swift // NEGATIVE-B2-NOT: Handled a.swift @@ -104,13 +104,13 @@ // RUN: rm -rf %t && cp -r %S/Inputs/fail-chained/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/bad.swift // RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/bad.txt 2>&1 -// RUN: FileCheck -check-prefix=CHECK-BAD %s < %t/bad.txt -// RUN: FileCheck -check-prefix=NEGATIVE-BAD %s < %t/bad.txt -// RUN: FileCheck -check-prefix=CHECK-RECORD-A %s < %t/main~buildrecord.swiftdeps +// RUN: %FileCheck -check-prefix=CHECK-BAD %s < %t/bad.txt +// RUN: %FileCheck -check-prefix=NEGATIVE-BAD %s < %t/bad.txt +// RUN: %FileCheck -check-prefix=CHECK-RECORD-A %s < %t/main~buildrecord.swiftdeps // CHECK-BAD: Handled bad.swift // NEGATIVE-BAD-NOT: Handled a.swift @@ -121,6 +121,6 @@ // NEGATIVE-BAD-NOT: Handled f.swift // RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/bad2.txt 2>&1 -// RUN: FileCheck -check-prefix=CHECK-A2 %s < %t/bad2.txt -// RUN: FileCheck -check-prefix=NEGATIVE-A2 %s < %t/bad2.txt -// RUN: FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps +// RUN: %FileCheck -check-prefix=CHECK-A2 %s < %t/bad2.txt +// RUN: %FileCheck -check-prefix=NEGATIVE-A2 %s < %t/bad2.txt +// RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps diff --git a/test/Driver/Dependencies/fail-interface-hash.swift b/test/Driver/Dependencies/fail-interface-hash.swift index 392cc24f996a8..618f7b4fcafdf 100644 --- a/test/Driver/Dependencies/fail-interface-hash.swift +++ b/test/Driver/Dependencies/fail-interface-hash.swift @@ -3,7 +3,7 @@ // RUN: rm -rf %t && cp -r %S/Inputs/fail-interface-hash/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift @@ -15,8 +15,8 @@ // RUN: cp -r %S/Inputs/fail-interface-hash/*.swiftdeps %t // RUN: touch -t 201401240006 %t/bad.swift %t/main.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s -// RUN: FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps // CHECK-SECOND: Handled main.swift // CHECK-SECOND-NOT: Handled depends diff --git a/test/Driver/Dependencies/fail-new.swift b/test/Driver/Dependencies/fail-new.swift index 226098c69a8c0..36b03953f34ed 100644 --- a/test/Driver/Dependencies/fail-new.swift +++ b/test/Driver/Dependencies/fail-new.swift @@ -3,20 +3,20 @@ // RUN: rm -rf %t && cp -r %S/Inputs/fail-simple/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s // CHECK-NOT: warning // CHECK: Handled main.swift // CHECK: Handled bad.swift // CHECK-NOT: Handled other.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-BAD-ONLY %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BAD-ONLY %s // CHECK-BAD-ONLY-NOT: warning // CHECK-BAD-ONLY-NOT: Handled // CHECK-BAD-ONLY: Handled bad.swift // CHECK-BAD-ONLY-NOT: Handled -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-OKAY %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s // CHECK-OKAY: Handled main.swift // CHECK-OKAY: Handled bad.swift // CHECK-OKAY: Handled other.swift @@ -24,10 +24,10 @@ // RUN: touch -t 201401240006 %t/bad.swift // RUN: rm %t/bad.swiftdeps -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-OKAY-2 %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY-2 %s // CHECK-OKAY-2: Handled bad.swift // CHECK-OKAY-2: Handled other.swift @@ -35,10 +35,10 @@ // RUN: touch -t 201401240006 %t/main.swift // RUN: rm %t/main.swiftdeps -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-OKAY %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s // RUN: touch -t 201401240006 %t/other.swift // RUN: rm %t/other.swiftdeps -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s diff --git a/test/Driver/Dependencies/fail-simple.swift b/test/Driver/Dependencies/fail-simple.swift index 9247137054a00..d228b65c66aaf 100644 --- a/test/Driver/Dependencies/fail-simple.swift +++ b/test/Driver/Dependencies/fail-simple.swift @@ -3,7 +3,7 @@ // RUN: rm -rf %t && cp -r %S/Inputs/fail-simple/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift @@ -11,8 +11,8 @@ // CHECK-FIRST: Handled other.swift // RUN: touch -t 201401240006 %t/bad.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s -// RUN: FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps // CHECK-SECOND: Handled bad.swift // CHECK-SECOND-NOT: Handled main.swift diff --git a/test/Driver/Dependencies/fail-with-bad-deps.swift b/test/Driver/Dependencies/fail-with-bad-deps.swift index f7e535d89a7e9..ee1e2da810d0a 100644 --- a/test/Driver/Dependencies/fail-with-bad-deps.swift +++ b/test/Driver/Dependencies/fail-with-bad-deps.swift @@ -3,7 +3,7 @@ // RUN: rm -rf %t && cp -r %S/Inputs/fail-with-bad-deps/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift @@ -14,14 +14,14 @@ // Reset the .swiftdeps files. // RUN: cp -r %S/Inputs/fail-with-bad-deps/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-NONE %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NONE %s // CHECK-NONE-NOT: Handled // Reset the .swiftdeps files. // RUN: cp -r %S/Inputs/fail-with-bad-deps/*.swiftdeps %t // RUN: touch -t 201401240006 %t/bad.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-BUILD-ALL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BUILD-ALL %s // CHECK-BUILD-ALL-NOT: warning // CHECK-BUILD-ALL: Handled bad.swift @@ -33,8 +33,8 @@ // RUN: cp -r %S/Inputs/fail-with-bad-deps/*.swiftdeps %t // RUN: touch -t 201401240007 %t/bad.swift %t/main.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-WITH-FAIL %s -// RUN: FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies-bad.py -output-file-map %t/output.json -incremental ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-WITH-FAIL %s +// RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps // CHECK-WITH-FAIL: Handled main.swift // CHECK-WITH-FAIL-NOT: Handled depends diff --git a/test/Driver/Dependencies/file-added.swift b/test/Driver/Dependencies/file-added.swift index 8d70722c449f9..726ca88f96d45 100644 --- a/test/Driver/Dependencies/file-added.swift +++ b/test/Driver/Dependencies/file-added.swift @@ -3,16 +3,16 @@ // RUN: rm -rf %t && cp -r %S/Inputs/one-way/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-NOT: Handled other.swift // CHECK-THIRD: Handled main.swift diff --git a/test/Driver/Dependencies/independent-half-dirty.swift b/test/Driver/Dependencies/independent-half-dirty.swift index 0268f156008f2..964995d2f5de7 100644 --- a/test/Driver/Dependencies/independent-half-dirty.swift +++ b/test/Driver/Dependencies/independent-half-dirty.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && cp -r %S/Inputs/independent/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift @@ -9,14 +9,14 @@ // RUN: touch -t 201401240005 %t/other.o // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled main.swift // CHECK-SECOND: Handled other.swift // CHECK-SECOND-NOT: Handled main.swift // RUN: rm %t/other.swiftdeps -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled main.swift // CHECK-THIRD: Handled other.swift diff --git a/test/Driver/Dependencies/independent-parseable.swift b/test/Driver/Dependencies/independent-parseable.swift index 259b9f82a5ea4..1b86b8011dc7a 100644 --- a/test/Driver/Dependencies/independent-parseable.swift +++ b/test/Driver/Dependencies/independent-parseable.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && cp -r %S/Inputs/independent/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: {{^{$}} @@ -16,7 +16,7 @@ // CHECK-FIRST: "output": "Handled main.swift\n" // CHECK-FIRST: {{^}$}} -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: {{^{$}} // CHECK-SECOND: "kind": "skipped" @@ -25,13 +25,13 @@ // CHECK-SECOND: {{^}$}} // RUN: touch -t 201401240006 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: rm -rf %t && cp -r %S/Inputs/independent/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | FileCheck -check-prefix=CHECK-FIRST-MULTI %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s // CHECK-FIRST-MULTI: {{^{$}} // CHECK-FIRST-MULTI: "kind": "began" @@ -57,7 +57,7 @@ // CHECK-FIRST-MULTI: "output": "Handled other.swift\n" // CHECK-FIRST-MULTI: {{^}$}} -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | FileCheck -check-prefix=CHECK-SECOND-MULTI %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND-MULTI %s // CHECK-SECOND-MULTI: {{^{$}} // CHECK-SECOND-MULTI: "kind": "skipped" @@ -72,5 +72,5 @@ // CHECK-SECOND-MULTI: {{^}$}} // RUN: touch -t 201401240006 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | FileCheck -check-prefix=CHECK-FIRST-MULTI %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s diff --git a/test/Driver/Dependencies/independent.swift b/test/Driver/Dependencies/independent.swift index da558ed9e00e6..6f8cc8d4a6d5a 100644 --- a/test/Driver/Dependencies/independent.swift +++ b/test/Driver/Dependencies/independent.swift @@ -3,41 +3,41 @@ // RUN: rm -rf %t && cp -r %S/Inputs/independent/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: ls %t/main~buildrecord.swiftdeps // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: rm -rf %t && cp -r %S/Inputs/independent/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST-MULTI %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s // CHECK-FIRST-MULTI: Handled main.swift // CHECK-FIRST-MULTI: Handled other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // RUN: touch -t 201401240006 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST-MULTI %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s // RUN: rm -rf %t && cp -r %S/Inputs/independent/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SINGLE %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SINGLE %s // CHECK-SINGLE: Handled main.swift // RUN: ls %t/main~buildrecord.swiftdeps diff --git a/test/Driver/Dependencies/malformed-but-valid-yaml.swift b/test/Driver/Dependencies/malformed-but-valid-yaml.swift index 2f13c8b5a5b03..f00b5a7e421cc 100644 --- a/test/Driver/Dependencies/malformed-but-valid-yaml.swift +++ b/test/Driver/Dependencies/malformed-but-valid-yaml.swift @@ -7,19 +7,19 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/malformed-after/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: Handled other.swift // CHECK-SECOND: Handled main.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled main.swift // CHECK-THIRD: Handled other.swift @@ -33,13 +33,13 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/malformed-after/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift diff --git a/test/Driver/Dependencies/malformed.swift b/test/Driver/Dependencies/malformed.swift index 2e5a87ab0d081..0edcabba80d6e 100644 --- a/test/Driver/Dependencies/malformed.swift +++ b/test/Driver/Dependencies/malformed.swift @@ -7,19 +7,19 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/malformed-after/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: Handled other.swift // CHECK-SECOND: Handled main.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled main.swift // CHECK-THIRD: Handled other.swift @@ -33,13 +33,13 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/malformed-after/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift diff --git a/test/Driver/Dependencies/mutual-interface-hash.swift b/test/Driver/Dependencies/mutual-interface-hash.swift index 0bf90ca1d47b4..13ec6464d9ad9 100644 --- a/test/Driver/Dependencies/mutual-interface-hash.swift +++ b/test/Driver/Dependencies/mutual-interface-hash.swift @@ -9,12 +9,12 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/mutual-interface-hash/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-CLEAN %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s // CHECK-CLEAN-NOT: Handled // RUN: touch -t 201401240006 %t/does-change.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-CHANGE %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CHANGE %s // CHECK-CHANGE: Handled does-change.swift // CHECK-CHANGE: Handled does-not-change.swift @@ -23,7 +23,7 @@ // RUN: cp -r %S/Inputs/mutual-interface-hash/*.swiftdeps %t // RUN: touch -t 201401240006 %t/does-not-change.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-NO-CHANGE %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NO-CHANGE %s // CHECK-NO-CHANGE-NOT: Handled // CHECK-NO-CHANGE: Handled does-not-change.swift @@ -34,7 +34,7 @@ // Make sure the files really were dependent on one another. // RUN: touch -t 201401240007 %t/does-not-change.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s // CHECK-REBUILD-DEPENDENTS: Handled does-not-change.swift // CHECK-REBUILD-DEPENDENTS: Handled does-change.swift @@ -44,4 +44,4 @@ // considered cascading. // RUN: cp -r %S/Inputs/mutual-interface-hash/*.swiftdeps %t // RUN: sed -E -e 's/"[^"]*does-not-change.swift":/& !dirty/' -i.prev %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s diff --git a/test/Driver/Dependencies/mutual.swift b/test/Driver/Dependencies/mutual.swift index e6c42d8804bdb..7db852b08249a 100644 --- a/test/Driver/Dependencies/mutual.swift +++ b/test/Driver/Dependencies/mutual.swift @@ -3,21 +3,21 @@ // RUN: rm -rf %t && cp -r %S/Inputs/mutual/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled other.swift // CHECK-THIRD: Handled main.swift // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s diff --git a/test/Driver/Dependencies/nominal-members.swift b/test/Driver/Dependencies/nominal-members.swift index 21f41f00b0225..85cc635ccdbca 100644 --- a/test/Driver/Dependencies/nominal-members.swift +++ b/test/Driver/Dependencies/nominal-members.swift @@ -3,7 +3,7 @@ // RUN: rm -rf %t && cp -r %S/Inputs/nominal-members/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s // CHECK-INITIAL-NOT: warning // CHECK-INITIAL: Handled a.swift @@ -11,25 +11,25 @@ // CHECK-INITIAL: Handled depends-on-a-foo.swift // CHECK-INITIAL: Handled depends-on-a-ext.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-CLEAN %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s // CHECK-CLEAN-NOT: Handled // RUN: touch -t 201401240006 %t/a.swift // RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v > %t/touched-a.txt 2>&1 -// RUN: FileCheck -check-prefix=CHECK-TOUCHED-A %s < %t/touched-a.txt -// RUN: FileCheck -check-prefix=NEGATIVE-TOUCHED-A %s < %t/touched-a.txt +// RUN: %FileCheck -check-prefix=CHECK-TOUCHED-A %s < %t/touched-a.txt +// RUN: %FileCheck -check-prefix=NEGATIVE-TOUCHED-A %s < %t/touched-a.txt // CHECK-TOUCHED-A: Handled a.swift // CHECK-TOUCHED-A-DAG: Handled depends-on-a-foo.swift // CHECK-TOUCHED-A-DAG: Handled depends-on-a-ext.swift // NEGATIVE-TOUCHED-A-NOT: Handled a-ext.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-CLEAN %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s // RUN: touch -t 201401240007 %t/a-ext.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-TOUCHED-EXT %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-TOUCHED-EXT %s // CHECK-TOUCHED-EXT-NOT: Handled // CHECK-TOUCHED-EXT: Handled a-ext.swift diff --git a/test/Driver/Dependencies/one-way-depends-after.swift b/test/Driver/Dependencies/one-way-depends-after.swift index 469cbffe9e69e..d6f3bca1e8640 100644 --- a/test/Driver/Dependencies/one-way-depends-after.swift +++ b/test/Driver/Dependencies/one-way-depends-after.swift @@ -10,20 +10,20 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-depends-after/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled main.swift // CHECK-SECOND: Handled other.swift // CHECK-SECOND-NOT: Handled main.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // RUN: rm -rf %t && cp -r %S/Inputs/one-way-depends-after/ %t @@ -35,20 +35,20 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-depends-after/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-NOT: Handled other.swift // CHECK-THIRD: Handled main.swift // CHECK-THIRD-NOT: Handled other.swift // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240008 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH: Handled other.swift // CHECK-FOURTH: Handled main.swift diff --git a/test/Driver/Dependencies/one-way-depends-before.swift b/test/Driver/Dependencies/one-way-depends-before.swift index 034b01cf5023d..f6d07511decd8 100644 --- a/test/Driver/Dependencies/one-way-depends-before.swift +++ b/test/Driver/Dependencies/one-way-depends-before.swift @@ -10,19 +10,19 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-depends-before/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: Handled other.swift // CHECK-SECOND: Handled main.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-NOT: Handled main.swift // CHECK-THIRD: Handled other.swift @@ -38,17 +38,17 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-depends-before/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift // CHECK-FOURTH-NOT: Handled other.swift // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // RUN: touch -t 201401240008 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s diff --git a/test/Driver/Dependencies/one-way-external-delete.swift b/test/Driver/Dependencies/one-way-external-delete.swift index 5663e867cd370..82bc5ccddc26a 100644 --- a/test/Driver/Dependencies/one-way-external-delete.swift +++ b/test/Driver/Dependencies/one-way-external-delete.swift @@ -1,13 +1,13 @@ // RUN: rm -rf %t && cp -r %S/Inputs/one-way-external/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled @@ -16,7 +16,7 @@ // RUN: touch -t 201401240006 %t/*.o // RUN: touch -t 201401240004 %t/*-external // RUN: rm %t/other1-external -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-DAG: Handled other.swift // CHECK-THIRD-DAG: Handled main.swift @@ -25,14 +25,14 @@ // RUN: rm -rf %t && cp -r %S/Inputs/one-way-external/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240005 %t/* // RUN: touch -t 201401240006 %t/*.o // RUN: touch -t 201401240004 %t/*-external // RUN: rm %t/main1-external -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift diff --git a/test/Driver/Dependencies/one-way-external.swift b/test/Driver/Dependencies/one-way-external.swift index 11c5407dc2143..fdea22c8db985 100644 --- a/test/Driver/Dependencies/one-way-external.swift +++ b/test/Driver/Dependencies/one-way-external.swift @@ -7,13 +7,13 @@ // RUN: rm -rf %t && cp -r %S/Inputs/one-way-external/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled @@ -22,7 +22,7 @@ // RUN: touch -t 201401240006 %t/*.o // RUN: touch -t 201401240004 %t/*-external // RUN: touch -t 203704010005 %t/other1-external -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-DAG: Handled other.swift // CHECK-THIRD-DAG: Handled main.swift @@ -31,14 +31,14 @@ // RUN: touch -t 201401240006 %t/*.o // RUN: touch -t 201401240004 %t/*-external // RUN: touch -t 203704010005 %t/other2-external -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240005 %t/* // RUN: touch -t 201401240006 %t/*.o // RUN: touch -t 201401240004 %t/*-external // RUN: touch -t 203704010005 %t/main1-external -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift @@ -48,4 +48,4 @@ // RUN: touch -t 201401240006 %t/*.o // RUN: touch -t 201401240004 %t/*-external // RUN: touch -t 203704010005 %t/main2-external -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s diff --git a/test/Driver/Dependencies/one-way-merge-module.swift b/test/Driver/Dependencies/one-way-merge-module.swift index f434e519b65d5..90543bfe485e0 100644 --- a/test/Driver/Dependencies/one-way-merge-module.swift +++ b/test/Driver/Dependencies/one-way-merge-module.swift @@ -3,14 +3,14 @@ // RUN: rm -rf %t && cp -r %S/Inputs/one-way/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift // CHECK-FIRST: Produced master.swiftmodule -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: warning // CHECK-SECOND-NOT: Handled diff --git a/test/Driver/Dependencies/one-way-parallel.swift b/test/Driver/Dependencies/one-way-parallel.swift index b2ad7e77ef8bd..a617d13ab4c40 100644 --- a/test/Driver/Dependencies/one-way-parallel.swift +++ b/test/Driver/Dependencies/one-way-parallel.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && cp -r %S/Inputs/one-way/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: {{^{$}} @@ -29,7 +29,7 @@ // CHECK-FIRST: {{^}$}} // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j2 -parseable-output 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j2 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: {{^{$}} // CHECK-SECOND: "kind": "began" diff --git a/test/Driver/Dependencies/one-way-parseable.swift b/test/Driver/Dependencies/one-way-parseable.swift index a99b8389d5bb0..bd2946f6a5601 100644 --- a/test/Driver/Dependencies/one-way-parseable.swift +++ b/test/Driver/Dependencies/one-way-parseable.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && cp -r %S/Inputs/one-way/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: {{^{$}} @@ -28,7 +28,7 @@ // CHECK-FIRST: "output": "Handled other.swift\n" // CHECK-FIRST: {{^}$}} -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: {{^{$}} // CHECK-SECOND: "kind": "skipped" @@ -43,7 +43,7 @@ // CHECK-SECOND: {{^}$}} // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: {{^{$}} // CHECK-THIRD: "kind": "began" @@ -70,7 +70,7 @@ // CHECK-THIRD: {{^}$}} // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH: {{^{$}} // CHECK-FOURTH: "kind": "began" diff --git a/test/Driver/Dependencies/one-way-provides-after.swift b/test/Driver/Dependencies/one-way-provides-after.swift index ce8e8b80f049e..561cf0802697c 100644 --- a/test/Driver/Dependencies/one-way-provides-after.swift +++ b/test/Driver/Dependencies/one-way-provides-after.swift @@ -10,19 +10,19 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-provides-after/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: Handled other.swift // CHECK-SECOND: Handled main.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // RUN: rm -rf %t && cp -r %S/Inputs/one-way-provides-after/ %t // RUN: touch -t 201401240005 %t/*.swift @@ -33,13 +33,13 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-provides-after/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240008 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-NOT: Handled other.swift // CHECK-THIRD: Handled main.swift diff --git a/test/Driver/Dependencies/one-way-provides-before.swift b/test/Driver/Dependencies/one-way-provides-before.swift index b050485bd3788..a1b98d09e5dd0 100644 --- a/test/Driver/Dependencies/one-way-provides-before.swift +++ b/test/Driver/Dependencies/one-way-provides-before.swift @@ -10,19 +10,19 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-provides-before/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: Handled other.swift // CHECK-SECOND: Handled main.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-NOT: Handled main.swift // CHECK-THIRD: Handled other.swift @@ -37,13 +37,13 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-provides-before/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift diff --git a/test/Driver/Dependencies/one-way-while-editing.swift b/test/Driver/Dependencies/one-way-while-editing.swift index b6aad82524775..2e6295e783f13 100644 --- a/test/Driver/Dependencies/one-way-while-editing.swift +++ b/test/Driver/Dependencies/one-way-while-editing.swift @@ -3,7 +3,7 @@ // RUN: rm -rf %t && cp -r %S/Inputs/one-way/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/modify-non-primary-files.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/modify-non-primary-files.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s // CHECK: Handled main.swift // CHECK: Handled other.swift @@ -11,14 +11,14 @@ // CHECK: error: input file 'other.swift' was modified during the build // CHECK-NOT: error -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-RECOVER %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-RECOVER %s // CHECK-RECOVER: Handled main.swift // CHECK-RECOVER: Handled other.swift // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/modify-non-primary-files.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-REVERSED %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path %S/Inputs/modify-non-primary-files.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REVERSED %s // CHECK-REVERSED: Handled other.swift // CHECK-REVERSED: Handled main.swift @@ -26,7 +26,7 @@ // CHECK-REVERSED: error: input file 'main.swift' was modified during the build // CHECK-REVERSED-NOT: error -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-REVERSED-RECOVER %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REVERSED-RECOVER %s // CHECK-REVERSED-RECOVER-NOT: Handled other.swift // CHECK-REVERSED-RECOVER: Handled main.swift diff --git a/test/Driver/Dependencies/one-way.swift b/test/Driver/Dependencies/one-way.swift index d71be29775193..ccacabbca7534 100644 --- a/test/Driver/Dependencies/one-way.swift +++ b/test/Driver/Dependencies/one-way.swift @@ -3,34 +3,34 @@ // RUN: rm -rf %t && cp -r %S/Inputs/one-way/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled other.swift // CHECK-THIRD: Handled main.swift // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift // CHECK-FOURTH-NOT: Handled other.swift // RUN: rm %t/main.o -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // RUN: rm %t/other.o -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIFTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIFTH %s // CHECK-FIFTH-NOT: Handled main.swift // CHECK-FIFTH: Handled other.swift @@ -39,33 +39,33 @@ // RUN: rm -rf %t && cp -r %S/Inputs/one-way/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // Try modifying the inputs /backwards/ in time rather than forwards. // RUN: touch -t 201401240004 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240004 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // RUN: rm -rf %t && cp -r %S/Inputs/one-way/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-REV-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FIRST %s // CHECK-REV-FIRST: Handled other.swift // CHECK-REV-FIRST: Handled main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-REV-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-SECOND %s // CHECK-REV-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-REV-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FIRST %s // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-REV-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FOURTH %s // CHECK-REV-FOURTH-NOT: Handled other.swift // CHECK-REV-FOURTH: Handled main.swift diff --git a/test/Driver/Dependencies/private-after.swift b/test/Driver/Dependencies/private-after.swift index f31d4646cd573..0c2fbdcaa6ef0 100644 --- a/test/Driver/Dependencies/private-after.swift +++ b/test/Driver/Dependencies/private-after.swift @@ -10,15 +10,15 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/private-after/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s // CHECK-INITIAL-NOT: warning // CHECK-INITIAL-NOT: Handled // RUN: touch -t 201401240006 %t/a.swift // RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v > %t/a.txt 2>&1 -// RUN: FileCheck -check-prefix=CHECK-A %s < %t/a.txt -// RUN: FileCheck -check-prefix=CHECK-A-NEG %s < %t/a.txt +// RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt +// RUN: %FileCheck -check-prefix=CHECK-A-NEG %s < %t/a.txt // CHECK-A: Handled a.swift // CHECK-A-DAG: Handled b.swift @@ -40,8 +40,8 @@ // RUN: touch -t 201401240006 %t/f.swift // RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v > %t/f.txt 2>&1 -// RUN: FileCheck -check-prefix=CHECK-F %s < %t/f.txt -// RUN: FileCheck -check-prefix=CHECK-F-NEG %s < %t/f.txt +// RUN: %FileCheck -check-prefix=CHECK-F %s < %t/f.txt +// RUN: %FileCheck -check-prefix=CHECK-F-NEG %s < %t/f.txt // CHECK-F: Handled f.swift // CHECK-F: Handled g.swift diff --git a/test/Driver/Dependencies/private.swift b/test/Driver/Dependencies/private.swift index 6add23c97cc3b..90656c613b3fb 100644 --- a/test/Driver/Dependencies/private.swift +++ b/test/Driver/Dependencies/private.swift @@ -3,7 +3,7 @@ // RUN: rm -rf %t && cp -r %S/Inputs/private/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s // CHECK-INITIAL-NOT: warning // CHECK-INITIAL: Handled a.swift @@ -14,8 +14,8 @@ // RUN: touch -t 201401240006 %t/a.swift // RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/a.txt 2>&1 -// RUN: FileCheck -check-prefix=CHECK-A %s < %t/a.txt -// RUN: FileCheck -check-prefix=CHECK-A-NEG %s < %t/a.txt +// RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt +// RUN: %FileCheck -check-prefix=CHECK-A-NEG %s < %t/a.txt // CHECK-A: Handled a.swift // CHECK-A-DAG: Handled b.swift @@ -25,8 +25,8 @@ // RUN: touch -t 201401240006 %t/b.swift // RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/b.txt 2>&1 -// RUN: FileCheck -check-prefix=CHECK-B %s < %t/b.txt -// RUN: FileCheck -check-prefix=CHECK-B-NEG %s < %t/b.txt +// RUN: %FileCheck -check-prefix=CHECK-B %s < %t/b.txt +// RUN: %FileCheck -check-prefix=CHECK-B-NEG %s < %t/b.txt // CHECK-B-NEG-NOT: Handled a.swift // CHECK-B: Handled b.swift @@ -36,8 +36,8 @@ // RUN: touch -t 201401240006 %t/c.swift // RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/c.txt 2>&1 -// RUN: FileCheck -check-prefix=CHECK-C %s < %t/c.txt -// RUN: FileCheck -check-prefix=CHECK-C-NEG %s < %t/c.txt +// RUN: %FileCheck -check-prefix=CHECK-C %s < %t/c.txt +// RUN: %FileCheck -check-prefix=CHECK-C-NEG %s < %t/c.txt // CHECK-C-NEG-NOT: Handled a.swift // CHECK-C-NEG-NOT: Handled b.swift @@ -47,8 +47,8 @@ // RUN: touch -t 201401240006 %t/d.swift // RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/d.txt 2>&1 -// RUN: FileCheck -check-prefix=CHECK-D %s < %t/d.txt -// RUN: FileCheck -check-prefix=CHECK-D-NEG %s < %t/d.txt +// RUN: %FileCheck -check-prefix=CHECK-D %s < %t/d.txt +// RUN: %FileCheck -check-prefix=CHECK-D-NEG %s < %t/d.txt // CHECK-D-NEG-NOT: Handled a.swift // CHECK-D-NEG-NOT: Handled b.swift @@ -58,8 +58,8 @@ // RUN: touch -t 201401240006 %t/e.swift // RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/e.txt 2>&1 -// RUN: FileCheck -check-prefix=CHECK-E %s < %t/e.txt -// RUN: FileCheck -check-prefix=CHECK-E-NEG %s < %t/e.txt +// RUN: %FileCheck -check-prefix=CHECK-E %s < %t/e.txt +// RUN: %FileCheck -check-prefix=CHECK-E-NEG %s < %t/e.txt // CHECK-E-NEG-NOT: Handled a.swift // CHECK-E-NEG-NOT: Handled b.swift @@ -69,8 +69,8 @@ // RUN: touch -t 201401240007 %t/a.swift %t/e.swift // RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/update-dependencies.py -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/ae.txt 2>&1 -// RUN: FileCheck -check-prefix=CHECK-AE %s < %t/ae.txt -// RUN: FileCheck -check-prefix=CHECK-AE-NEG %s < %t/ae.txt +// RUN: %FileCheck -check-prefix=CHECK-AE %s < %t/ae.txt +// RUN: %FileCheck -check-prefix=CHECK-AE-NEG %s < %t/ae.txt // CHECK-AE: Handled a.swift // CHECK-AE: Handled e.swift diff --git a/test/Driver/Dependencies/whole-module-build-record.swift b/test/Driver/Dependencies/whole-module-build-record.swift index d7c516c093d96..57866c1fe5b45 100644 --- a/test/Driver/Dependencies/whole-module-build-record.swift +++ b/test/Driver/Dependencies/whole-module-build-record.swift @@ -3,8 +3,8 @@ // RUN: rm -rf %t && cp -r %S/Inputs/one-way/ %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/fake-build-whole-module.py -output-file-map %t/output.json -whole-module-optimization ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | FileCheck -check-prefix=CHECK-FIRST %s -// RUN: FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path %S/Inputs/fake-build-whole-module.py -output-file-map %t/output.json -whole-module-optimization ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps // CHECK-FIRST-NOT: warning // CHECK-FIRST: Produced main.o diff --git a/test/Driver/actions.swift b/test/Driver/actions.swift index aec3593526066..10ed5937ee450 100644 --- a/test/Driver/actions.swift +++ b/test/Driver/actions.swift @@ -3,66 +3,66 @@ // XFAIL: freebsd, linux -// RUN: %swiftc_driver -driver-print-actions %s 2>&1 | FileCheck %s -check-prefix=BASIC +// RUN: %swiftc_driver -driver-print-actions %s 2>&1 | %FileCheck %s -check-prefix=BASIC // BASIC: 0: input, "{{.*}}actions.swift", swift // BASIC: 1: compile, {0}, object // BASIC: 2: link, {1}, image -// RUN: %swiftc_driver -driver-print-actions -c %s 2>&1 | FileCheck %s -check-prefix=BASICC +// RUN: %swiftc_driver -driver-print-actions -c %s 2>&1 | %FileCheck %s -check-prefix=BASICC // BASICC: 0: input, "{{.*}}actions.swift", swift // BASICC: 1: compile, {0}, object -// RUN: %swiftc_driver -driver-print-actions -emit-sil %s 2>&1 | FileCheck %s -check-prefix=BASICSIL +// RUN: %swiftc_driver -driver-print-actions -emit-sil %s 2>&1 | %FileCheck %s -check-prefix=BASICSIL // BASICSIL: 0: input, "{{.*}}actions.swift", swift // BASICSIL: 1: compile, {0}, sil -// RUN: %swiftc_driver -driver-print-actions -emit-silgen %s 2>&1 | FileCheck %s -check-prefix=BASICSILGEN +// RUN: %swiftc_driver -driver-print-actions -emit-silgen %s 2>&1 | %FileCheck %s -check-prefix=BASICSILGEN // BASICSILGEN: 0: input, "{{.*}}actions.swift", swift // BASICSILGEN: 1: compile, {0}, raw-sil -// RUN: %swiftc_driver -driver-print-actions -S %s 2>&1 | FileCheck %s -check-prefix=BASICASM +// RUN: %swiftc_driver -driver-print-actions -S %s 2>&1 | %FileCheck %s -check-prefix=BASICASM // BASICASM: 0: input, "{{.*}}actions.swift", swift // BASICASM: 1: compile, {0}, assembly -// RUN: %swiftc_driver -driver-print-actions -emit-module %s 2>&1 | FileCheck %s -check-prefix=BASICMODULE +// RUN: %swiftc_driver -driver-print-actions -emit-module %s 2>&1 | %FileCheck %s -check-prefix=BASICMODULE // BASICMODULE: 0: input, "{{.*}}actions.swift", swift // BASICMODULE: 1: compile, {0}, swiftmodule // BASICMODULE: 2: merge-module, {1}, swiftmodule -// RUN: %swiftc_driver -driver-print-actions -emit-executable -emit-module %s 2>&1 | FileCheck %s -check-prefix=EXEC-AND-MODULE +// RUN: %swiftc_driver -driver-print-actions -emit-executable -emit-module %s 2>&1 | %FileCheck %s -check-prefix=EXEC-AND-MODULE // EXEC-AND-MODULE: 0: input, "{{.*}}actions.swift", swift // EXEC-AND-MODULE: 1: compile, {0}, object // EXEC-AND-MODULE: 2: merge-module, {1}, swiftmodule // EXEC-AND-MODULE: 3: link, {1}, image -// RUN: %swiftc_driver -driver-print-actions -g %s 2>&1 | FileCheck %s -check-prefix=DEBUG -// RUN: %swiftc_driver -driver-print-actions -gnone -g %s 2>&1 | FileCheck %s -check-prefix=DEBUG +// RUN: %swiftc_driver -driver-print-actions -g %s 2>&1 | %FileCheck %s -check-prefix=DEBUG +// RUN: %swiftc_driver -driver-print-actions -gnone -g %s 2>&1 | %FileCheck %s -check-prefix=DEBUG // DEBUG: 0: input, "{{.*}}actions.swift", swift // DEBUG: 1: compile, {0}, object // DEBUG: 2: merge-module, {1}, swiftmodule // DEBUG: 3: link, {1, 2}, image // DEBUG: 4: generate-dSYM, {3}, dSYM -// RUN: %swiftc_driver -driver-print-actions -gnone %s 2>&1 | FileCheck %s -check-prefix=BASIC -// RUN: %swiftc_driver -driver-print-actions -g -gnone %s 2>&1 | FileCheck %s -check-prefix=BASIC +// RUN: %swiftc_driver -driver-print-actions -gnone %s 2>&1 | %FileCheck %s -check-prefix=BASIC +// RUN: %swiftc_driver -driver-print-actions -g -gnone %s 2>&1 | %FileCheck %s -check-prefix=BASIC -// RUN: %swiftc_driver -driver-print-actions -g -c %s 2>&1 | FileCheck %s -check-prefix=DEBUG-OBJECT +// RUN: %swiftc_driver -driver-print-actions -g -c %s 2>&1 | %FileCheck %s -check-prefix=DEBUG-OBJECT // DEBUG-OBJECT: 0: input, "{{.*}}actions.swift", swift // DEBUG-OBJECT: 1: compile, {0}, object // DEBUG-OBJECT-NOT: merge-module -// RUN: %swiftc_driver -driver-print-actions -g -emit-executable -emit-module %s 2>&1 | FileCheck %s -check-prefix=DEBUG-MODULE -// RUN: %swiftc_driver -driver-print-actions -gnone -g -emit-executable -emit-module %s 2>&1 | FileCheck %s -check-prefix=DEBUG-MODULE +// RUN: %swiftc_driver -driver-print-actions -g -emit-executable -emit-module %s 2>&1 | %FileCheck %s -check-prefix=DEBUG-MODULE +// RUN: %swiftc_driver -driver-print-actions -gnone -g -emit-executable -emit-module %s 2>&1 | %FileCheck %s -check-prefix=DEBUG-MODULE // DEBUG-MODULE: 0: input, "{{.*}}actions.swift", swift // DEBUG-MODULE: 1: compile, {0}, object // DEBUG-MODULE: 2: merge-module, {1}, swiftmodule // DEBUG-MODULE: 3: link, {1, 2}, image // DEBUG-MODULE: 4: generate-dSYM, {3}, dSYM -// RUN: %swiftc_driver -driver-print-actions -gnone -emit-executable -emit-module %s 2>&1 | FileCheck %s -check-prefix=EXEC-AND-MODULE -// RUN: %swiftc_driver -driver-print-actions -g -gnone -emit-executable -emit-module %s 2>&1 | FileCheck %s -check-prefix=EXEC-AND-MODULE +// RUN: %swiftc_driver -driver-print-actions -gnone -emit-executable -emit-module %s 2>&1 | %FileCheck %s -check-prefix=EXEC-AND-MODULE +// RUN: %swiftc_driver -driver-print-actions -g -gnone -emit-executable -emit-module %s 2>&1 | %FileCheck %s -check-prefix=EXEC-AND-MODULE -// RUN: %swiftc_driver -driver-print-actions %S/Inputs/main.swift %S/../Inputs/empty.swift %s -module-name actions 2>&1 | FileCheck %s -check-prefix=MULTI +// RUN: %swiftc_driver -driver-print-actions %S/Inputs/main.swift %S/../Inputs/empty.swift %s -module-name actions 2>&1 | %FileCheck %s -check-prefix=MULTI // MULTI: 0: input, "{{.*}}Inputs/main.swift", swift // MULTI: 1: compile, {0}, object // MULTI: 2: input, "{{.*}}Inputs/empty.swift", swift @@ -71,7 +71,7 @@ // MULTI: 5: compile, {4}, object // MULTI: 6: link, {1, 3, 5}, image -// RUN: %swiftc_driver -driver-print-actions -g %S/Inputs/main.swift %S/../Inputs/empty.swift %s -module-name actions 2>&1 | FileCheck %s -check-prefix=DEBUG-MULTI +// RUN: %swiftc_driver -driver-print-actions -g %S/Inputs/main.swift %S/../Inputs/empty.swift %s -module-name actions 2>&1 | %FileCheck %s -check-prefix=DEBUG-MULTI // DEBUG-MULTI: 0: input, "{{.*}}Inputs/main.swift", swift // DEBUG-MULTI: 1: compile, {0}, object // DEBUG-MULTI: 2: input, "{{.*}}Inputs/empty.swift", swift @@ -84,14 +84,14 @@ // RUN: touch %t/a.o %t/b.o -// RUN: %swiftc_driver -driver-print-actions %t/a.o %t/b.o -o main 2>&1 | FileCheck %s -check-prefix=LINK-ONLY -// RUN: %swiftc_driver -driver-print-actions -g %t/a.o %t/b.o -o main 2>&1 | FileCheck %s -check-prefix=LINK-ONLY +// RUN: %swiftc_driver -driver-print-actions %t/a.o %t/b.o -o main 2>&1 | %FileCheck %s -check-prefix=LINK-ONLY +// RUN: %swiftc_driver -driver-print-actions -g %t/a.o %t/b.o -o main 2>&1 | %FileCheck %s -check-prefix=LINK-ONLY // LINK-ONLY: 0: input, "{{.*}}/a.o", object // LINK-ONLY: 1: input, "{{.*}}/b.o", object // LINK-ONLY: 2: link, {0, 1}, image // RUN: touch %t/a.swiftmodule %t/b.swiftmodule -// RUN: %swiftc_driver -driver-print-actions -g %t/a.o %t/b.o %t/a.swiftmodule %t/b.swiftmodule -o main 2>&1 | FileCheck %s -check-prefix=DEBUG-LINK-ONLY +// RUN: %swiftc_driver -driver-print-actions -g %t/a.o %t/b.o %t/a.swiftmodule %t/b.swiftmodule -o main 2>&1 | %FileCheck %s -check-prefix=DEBUG-LINK-ONLY // DEBUG-LINK-ONLY: 0: input, "{{.*}}/a.o", object // DEBUG-LINK-ONLY: 1: input, "{{.*}}/b.o", object // DEBUG-LINK-ONLY: 2: input, "{{.*}}/a.swiftmodule", swiftmodule @@ -101,19 +101,19 @@ // DEBUG-LINK-ONLY: 6: generate-dSYM, {5}, dSYM // RUN: touch %t/a.o %t/b.o -// RUN: %swiftc_driver -driver-print-actions %t/a.o %s -o main 2>&1 | FileCheck %s -check-prefix=COMPILE-PLUS-OBJECT +// RUN: %swiftc_driver -driver-print-actions %t/a.o %s -o main 2>&1 | %FileCheck %s -check-prefix=COMPILE-PLUS-OBJECT // COMPILE-PLUS-OBJECT: 0: input, "{{.*}}/a.o", object // COMPILE-PLUS-OBJECT: 1: input, "{{.*}}actions.swift", swift // COMPILE-PLUS-OBJECT: 2: compile, {1}, object // COMPILE-PLUS-OBJECT: 3: link, {0, 2}, image -// RUN: %swiftc_driver -driver-print-actions %S/Inputs/main.swift %S/../Inputs/empty.swift %s -module-name actions -force-single-frontend-invocation 2>&1 | FileCheck %s -check-prefix=WHOLE-MODULE +// RUN: %swiftc_driver -driver-print-actions %S/Inputs/main.swift %S/../Inputs/empty.swift %s -module-name actions -force-single-frontend-invocation 2>&1 | %FileCheck %s -check-prefix=WHOLE-MODULE // WHOLE-MODULE: 0: input, "{{.*}}Inputs/main.swift", swift // WHOLE-MODULE: 1: input, "{{.*}}Inputs/empty.swift", swift // WHOLE-MODULE: 2: input, "{{.*}}actions.swift", swift // WHOLE-MODULE: 3: compile, {0, 1, 2}, object // WHOLE-MODULE: 4: link, {3}, image -// RUN: %swiftc_driver -driver-print-actions -g %S/Inputs/main.swift %S/../Inputs/empty.swift %s -module-name actions -force-single-frontend-invocation 2>&1 | FileCheck %s -check-prefix=WHOLE-MODULE -check-prefix=WHOLE-MODULE-DEBUG +// RUN: %swiftc_driver -driver-print-actions -g %S/Inputs/main.swift %S/../Inputs/empty.swift %s -module-name actions -force-single-frontend-invocation 2>&1 | %FileCheck %s -check-prefix=WHOLE-MODULE -check-prefix=WHOLE-MODULE-DEBUG // WHOLE-MODULE-DEBUG: 5: generate-dSYM, {4}, dSYM diff --git a/test/Driver/advanced_output_file_map.swift b/test/Driver/advanced_output_file_map.swift index d561b261b63c2..54564f7d5fcfa 100644 --- a/test/Driver/advanced_output_file_map.swift +++ b/test/Driver/advanced_output_file_map.swift @@ -1,7 +1,7 @@ // RUN: echo "{\"%s\": {\"object\": \"/build/obj/advanced_output_file_map.o\", \"swiftmodule\": \"/build/swiftmodule/advanced_output_file_map.swiftmodule\", \"swiftdoc\": "/build/swiftmodule/advanced_output_file_map_x.swiftdoc", \"diagnostics\": \"/build/dia/advanced_output_file_map.dia\", \"dependencies\": \"/build/d/advanced_output_file_map.d\"}, \"%S/Inputs/main.swift\": {\"object\": \"/build/obj/main.o\", \"swiftmodule\": \"/build/swiftmodule/main.swiftmodule\", \"swiftdoc\": "/build/swiftmodule/main_x.swiftdoc", \"diagnostics\": \"/build/dia/main.dia\", \"dependencies\": \"/build/d/main.d\"}, \"%S/Inputs/lib.swift\": {\"object\": \"/build/obj/lib.o\", \"swiftmodule\": \"/build/swiftmodule/lib.swiftmodule\", \"swiftdoc\": \"/build/swiftmodule/lib_x.swiftdoc\", \"diagnostics\": \"/build/dia/lib.dia\", \"dependencies\": \"/build/d/lib.d\"}}" > %t.json -// RUN: %swiftc_driver -driver-print-output-file-map -target x86_64-apple-macosx10.9 -emit-executable -emit-module -serialize-diagnostics %s %S/Inputs/main.swift %S/Inputs/lib.swift -g -o /build/advanced_output_file_map.out -emit-module-path /build/OutputFileMap.swiftmodule -module-name OutputFileMap -output-file-map %t.json 2>&1 | FileCheck %s -check-prefix=DUMPOFM -// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -emit-executable -emit-module -serialize-diagnostics -emit-dependencies %s %S/Inputs/main.swift %S/Inputs/lib.swift -g -o /build/advanced_output_file_map.out -emit-module-path /build/OutputFileMap.swiftmodule -module-name OutputFileMap -output-file-map %t.json 2>&1 | FileCheck %s -check-prefix=BINDINGS +// RUN: %swiftc_driver -driver-print-output-file-map -target x86_64-apple-macosx10.9 -emit-executable -emit-module -serialize-diagnostics %s %S/Inputs/main.swift %S/Inputs/lib.swift -g -o /build/advanced_output_file_map.out -emit-module-path /build/OutputFileMap.swiftmodule -module-name OutputFileMap -output-file-map %t.json 2>&1 | %FileCheck %s -check-prefix=DUMPOFM +// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -emit-executable -emit-module -serialize-diagnostics -emit-dependencies %s %S/Inputs/main.swift %S/Inputs/lib.swift -g -o /build/advanced_output_file_map.out -emit-module-path /build/OutputFileMap.swiftmodule -module-name OutputFileMap -output-file-map %t.json 2>&1 | %FileCheck %s -check-prefix=BINDINGS // DUMPOFM: {{.*}}/Inputs/lib.swift -> object: "/build/obj/lib.o" // DUMPOFM-NEXT: {{.*}}/Inputs/lib.swift -> dependencies: "/build/d/lib.d" diff --git a/test/Driver/assert.swift b/test/Driver/assert.swift index 95f78d5240084..704752277047c 100644 --- a/test/Driver/assert.swift +++ b/test/Driver/assert.swift @@ -1,5 +1,5 @@ -// RUN: not %swiftc_driver -emit-executable -o %t.exe %s -Xfrontend -debug-assert-immediately 2>&1 | FileCheck %s -// RUN: not %swiftc_driver -emit-executable -o %t.exe %s -Xfrontend -debug-assert-after-parse 2>&1 | FileCheck %s +// RUN: not %swiftc_driver -emit-executable -o %t.exe %s -Xfrontend -debug-assert-immediately 2>&1 | %FileCheck %s +// RUN: not %swiftc_driver -emit-executable -o %t.exe %s -Xfrontend -debug-assert-after-parse 2>&1 | %FileCheck %s // REQUIRES: asserts diff --git a/test/Driver/autolink_extract.swift b/test/Driver/autolink_extract.swift index 5c212a06cdf1d..0947102c6ae71 100644 --- a/test/Driver/autolink_extract.swift +++ b/test/Driver/autolink_extract.swift @@ -1,4 +1,4 @@ -// RUN: %target-swiftc_driver -### %s | FileCheck %s +// RUN: %target-swiftc_driver -### %s | %FileCheck %s // REQUIRES: autolink-extract diff --git a/test/Driver/basic_output_file_map.swift b/test/Driver/basic_output_file_map.swift index a7bbbde840814..c4f830c500d01 100644 --- a/test/Driver/basic_output_file_map.swift +++ b/test/Driver/basic_output_file_map.swift @@ -1,7 +1,7 @@ // RUN: echo "{\"%s\": {\"object\": \"/build/basic_output_file_map.o\"}, \"%S/Inputs/main.swift\": {\"object\": \"/build/main.o\"}, \"%S/Inputs/lib.swift\": {\"object\": \"/build/lib.o\"}}" > %t.json -// RUN: %swiftc_driver -driver-print-output-file-map -target x86_64-apple-macosx10.9 -emit-executable %s %S/Inputs/main.swift %S/Inputs/lib.swift -o /build/basic_output_file_map.out -module-name OutputFileMap -output-file-map %t.json 2>&1 | FileCheck %s -check-prefix=DUMPOFM -// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -emit-executable %s %S/Inputs/main.swift %S/Inputs/lib.swift -o /build/basic_output_file_map.out -module-name OutputFileMap -output-file-map %t.json 2>&1 | FileCheck %s -check-prefix=BINDINGS +// RUN: %swiftc_driver -driver-print-output-file-map -target x86_64-apple-macosx10.9 -emit-executable %s %S/Inputs/main.swift %S/Inputs/lib.swift -o /build/basic_output_file_map.out -module-name OutputFileMap -output-file-map %t.json 2>&1 | %FileCheck %s -check-prefix=DUMPOFM +// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -emit-executable %s %S/Inputs/main.swift %S/Inputs/lib.swift -o /build/basic_output_file_map.out -module-name OutputFileMap -output-file-map %t.json 2>&1 | %FileCheck %s -check-prefix=BINDINGS // DUMPOFM: {{.*}}/Inputs/lib.swift -> object: "/build/lib.o" // DUMPOFM: {{.*}}/Inputs/main.swift -> object: "/build/main.o" diff --git a/test/Driver/bindings.swift b/test/Driver/bindings.swift index ffade5c07044f..7d48ef15a1774 100644 --- a/test/Driver/bindings.swift +++ b/test/Driver/bindings.swift @@ -1,54 +1,54 @@ // RUN: mkdir -p %t -// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 %s 2>&1 | FileCheck %s -check-prefix=BASIC +// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 %s 2>&1 | %FileCheck %s -check-prefix=BASIC // BASIC: # "x86_64-apple-macosx10.9" - "swift", inputs: ["{{.*}}bindings.swift"], output: {object: "[[OBJECT:.*\.o]]"} // BASIC: # "x86_64-apple-macosx10.9" - "ld", inputs: ["[[OBJECT]]"], output: {image: "bindings"} -// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 - 2>&1 | FileCheck %s -check-prefix=STDIN +// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 - 2>&1 | %FileCheck %s -check-prefix=STDIN // STDIN: # "x86_64-apple-macosx10.9" - "swift", inputs: ["-"], output: {object: "[[OBJECT:.*\.o]]"} // STDIN: # "x86_64-apple-macosx10.9" - "ld", inputs: ["[[OBJECT]]"], output: {image: "main"} -// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 %S/Inputs/invalid-module-name.swift 2>&1 | FileCheck %s -check-prefix=INVALID-NAME-SINGLE-FILE +// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 %S/Inputs/invalid-module-name.swift 2>&1 | %FileCheck %s -check-prefix=INVALID-NAME-SINGLE-FILE // INVALID-NAME-SINGLE-FILE: # "x86_64-apple-macosx10.9" - "swift", inputs: ["{{.*}}/Inputs/invalid-module-name.swift"], output: {object: "[[OBJECT:.*\.o]]"} // INVALID-NAME-SINGLE-FILE: # "x86_64-apple-macosx10.9" - "ld", inputs: ["[[OBJECT]]"], output: {image: "invalid-module-name"} -// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -o NamedOutput %s 2>&1 | FileCheck %s -check-prefix=NAMEDIMG -// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -module-name NamedOutput %s 2>&1 | FileCheck %s -check-prefix=NAMEDIMG +// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -o NamedOutput %s 2>&1 | %FileCheck %s -check-prefix=NAMEDIMG +// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -module-name NamedOutput %s 2>&1 | %FileCheck %s -check-prefix=NAMEDIMG // NAMEDIMG: # "x86_64-apple-macosx10.9" - "swift", inputs: ["{{.*}}bindings.swift"], output: {object: "[[OBJECT:.*\.o]]"} // NAMEDIMG: # "x86_64-apple-macosx10.9" - "ld", inputs: ["[[OBJECT]]"], output: {image: "NamedOutput"} -// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -c %s 2>&1 | FileCheck %s -check-prefix=OBJ +// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -c %s 2>&1 | %FileCheck %s -check-prefix=OBJ // OBJ: # "x86_64-apple-macosx10.9" - "swift", inputs: ["{{.*}}bindings.swift"], output: {object: "bindings.o"} -// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -c %s -o /build/bindings.o 2>&1 | FileCheck %s -check-prefix=NAMEDOBJ +// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -c %s -o /build/bindings.o 2>&1 | %FileCheck %s -check-prefix=NAMEDOBJ // NAMEDOBJ: # "x86_64-apple-macosx10.9" - "swift", inputs: ["{{.*}}bindings.swift"], output: {object: "/build/bindings.o"} -// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -emit-sil %s 2>&1 | FileCheck %s -check-prefix=SIL +// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -emit-sil %s 2>&1 | %FileCheck %s -check-prefix=SIL // SIL: # "x86_64-apple-macosx10.9" - "swift", inputs: ["{{.*}}bindings.swift"], output: {sil: "-"} -// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -emit-ir %S/Inputs/empty.sil 2>&1 | FileCheck %s -check-prefix=SIL-INPUT +// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -emit-ir %S/Inputs/empty.sil 2>&1 | %FileCheck %s -check-prefix=SIL-INPUT // SIL-INPUT: # "x86_64-apple-macosx10.9" - "swift", inputs: ["{{.*}}empty.sil"], output: {llvm-ir: "-"} -// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -c -incremental %s 2>&1 | FileCheck %s -check-prefix=OBJ-AND-DEPS +// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -c -incremental %s 2>&1 | %FileCheck %s -check-prefix=OBJ-AND-DEPS // OBJ-AND-DEPS: # "x86_64-apple-macosx10.9" - "swift", inputs: ["{{.*}}bindings.swift"], output: { // OBJ-AND-DEPS-DAG: swift-dependencies: "bindings.swiftdeps" // OBJ-AND-DEPS-DAG: object: "bindings.o" // OBJ-AND-DEPS: } // RUN: echo '{"%s": {"object": "objroot/bindings.o"}}' > %t/map.json -// RUN: %swiftc_driver -driver-print-bindings -output-file-map %t/map.json -target x86_64-apple-macosx10.9 %s 2>&1 | FileCheck %s -check-prefix=MAP +// RUN: %swiftc_driver -driver-print-bindings -output-file-map %t/map.json -target x86_64-apple-macosx10.9 %s 2>&1 | %FileCheck %s -check-prefix=MAP // MAP: # "x86_64-apple-macosx10.9" - "swift", inputs: ["{{.*}}bindings.swift"], output: {object: "objroot/bindings.o"} // RUN: echo '{"": {"object": "objroot/bindings.o"}}' > %t/map.json -// RUN: %swiftc_driver -driver-print-bindings -output-file-map %t/map.json -whole-module-optimization -target x86_64-apple-macosx10.9 %s %S/Inputs/lib.swift 2>&1 | FileCheck %s -check-prefix=MAP-WFO +// RUN: %swiftc_driver -driver-print-bindings -output-file-map %t/map.json -whole-module-optimization -target x86_64-apple-macosx10.9 %s %S/Inputs/lib.swift 2>&1 | %FileCheck %s -check-prefix=MAP-WFO // MAP-WFO: # "x86_64-apple-macosx10.9" - "swift", inputs: ["{{.*}}bindings.swift", "{{.*}}lib.swift"], output: {object: "objroot/bindings.o"} // RUN: touch %t/a.o %t/b.o -// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 %t/a.o %t/b.o -o main 2>&1 | FileCheck %s -check-prefix=LINK-ONLY -// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -g %t/a.o %t/b.o -o main 2>&1 | FileCheck %s -check-prefix=LINK-ONLY +// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 %t/a.o %t/b.o -o main 2>&1 | %FileCheck %s -check-prefix=LINK-ONLY +// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -g %t/a.o %t/b.o -o main 2>&1 | %FileCheck %s -check-prefix=LINK-ONLY // LINK-ONLY: # "x86_64-apple-macosx10.9" - "ld", inputs: ["{{.*}}/a.o", "{{.*}}/b.o"], output: {image: "main"} // RUN: touch %t/a.swiftmodule %t/b.swiftmodule -// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -g %t/a.o %t/b.o %t/a.swiftmodule %t/b.swiftmodule -o main 2>&1 | FileCheck %s -check-prefix=DEBUG-LINK-ONLY +// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -g %t/a.o %t/b.o %t/a.swiftmodule %t/b.swiftmodule -o main 2>&1 | %FileCheck %s -check-prefix=DEBUG-LINK-ONLY // DEBUG-LINK-ONLY: # "x86_64-apple-macosx10.9" - "swift", inputs: ["{{.*}}/a.swiftmodule", "{{.*}}/b.swiftmodule"], output: {swiftmodule: "[[MERGED:.+\.swiftmodule]]", swiftdoc: "{{.+}}.swiftdoc"} // DEBUG-LINK-ONLY: # "x86_64-apple-macosx10.9" - "ld", inputs: ["{{.*}}/a.o", "{{.*}}/b.o", "[[MERGED]]"], output: {image: "main"} diff --git a/test/Driver/broken_output_file_map.swift b/test/Driver/broken_output_file_map.swift index 7e2c48d74f320..e1ffc0cb81c76 100644 --- a/test/Driver/broken_output_file_map.swift +++ b/test/Driver/broken_output_file_map.swift @@ -1,5 +1,5 @@ // RUN: echo "{\"%s\": {\"object\": \"/build/broken_output_file_map.o\", \"completely-bogus-type\": \"\"}}" > %t.json -// RUN: %swiftc_driver -driver-print-output-file-map -target x86_64-apple-macosx10.9 -emit-executable %s %S/Inputs/main.swift %S/Inputs/lib.swift -o /build/basic_output_file_map.out -module-name OutputFileMap -output-file-map %t.json 2>&1 | FileCheck %s +// RUN: %swiftc_driver -driver-print-output-file-map -target x86_64-apple-macosx10.9 -emit-executable %s %S/Inputs/main.swift %S/Inputs/lib.swift -o /build/basic_output_file_map.out -module-name OutputFileMap -output-file-map %t.json 2>&1 | %FileCheck %s // CHECK: {{.*}}/broken_output_file_map.swift -> object: "/build/broken_output_file_map.o" diff --git a/test/Driver/color-diagnostics.swift b/test/Driver/color-diagnostics.swift index 81f7ed1d72479..6a9b6ff35c507 100644 --- a/test/Driver/color-diagnostics.swift +++ b/test/Driver/color-diagnostics.swift @@ -1,4 +1,4 @@ -// RUN: not %target-swiftc_driver -Xfrontend -color-diagnostics -emit-executable -o %t %s 2>&1 | FileCheck %s +// RUN: not %target-swiftc_driver -Xfrontend -color-diagnostics -emit-executable -o %t %s 2>&1 | %FileCheck %s // CHECK: [0m1 = 2{{$}} 1 = 2 diff --git a/test/Driver/crash.swift b/test/Driver/crash.swift index 79ba1cecb82f6..8d271c028f4a4 100644 --- a/test/Driver/crash.swift +++ b/test/Driver/crash.swift @@ -1,6 +1,6 @@ -// RUN: not %swiftc_driver -emit-executable -o %t.exe %s -Xfrontend -debug-crash-immediately 2>&1 | FileCheck %s +// RUN: not %swiftc_driver -emit-executable -o %t.exe %s -Xfrontend -debug-crash-immediately 2>&1 | %FileCheck %s -// RUN: not %swiftc_driver -emit-executable -o %t.exe %s -Xfrontend -debug-crash-after-parse 2>&1 | FileCheck %s +// RUN: not %swiftc_driver -emit-executable -o %t.exe %s -Xfrontend -debug-crash-after-parse 2>&1 | %FileCheck %s // CHECK: error: compile command failed due to signal diff --git a/test/Driver/createCompilerInvocation.swift b/test/Driver/createCompilerInvocation.swift index 69ee6a2e95000..834aaec015b04 100644 --- a/test/Driver/createCompilerInvocation.swift +++ b/test/Driver/createCompilerInvocation.swift @@ -1,7 +1,7 @@ // RUN: %swift-ide-test_plain -test-createCompilerInvocation %s 2>&1 // RUN: %swift-ide-test_plain -test-createCompilerInvocation -emit-executable %s %S/Input/main.swift %S/Input/lib.swift -module-name createCompilerInvocation -emit-module -emit-objc-header -o %t.out 2>&1 // RUN: %swift-ide-test_plain -test-createCompilerInvocation -c %s %S/Input/main.swift %S/Input/lib.swift -module-name createCompilerInvocation -emit-module -emit-objc-header 2>&1 -// RUN: not %swift-ide-test_plain -test-createCompilerInvocation -parse %s -emit-module-path %t.swiftmodule 2>&1 | FileCheck --check-prefix=CHECK-FAIL %s -// RUN: not %swift-ide-test_plain -test-createCompilerInvocation -v 2>&1 | FileCheck --check-prefix=CHECK-FAIL %s +// RUN: not %swift-ide-test_plain -test-createCompilerInvocation -parse %s -emit-module-path %t.swiftmodule 2>&1 | %FileCheck --check-prefix=CHECK-FAIL %s +// RUN: not %swift-ide-test_plain -test-createCompilerInvocation -v 2>&1 | %FileCheck --check-prefix=CHECK-FAIL %s // CHECK-FAIL: error: unable to create a CompilerInvocation diff --git a/test/Driver/debug-output.swift b/test/Driver/debug-output.swift index c4afc6ddb41a8..4d8cc42f55063 100644 --- a/test/Driver/debug-output.swift +++ b/test/Driver/debug-output.swift @@ -1,6 +1,6 @@ // REQUIRES: asserts -// RUN: %target-swift-frontend -emit-ir %S/Inputs/single_int.swift -o /dev/null -print-stats 2>&1 | FileCheck %s -check-prefix=STATS +// RUN: %target-swift-frontend -emit-ir %S/Inputs/single_int.swift -o /dev/null -print-stats 2>&1 | %FileCheck %s -check-prefix=STATS // STATS: Statistics Collected // Only print statistics once // STATS-NOT: Statistics Collected diff --git a/test/Driver/driver-compile.swift b/test/Driver/driver-compile.swift index 5e41897c79a03..5a91718ce8d0f 100644 --- a/test/Driver/driver-compile.swift +++ b/test/Driver/driver-compile.swift @@ -1,60 +1,60 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s 2>&1 > %t.simple.txt -// RUN: FileCheck %s < %t.simple.txt +// RUN: %FileCheck %s < %t.simple.txt // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -sdk %S/../Inputs/clang-importer-sdk -Xfrontend -foo -Xfrontend -bar -Xllvm -baz -Xcc -garply -F /path/to/frameworks -F /path/to/more/frameworks -I /path/to/headers -I path/to/more/headers -module-cache-path /tmp/modules -incremental 2>&1 > %t.complex.txt -// RUN: FileCheck %s < %t.complex.txt -// RUN: FileCheck -check-prefix COMPLEX %s < %t.complex.txt +// RUN: %FileCheck %s < %t.complex.txt +// RUN: %FileCheck -check-prefix COMPLEX %s < %t.complex.txt // RUN: %swiftc_driver -driver-print-jobs -emit-silgen -target x86_64-apple-macosx10.9 %s 2>&1 > %t.silgen.txt -// RUN: FileCheck %s < %t.silgen.txt -// RUN: FileCheck -check-prefix SILGEN %s < %t.silgen.txt +// RUN: %FileCheck %s < %t.silgen.txt +// RUN: %FileCheck -check-prefix SILGEN %s < %t.silgen.txt // RUN: %swiftc_driver -driver-print-jobs -emit-sil -target x86_64-apple-macosx10.9 %s 2>&1 > %t.sil.txt -// RUN: FileCheck %s < %t.sil.txt -// RUN: FileCheck -check-prefix SIL %s < %t.sil.txt +// RUN: %FileCheck %s < %t.sil.txt +// RUN: %FileCheck -check-prefix SIL %s < %t.sil.txt // RUN: %swiftc_driver -driver-print-jobs -emit-ir -target x86_64-apple-macosx10.9 %s 2>&1 > %t.ir.txt -// RUN: FileCheck %s < %t.ir.txt -// RUN: FileCheck -check-prefix IR %s < %t.ir.txt +// RUN: %FileCheck %s < %t.ir.txt +// RUN: %FileCheck -check-prefix IR %s < %t.ir.txt // RUN: %swiftc_driver -driver-print-jobs -emit-bc -target x86_64-apple-macosx10.9 %s 2>&1 > %t.bc.txt -// RUN: FileCheck %s < %t.bc.txt -// RUN: FileCheck -check-prefix BC %s < %t.bc.txt +// RUN: %FileCheck %s < %t.bc.txt +// RUN: %FileCheck -check-prefix BC %s < %t.bc.txt // RUN: %swiftc_driver -driver-print-jobs -S -target x86_64-apple-macosx10.9 %s 2>&1 > %t.s.txt -// RUN: FileCheck %s < %t.s.txt -// RUN: FileCheck -check-prefix ASM %s < %t.s.txt +// RUN: %FileCheck %s < %t.s.txt +// RUN: %FileCheck -check-prefix ASM %s < %t.s.txt // RUN: %swiftc_driver -driver-print-jobs -c -target x86_64-apple-macosx10.9 %s 2>&1 > %t.c.txt -// RUN: FileCheck %s < %t.c.txt -// RUN: FileCheck -check-prefix OBJ %s < %t.c.txt +// RUN: %FileCheck %s < %t.c.txt +// RUN: %FileCheck -check-prefix OBJ %s < %t.c.txt -// RUN: not %swiftc_driver -driver-print-jobs -c -target x86_64-apple-macosx10.9 %s %s 2>&1 | FileCheck -check-prefix DUPLICATE-NAME %s +// RUN: not %swiftc_driver -driver-print-jobs -c -target x86_64-apple-macosx10.9 %s %s 2>&1 | %FileCheck -check-prefix DUPLICATE-NAME %s // RUN: cp %s %t -// RUN: not %swiftc_driver -driver-print-jobs -c -target x86_64-apple-macosx10.9 %s %t/driver-compile.swift 2>&1 | FileCheck -check-prefix DUPLICATE-NAME %s +// RUN: not %swiftc_driver -driver-print-jobs -c -target x86_64-apple-macosx10.9 %s %t/driver-compile.swift 2>&1 | %FileCheck -check-prefix DUPLICATE-NAME %s -// RUN: %swiftc_driver -driver-print-jobs -c -target x86_64-apple-macosx10.9 %s %S/../Inputs/empty.swift -module-name main -driver-use-filelists 2>&1 | FileCheck -check-prefix=FILELIST %s +// RUN: %swiftc_driver -driver-print-jobs -c -target x86_64-apple-macosx10.9 %s %S/../Inputs/empty.swift -module-name main -driver-use-filelists 2>&1 | %FileCheck -check-prefix=FILELIST %s // RUN: rm -rf %t && mkdir -p %t/DISTINCTIVE-PATH/usr/bin/ // RUN: ln %swift_driver_plain %t/DISTINCTIVE-PATH/usr/bin/swiftc // RUN: ln -s "swiftc" %t/DISTINCTIVE-PATH/usr/bin/swift-update // RUN: %t/DISTINCTIVE-PATH/usr/bin/swiftc -driver-print-jobs -update-code -c -target x86_64-apple-macosx10.9 -emit-module -emit-module-path %t.mod %s 2>&1 > %t.upd.txt -// RUN: FileCheck -check-prefix UPDATE-CODE %s < %t.upd.txt +// RUN: %FileCheck -check-prefix UPDATE-CODE %s < %t.upd.txt // Clean up the test executable because hard links are expensive. // RUN: rm -rf %t/DISTINCTIVE-PATH/usr/bin/swiftc // RUN: %swiftc_driver -driver-print-jobs -fixit-code -c -target x86_64-apple-macosx10.9 -emit-module -emit-module-path %t.mod %s 2>&1 > %t.upd.txt -// RUN: FileCheck -check-prefix FIXIT-CODE %s < %t.upd.txt +// RUN: %FileCheck -check-prefix FIXIT-CODE %s < %t.upd.txt // RUN: %swiftc_driver -driver-print-jobs -whole-module-optimization -incremental %s 2>&1 > %t.wmo-inc.txt -// RUN: FileCheck %s < %t.wmo-inc.txt -// RUN: FileCheck -check-prefix NO-REFERENCE-DEPENDENCIES %s < %t.wmo-inc.txt +// RUN: %FileCheck %s < %t.wmo-inc.txt +// RUN: %FileCheck -check-prefix NO-REFERENCE-DEPENDENCIES %s < %t.wmo-inc.txt // RUN: %swiftc_driver -driver-print-jobs -embed-bitcode -incremental %s 2>&1 > %t.embed-inc.txt -// RUN: FileCheck %s < %t.embed-inc.txt -// RUN: FileCheck -check-prefix NO-REFERENCE-DEPENDENCIES %s < %t.embed-inc.txt +// RUN: %FileCheck %s < %t.embed-inc.txt +// RUN: %FileCheck -check-prefix NO-REFERENCE-DEPENDENCIES %s < %t.embed-inc.txt // REQUIRES: X86 diff --git a/test/Driver/driver-use-frontend.swift b/test/Driver/driver-use-frontend.swift index 719bbbf5e892b..6cae4bc652bf9 100644 --- a/test/Driver/driver-use-frontend.swift +++ b/test/Driver/driver-use-frontend.swift @@ -1,2 +1,2 @@ -// RUN: %swift_driver_plain -driver-use-frontend-path bin/completely-fake-driver -driver-print-jobs %s 2>&1 | FileCheck %s +// RUN: %swift_driver_plain -driver-use-frontend-path bin/completely-fake-driver -driver-print-jobs %s 2>&1 | %FileCheck %s // CHECK: {{^}}bin/completely-fake-driver -frontend diff --git a/test/Driver/driver_mode.swift b/test/Driver/driver_mode.swift index 2b58e90ab0602..d455159753c9f 100644 --- a/test/Driver/driver_mode.swift +++ b/test/Driver/driver_mode.swift @@ -1,5 +1,5 @@ -// RUN: %swift_driver_plain --driver-mode=swiftc -driver-print-actions %s 2>&1 | FileCheck -check-prefix=CHECK-SWIFTC-%target-object-format %s -// RUN: %swift_driver_plain -driver-print-actions %s --driver-mode=swiftc 2>&1 | FileCheck -check-prefix=CHECK-SWIFT %s +// RUN: %swift_driver_plain --driver-mode=swiftc -driver-print-actions %s 2>&1 | %FileCheck -check-prefix=CHECK-SWIFTC-%target-object-format %s +// RUN: %swift_driver_plain -driver-print-actions %s --driver-mode=swiftc 2>&1 | %FileCheck -check-prefix=CHECK-SWIFT %s // CHECK-SWIFTC-macho: 0: input, "{{.*}}driver_mode.swift", swift // CHECK-SWIFTC-macho: 1: compile, {0}, object diff --git a/test/Driver/dump-parse.swift b/test/Driver/dump-parse.swift index ca89c8c9f57bb..49ab9b3c20caa 100644 --- a/test/Driver/dump-parse.swift +++ b/test/Driver/dump-parse.swift @@ -1,5 +1,5 @@ -// RUN: not %target-swift-frontend -dump-parse %s 2>&1 | FileCheck %s -// RUN: not %target-swift-frontend -dump-ast %s 2>&1 | FileCheck %s -check-prefix=CHECK-AST +// RUN: not %target-swift-frontend -dump-parse %s 2>&1 | %FileCheck %s +// RUN: not %target-swift-frontend -dump-ast %s 2>&1 | %FileCheck %s -check-prefix=CHECK-AST // CHECK-LABEL: (func_decl "foo(_:)" // CHECK-AST-LABEL: (func_decl "foo(_:)" diff --git a/test/Driver/embed-bitcode.swift b/test/Driver/embed-bitcode.swift index 39e0f4f5d2cbe..946c91b026d87 100644 --- a/test/Driver/embed-bitcode.swift +++ b/test/Driver/embed-bitcode.swift @@ -1,4 +1,4 @@ -// RUN: %target-swiftc_driver -driver-print-bindings -embed-bitcode %s 2>&1 | FileCheck -check-prefix=CHECK-%target-object-format %s +// RUN: %target-swiftc_driver -driver-print-bindings -embed-bitcode %s 2>&1 | %FileCheck -check-prefix=CHECK-%target-object-format %s // CHECK-macho: "swift", inputs: ["{{.*}}embed-bitcode.swift"], output: {llvm-bc: "[[BC:.*\.bc]]"} // CHECK-macho: "swift", inputs: ["[[BC]]"], output: {object: "[[OBJECT:.*\.o]]"} // CHECK-macho: "ld", inputs: ["[[OBJECT]]"], output: {image: "embed-bitcode"} @@ -8,7 +8,7 @@ // CHECK-elf: "swift-autolink-extract", inputs: ["[[OBJECT]]"], output: {autolink: "[[AUTOLINK:.*\.autolink]]"} // CHECK-elf: "clang++", inputs: ["[[OBJECT]]", "[[AUTOLINK]]"], output: {image: "main"} -// RUN: %target-swiftc_driver -embed-bitcode %s 2>&1 -### | FileCheck %s -check-prefix=CHECK-FRONT -check-prefix=CHECK-FRONT-%target-object-format +// RUN: %target-swiftc_driver -embed-bitcode %s 2>&1 -### | %FileCheck %s -check-prefix=CHECK-FRONT -check-prefix=CHECK-FRONT-%target-object-format // CHECK-FRONT: -frontend // CHECK-FRONT: -emit-bc // CHECK-FRONT: -frontend @@ -18,7 +18,7 @@ // CHECK-FRONT-macho: ld{{"? }} // CHECK-FRONT-macho: -bitcode_bundle -// RUN: %target-swiftc_driver -embed-bitcode-marker %s 2>&1 -### | FileCheck %s -check-prefix=CHECK-MARKER -check-prefix=CHECK-MARKER-%target-object-format +// RUN: %target-swiftc_driver -embed-bitcode-marker %s 2>&1 -### | %FileCheck %s -check-prefix=CHECK-MARKER -check-prefix=CHECK-MARKER-%target-object-format // CHECK-MARKER: -frontend // CHECK-MARKER: -c // CHECK-MARKER: -embed-bitcode-marker @@ -26,7 +26,7 @@ // CHECK-MARKER-macho: ld{{"? }} // CHECK-MARKER-macho: -bitcode_bundle -// RUN: %target-swiftc_driver -embed-bitcode -Xcc -DDEBUG -Xllvm -fake-llvm-option -c -emit-module %s 2>&1 -### | FileCheck %s -check-prefix=CHECK-MODULE +// RUN: %target-swiftc_driver -embed-bitcode -Xcc -DDEBUG -Xllvm -fake-llvm-option -c -emit-module %s 2>&1 -### | %FileCheck %s -check-prefix=CHECK-MODULE // CHECK-MODULE: -frontend // CHECK-MODULE: -emit-bc // CHECK-MODULE-DAG: -Xcc -DDEBUG @@ -41,7 +41,7 @@ // CHECK-MODULE-NOT: -fake-llvm-option // CHECK-MODULE-NOT: -emit-module-path -// RUN: %target-swiftc_driver -embed-bitcode -force-single-frontend-invocation %s 2>&1 -### | FileCheck %s -check-prefix=CHECK-SINGLE +// RUN: %target-swiftc_driver -embed-bitcode -force-single-frontend-invocation %s 2>&1 -### | %FileCheck %s -check-prefix=CHECK-SINGLE // CHECK-SINGLE: -frontend // CHECK-SINGLE: -emit-bc // CHECK-SINGLE: -frontend @@ -49,7 +49,7 @@ // CHECK-SINGLE: -embed-bitcode // CHECK-SINGLE: -disable-llvm-optzns -// RUN: %target-swiftc_driver -embed-bitcode -c -parse-as-library -emit-module -force-single-frontend-invocation %s -parse-stdlib -module-name Swift 2>&1 -### | FileCheck %s -check-prefix=CHECK-LIB-WMO +// RUN: %target-swiftc_driver -embed-bitcode -c -parse-as-library -emit-module -force-single-frontend-invocation %s -parse-stdlib -module-name Swift 2>&1 -### | %FileCheck %s -check-prefix=CHECK-LIB-WMO // CHECK-LIB-WMO: -frontend // CHECK-LIB-WMO: -emit-bc // CHECK-LIB-WMO: -parse-stdlib @@ -59,7 +59,7 @@ // CHECK-LIB-WMO: -embed-bitcode // CHECK-LIB-WMO: -disable-llvm-optzns -// RUN: %target-swiftc_driver -embed-bitcode -c -parse-as-library -emit-module %s %S/../Inputs/empty.swift -module-name ABC 2>&1 -### | FileCheck %s -check-prefix=CHECK-LIB +// RUN: %target-swiftc_driver -embed-bitcode -c -parse-as-library -emit-module %s %S/../Inputs/empty.swift -module-name ABC 2>&1 -### | %FileCheck %s -check-prefix=CHECK-LIB // CHECK-LIB: swift -frontend // CHECK-LIB: -emit-bc // CHECK-LIB: -primary-file diff --git a/test/Driver/emit-sib-single-file.swift b/test/Driver/emit-sib-single-file.swift index a7a74292b72ea..ad844961584ed 100644 --- a/test/Driver/emit-sib-single-file.swift +++ b/test/Driver/emit-sib-single-file.swift @@ -1,18 +1,18 @@ // RUN: %target-build-swift -Onone -emit-sib %s -o %t.sib // RUN: %target-build-swift %t.sib -o %t -// RUN: %target-run %t | FileCheck %s +// RUN: %target-run %t | %FileCheck %s // RUN: %target-build-swift -Onone -c %t.sib -o %t.o // RUN: %target-build-swift %t.o -o %t -// RUN: %target-run %t | FileCheck %s +// RUN: %target-run %t | %FileCheck %s // RUN: %target-build-swift -Onone -emit-sibgen %s -o %t.sib // RUN: %target-build-swift %t.sib -o %t -// RUN: %target-run %t | FileCheck %s +// RUN: %target-run %t | %FileCheck %s // RUN: %target-build-swift -Onone -c %t.sib -o %t.o // RUN: %target-build-swift %t.o -o %t -// RUN: %target-run %t | FileCheck %s +// RUN: %target-run %t | %FileCheck %s // REQUIRES: executable_test // CHECK: Hello World diff --git a/test/Driver/environment.swift b/test/Driver/environment.swift index dc712af336ccc..90a6cbde4899f 100644 --- a/test/Driver/environment.swift +++ b/test/Driver/environment.swift @@ -1,7 +1,7 @@ // UNSUPPORTED: objc_interop // Apple's "System Integrity Protection" makes this test fail on OS X. -// RUN: %swift_driver -target x86_64-unknown-gnu-linux -L/foo/ -driver-use-frontend-path %S/Inputs/print-var.sh %s LD_LIBRARY_PATH | FileCheck -check-prefix=CHECK${LD_LIBRARY_PATH+_LAX} %s +// RUN: %swift_driver -target x86_64-unknown-gnu-linux -L/foo/ -driver-use-frontend-path %S/Inputs/print-var.sh %s LD_LIBRARY_PATH | %FileCheck -check-prefix=CHECK${LD_LIBRARY_PATH+_LAX} %s // CHECK: {{^/foo/:[^:]+/lib/swift/linux$}} // CHECK_LAX: {{^/foo/:[^:]+/lib/swift/linux}} diff --git a/test/Driver/filelists.swift b/test/Driver/filelists.swift index 0f5aab6433f6c..57cf521b2bd8b 100644 --- a/test/Driver/filelists.swift +++ b/test/Driver/filelists.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir %t // RUN: touch %t/a.swift %t/b.swift %t/c.swift -// RUN: (cd %t && %swiftc_driver_plain -driver-use-frontend-path %S/Inputs/filelists/check-filelist-abc.py -emit-module ./a.swift ./b.swift ./c.swift -module-name main -target x86_64-apple-macosx10.9 -driver-use-filelists -output-file-map=%S/Inputs/filelists/output.json 2>&1 | FileCheck %s) +// RUN: (cd %t && %swiftc_driver_plain -driver-use-frontend-path %S/Inputs/filelists/check-filelist-abc.py -emit-module ./a.swift ./b.swift ./c.swift -module-name main -target x86_64-apple-macosx10.9 -driver-use-filelists -output-file-map=%S/Inputs/filelists/output.json 2>&1 | %FileCheck %s) // CHECK-NOT: Handled // CHECK: Handled a.swift @@ -10,7 +10,7 @@ // CHECK-NEXT: Handled modules // CHECK-NOT: Handled -// RUN: %swiftc_driver_plain -driver-use-frontend-path %S/Inputs/filelists/check-filelist-abc.py -c %t/a.swift %t/b.swift %t/c.swift -module-name main -target x86_64-apple-macosx10.9 -driver-use-filelists -force-single-frontend-invocation 2>&1 | FileCheck -check-prefix=CHECK-WMO %s +// RUN: %swiftc_driver_plain -driver-use-frontend-path %S/Inputs/filelists/check-filelist-abc.py -c %t/a.swift %t/b.swift %t/c.swift -module-name main -target x86_64-apple-macosx10.9 -driver-use-filelists -force-single-frontend-invocation 2>&1 | %FileCheck -check-prefix=CHECK-WMO %s // CHECK-WMO-NOT: Handled // CHECK-WMO: Handled all @@ -21,10 +21,10 @@ // RUN: mkdir %t/bin // RUN: ln -s %S/Inputs/filelists/fake-ld.py %t/bin/ld -// RUN: (cd %t && %swiftc_driver_plain -driver-use-frontend-path %S/Inputs/filelists/check-filelist-abc.py -c ./a.swift ./b.swift ./c.swift -module-name main -target x86_64-apple-macosx10.9 -driver-use-filelists -output-file-map=%S/Inputs/filelists/output.json -force-single-frontend-invocation -num-threads 1 2>&1 | FileCheck -check-prefix=CHECK-WMO-THREADED %s) -// RUN: (cd %t && %swiftc_driver_plain -driver-use-frontend-path %S/Inputs/filelists/check-filelist-abc.py -c ./a.swift ./b.swift ./c.swift -module-name main -target x86_64-apple-macosx10.9 -driver-use-filelists -output-file-map=%S/Inputs/filelists/output.json -force-single-frontend-invocation -num-threads 1 -embed-bitcode 2>&1 | FileCheck -check-prefix=CHECK-WMO-THREADED %s) +// RUN: (cd %t && %swiftc_driver_plain -driver-use-frontend-path %S/Inputs/filelists/check-filelist-abc.py -c ./a.swift ./b.swift ./c.swift -module-name main -target x86_64-apple-macosx10.9 -driver-use-filelists -output-file-map=%S/Inputs/filelists/output.json -force-single-frontend-invocation -num-threads 1 2>&1 | %FileCheck -check-prefix=CHECK-WMO-THREADED %s) +// RUN: (cd %t && %swiftc_driver_plain -driver-use-frontend-path %S/Inputs/filelists/check-filelist-abc.py -c ./a.swift ./b.swift ./c.swift -module-name main -target x86_64-apple-macosx10.9 -driver-use-filelists -output-file-map=%S/Inputs/filelists/output.json -force-single-frontend-invocation -num-threads 1 -embed-bitcode 2>&1 | %FileCheck -check-prefix=CHECK-WMO-THREADED %s) // RUN: mkdir %t/tmp/ -// RUN: (cd %t && env TMPDIR="%t/tmp/" %swiftc_driver_plain -driver-use-frontend-path %S/Inputs/filelists/check-filelist-abc.py -c ./a.swift ./b.swift ./c.swift -module-name main -target x86_64-apple-macosx10.9 -driver-use-filelists -output-file-map=%S/Inputs/filelists/output.json -force-single-frontend-invocation -num-threads 1 -save-temps 2>&1 | FileCheck -check-prefix=CHECK-WMO-THREADED %s) +// RUN: (cd %t && env TMPDIR="%t/tmp/" %swiftc_driver_plain -driver-use-frontend-path %S/Inputs/filelists/check-filelist-abc.py -c ./a.swift ./b.swift ./c.swift -module-name main -target x86_64-apple-macosx10.9 -driver-use-filelists -output-file-map=%S/Inputs/filelists/output.json -force-single-frontend-invocation -num-threads 1 -save-temps 2>&1 | %FileCheck -check-prefix=CHECK-WMO-THREADED %s) // RUN: ls %t/tmp/sources-* %t/tmp/outputs-* // CHECK-WMO-THREADED-NOT: Handled @@ -33,8 +33,8 @@ // CHECK-WMO-THREADED-NOT: Handled -// RUN: (cd %t && env PATH=%t/bin/:$PATH %swiftc_driver_plain -driver-use-frontend-path %S/Inputs/filelists/check-filelist-abc.py -emit-library ./a.swift ./b.swift ./c.swift -module-name main -target x86_64-apple-macosx10.9 -driver-use-filelists -output-file-map=%S/Inputs/filelists/output.json 2>&1 | FileCheck -check-prefix=CHECK-LINK %s) -// RUN: (cd %t && env PATH=%t/bin/:$PATH %swiftc_driver_plain -driver-use-frontend-path %S/Inputs/filelists/check-filelist-abc.py -emit-library ./a.swift ./b.swift ./c.swift -module-name main -target x86_64-apple-macosx10.9 -driver-use-filelists -output-file-map=%S/Inputs/filelists/output.json -force-single-frontend-invocation -num-threads 1 2>&1 | FileCheck -check-prefix=CHECK-LINK %s) +// RUN: (cd %t && env PATH=%t/bin/:$PATH %swiftc_driver_plain -driver-use-frontend-path %S/Inputs/filelists/check-filelist-abc.py -emit-library ./a.swift ./b.swift ./c.swift -module-name main -target x86_64-apple-macosx10.9 -driver-use-filelists -output-file-map=%S/Inputs/filelists/output.json 2>&1 | %FileCheck -check-prefix=CHECK-LINK %s) +// RUN: (cd %t && env PATH=%t/bin/:$PATH %swiftc_driver_plain -driver-use-frontend-path %S/Inputs/filelists/check-filelist-abc.py -emit-library ./a.swift ./b.swift ./c.swift -module-name main -target x86_64-apple-macosx10.9 -driver-use-filelists -output-file-map=%S/Inputs/filelists/output.json -force-single-frontend-invocation -num-threads 1 2>&1 | %FileCheck -check-prefix=CHECK-LINK %s) // CHECK-LINK: Handled link diff --git a/test/Driver/linker-autolink-extract.swift b/test/Driver/linker-autolink-extract.swift index 19f7843e65deb..e7a6eaecbe294 100644 --- a/test/Driver/linker-autolink-extract.swift +++ b/test/Driver/linker-autolink-extract.swift @@ -1,4 +1,4 @@ -// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-linux-gnu -g %s | FileCheck -check-prefix DEBUG_LINUX %s +// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-linux-gnu -g %s | %FileCheck -check-prefix DEBUG_LINUX %s // REQUIRES: autolink-extract diff --git a/test/Driver/linker.swift b/test/Driver/linker.swift index 70192c64e13c3..a2335062f7d8f 100644 --- a/test/Driver/linker.swift +++ b/test/Driver/linker.swift @@ -1,60 +1,60 @@ // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s 2>&1 > %t.simple.txt -// RUN: FileCheck %s < %t.simple.txt -// RUN: FileCheck -check-prefix SIMPLE %s < %t.simple.txt +// RUN: %FileCheck %s < %t.simple.txt +// RUN: %FileCheck -check-prefix SIMPLE %s < %t.simple.txt // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-ios7.1 %s 2>&1 > %t.simple.txt -// RUN: FileCheck -check-prefix IOS_SIMPLE %s < %t.simple.txt +// RUN: %FileCheck -check-prefix IOS_SIMPLE %s < %t.simple.txt // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-tvos9.0 %s 2>&1 > %t.simple.txt -// RUN: FileCheck -check-prefix tvOS_SIMPLE %s < %t.simple.txt +// RUN: %FileCheck -check-prefix tvOS_SIMPLE %s < %t.simple.txt // RUN: %swiftc_driver -driver-print-jobs -target i386-apple-watchos2.0 %s 2>&1 > %t.simple.txt -// RUN: FileCheck -check-prefix watchOS_SIMPLE %s < %t.simple.txt +// RUN: %FileCheck -check-prefix watchOS_SIMPLE %s < %t.simple.txt // RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-linux-gnu -Ffoo -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.linux.txt -// RUN: FileCheck -check-prefix LINUX-x86_64 %s < %t.linux.txt +// RUN: %FileCheck -check-prefix LINUX-x86_64 %s < %t.linux.txt // RUN: %swiftc_driver -driver-print-jobs -target armv6-unknown-linux-gnueabihf -Ffoo -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.linux.txt -// RUN: FileCheck -check-prefix LINUX-armv6 %s < %t.linux.txt +// RUN: %FileCheck -check-prefix LINUX-armv6 %s < %t.linux.txt // RUN: %swiftc_driver -driver-print-jobs -target armv7-unknown-linux-gnueabihf -Ffoo -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.linux.txt -// RUN: FileCheck -check-prefix LINUX-armv7 %s < %t.linux.txt +// RUN: %FileCheck -check-prefix LINUX-armv7 %s < %t.linux.txt // RUN: %swiftc_driver -driver-print-jobs -target thumbv7-unknown-linux-gnueabihf -Ffoo -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.linux.txt -// RUN: FileCheck -check-prefix LINUX-thumbv7 %s < %t.linux.txt +// RUN: %FileCheck -check-prefix LINUX-thumbv7 %s < %t.linux.txt // RUN: %swiftc_driver -driver-print-jobs -target armv7-none-linux-androideabi -Ffoo -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.android.txt -// RUN: FileCheck -check-prefix ANDROID-armv7 %s < %t.android.txt -// RUN: FileCheck -check-prefix ANDROID-armv7-NEGATIVE %s < %t.android.txt +// RUN: %FileCheck -check-prefix ANDROID-armv7 %s < %t.android.txt +// RUN: %FileCheck -check-prefix ANDROID-armv7-NEGATIVE %s < %t.android.txt // RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-windows-cygnus -Ffoo -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.cygwin.txt -// RUN: FileCheck -check-prefix CYGWIN-x86_64 %s < %t.cygwin.txt +// RUN: %FileCheck -check-prefix CYGWIN-x86_64 %s < %t.cygwin.txt // RUN: %swiftc_driver -driver-print-jobs -emit-library -target x86_64-apple-macosx10.9.1 %s -sdk %S/../Inputs/clang-importer-sdk -lfoo -framework bar -Lbaz -Fgarply -Xlinker -undefined -Xlinker dynamic_lookup -o sdk.out 2>&1 > %t.complex.txt -// RUN: FileCheck %s < %t.complex.txt -// RUN: FileCheck -check-prefix COMPLEX %s < %t.complex.txt +// RUN: %FileCheck %s < %t.complex.txt +// RUN: %FileCheck -check-prefix COMPLEX %s < %t.complex.txt -// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -g %s | FileCheck -check-prefix DEBUG %s +// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -g %s | %FileCheck -check-prefix DEBUG %s // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.10 %s > %t.simple-macosx10.10.txt -// RUN: FileCheck %s < %t.simple-macosx10.10.txt -// RUN: FileCheck -check-prefix SIMPLE %s < %t.simple-macosx10.10.txt +// RUN: %FileCheck %s < %t.simple-macosx10.10.txt +// RUN: %FileCheck -check-prefix SIMPLE %s < %t.simple-macosx10.10.txt // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-ios8.0 %s > %t.simple-ios8.txt -// RUN: FileCheck -check-prefix IOS_ARCLITE %s < %t.simple-ios8.txt +// RUN: %FileCheck -check-prefix IOS_ARCLITE %s < %t.simple-ios8.txt -// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.11 %s | FileCheck -check-prefix NO_ARCLITE %s -// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-ios9.0 %s | FileCheck -check-prefix NO_ARCLITE %s -// RUN: %swiftc_driver -driver-print-jobs -target arm64-apple-tvos9.0 %s | FileCheck -check-prefix NO_ARCLITE %s -// RUN: %swiftc_driver -driver-print-jobs -target armv7k-apple-watchos2.0 %s | FileCheck -check-prefix NO_ARCLITE %s +// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.11 %s | %FileCheck -check-prefix NO_ARCLITE %s +// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-ios9.0 %s | %FileCheck -check-prefix NO_ARCLITE %s +// RUN: %swiftc_driver -driver-print-jobs -target arm64-apple-tvos9.0 %s | %FileCheck -check-prefix NO_ARCLITE %s +// RUN: %swiftc_driver -driver-print-jobs -target armv7k-apple-watchos2.0 %s | %FileCheck -check-prefix NO_ARCLITE %s // RUN: rm -rf %t && mkdir %t // RUN: touch %t/a.o -// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s %t/a.o -o linker 2>&1 | FileCheck -check-prefix COMPILE_AND_LINK %s -// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s %t/a.o -driver-use-filelists -o linker 2>&1 | FileCheck -check-prefix FILELIST %s +// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s %t/a.o -o linker 2>&1 | %FileCheck -check-prefix COMPILE_AND_LINK %s +// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s %t/a.o -driver-use-filelists -o linker 2>&1 | %FileCheck -check-prefix FILELIST %s -// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -emit-library %s -module-name LINKER | FileCheck -check-prefix INFERRED_NAME %s -// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -emit-library %s -o libLINKER.dylib | FileCheck -check-prefix INFERRED_NAME %s +// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -emit-library %s -module-name LINKER | %FileCheck -check-prefix INFERRED_NAME %s +// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -emit-library %s -o libLINKER.dylib | %FileCheck -check-prefix INFERRED_NAME %s // There are more RUN lines further down in the file. @@ -279,7 +279,7 @@ // RUN: touch %t/DISTINCTIVE-PATH/usr/bin/ld // RUN: chmod +x %t/DISTINCTIVE-PATH/usr/bin/ld // RUN: ln %swift_driver_plain %t/DISTINCTIVE-PATH/usr/bin/swiftc -// RUN: %t/DISTINCTIVE-PATH/usr/bin/swiftc %s -### | FileCheck -check-prefix=RELATIVE-LINKER %s +// RUN: %t/DISTINCTIVE-PATH/usr/bin/swiftc %s -### | %FileCheck -check-prefix=RELATIVE-LINKER %s // RELATIVE-LINKER: /DISTINCTIVE-PATH/usr/bin/swift // RELATIVE-LINKER: /DISTINCTIVE-PATH/usr/bin/ld @@ -292,7 +292,7 @@ // RUN: mkdir -p %t/ANOTHER-DISTINCTIVE-PATH/usr/lib/arc // RUN: cp %S/Inputs/xcrun-return-self.sh %t/ANOTHER-DISTINCTIVE-PATH/usr/bin/xcrun -// RUN: env PATH=%t/ANOTHER-DISTINCTIVE-PATH/usr/bin %t/DISTINCTIVE-PATH/usr/bin/swiftc -target x86_64-apple-macosx10.9 %s -### | FileCheck -check-prefix=XCRUN_ARCLITE %s +// RUN: env PATH=%t/ANOTHER-DISTINCTIVE-PATH/usr/bin %t/DISTINCTIVE-PATH/usr/bin/swiftc -target x86_64-apple-macosx10.9 %s -### | %FileCheck -check-prefix=XCRUN_ARCLITE %s // XCRUN_ARCLITE: bin/ld{{"? }} // XCRUN_ARCLITE: /ANOTHER-DISTINCTIVE-PATH/usr/lib/arc/libarclite_macosx.a @@ -300,7 +300,7 @@ // RUN: mkdir -p %t/DISTINCTIVE-PATH/usr/lib/arc -// RUN: env PATH=%t/ANOTHER-DISTINCTIVE-PATH/usr/bin %t/DISTINCTIVE-PATH/usr/bin/swiftc -target x86_64-apple-macosx10.9 %s -### | FileCheck -check-prefix=RELATIVE_ARCLITE %s +// RUN: env PATH=%t/ANOTHER-DISTINCTIVE-PATH/usr/bin %t/DISTINCTIVE-PATH/usr/bin/swiftc -target x86_64-apple-macosx10.9 %s -### | %FileCheck -check-prefix=RELATIVE_ARCLITE %s // RELATIVE_ARCLITE: bin/ld{{"? }} // RELATIVE_ARCLITE: /DISTINCTIVE-PATH/usr/lib/arc/libarclite_macosx.a diff --git a/test/Driver/merge-module.swift b/test/Driver/merge-module.swift index 2b806f1024c9e..7afea4550ed8d 100644 --- a/test/Driver/merge-module.swift +++ b/test/Driver/merge-module.swift @@ -1,20 +1,20 @@ // RUN: %swiftc_driver -emit-module -driver-print-jobs %s 2>&1 > %t.simple.txt -// RUN: FileCheck %s < %t.simple.txt -// RUN: FileCheck -check-prefix SIMPLE %s < %t.simple.txt +// RUN: %FileCheck %s < %t.simple.txt +// RUN: %FileCheck -check-prefix SIMPLE %s < %t.simple.txt // RUN: %swiftc_driver -driver-print-jobs -emit-module %s -sdk %S/../Inputs/clang-importer-sdk -Xfrontend -foo -Xfrontend -bar -o sdk.out -emit-objc-header-path path/to/header.h -F /path/to/frameworks -F /path/to/more/frameworks -I /path/to/headers -I path/to/more/headers -module-cache-path /tmp/modules 2>&1 > %t.complex.txt -// RUN: FileCheck %s < %t.complex.txt -// RUN: FileCheck -check-prefix COMPLEX %s < %t.complex.txt +// RUN: %FileCheck %s < %t.complex.txt +// RUN: %FileCheck -check-prefix COMPLEX %s < %t.complex.txt // RUN: %swiftc_driver -driver-print-jobs -c -emit-module %s -o sdk.foo.out 2>&1 > %t.complex.txt -// RUN: FileCheck %s < %t.complex.txt -// RUN: FileCheck -check-prefix TWO-OUTPUTS %s < %t.complex.txt +// RUN: %FileCheck %s < %t.complex.txt +// RUN: %FileCheck -check-prefix TWO-OUTPUTS %s < %t.complex.txt // RUN: %swiftc_driver -driver-print-jobs -c %s -emit-objc-header -o sdk.foo.out 2>&1 > %t.complex.txt -// RUN: FileCheck %s < %t.complex.txt -// RUN: FileCheck -check-prefix THREE-OUTPUTS %s < %t.complex.txt +// RUN: %FileCheck %s < %t.complex.txt +// RUN: %FileCheck -check-prefix THREE-OUTPUTS %s < %t.complex.txt -// RUN: %swiftc_driver -emit-module -driver-print-jobs -driver-use-filelists %s %S/../Inputs/empty.swift -module-name main 2>&1 | FileCheck -check-prefix FILELISTS %s +// RUN: %swiftc_driver -emit-module -driver-print-jobs -driver-use-filelists %s %S/../Inputs/empty.swift -module-name main 2>&1 | %FileCheck -check-prefix FILELISTS %s // CHECK: bin/swift{{c?}} -frontend // CHECK: -module-name {{[^ ]+}} @@ -80,8 +80,8 @@ // RUN: %swiftc_driver -driver-print-jobs -emit-module %S/Inputs/main.swift %S/Inputs/lib.swift -module-name merge -o /tmp/modules > %t.complex.txt -// RUN: FileCheck %s < %t.complex.txt -// RUN: FileCheck -check-prefix MERGE_1 %s < %t.complex.txt +// RUN: %FileCheck %s < %t.complex.txt +// RUN: %FileCheck -check-prefix MERGE_1 %s < %t.complex.txt // MERGE_1: bin/swift{{c?}} -frontend -emit-module -primary-file {{[^ ]+}}/Inputs/main.swift {{[^ ]+}}/Inputs/lib.swift // MERGE_1: -emit-module-doc-path [[PARTIAL_MODULE_A:[^ ]+]].swiftdoc diff --git a/test/Driver/modulewrap.swift b/test/Driver/modulewrap.swift index f28e6a62d7825..54df4dd0d2865 100644 --- a/test/Driver/modulewrap.swift +++ b/test/Driver/modulewrap.swift @@ -1,4 +1,4 @@ -// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-linux-gnu -g %s | FileCheck %s +// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-linux-gnu -g %s | %FileCheck %s // CHECK: bin/swift -frontend{{.*}}-emit-module-path [[MOD:.*\.swiftmodule]] // CHECK: bin/swift {{.*}}-emit-module [[MOD]] diff --git a/test/Driver/multi-threaded.swift b/test/Driver/multi-threaded.swift index b7551bef06d1a..09e69700986a5 100644 --- a/test/Driver/multi-threaded.swift +++ b/test/Driver/multi-threaded.swift @@ -1,27 +1,27 @@ // REQUIRES: rdar23493035 // RUN: rm -rf %t && mkdir %t -// RUN: %target-swiftc_driver -driver-print-jobs -module-name=ThisModule -wmo -num-threads 4 %S/Inputs/main.swift %s -emit-module -o test.swiftmodule | FileCheck -check-prefix=MODULE %s +// RUN: %target-swiftc_driver -driver-print-jobs -module-name=ThisModule -wmo -num-threads 4 %S/Inputs/main.swift %s -emit-module -o test.swiftmodule | %FileCheck -check-prefix=MODULE %s // RUN: echo "{\"%s\": {\"assembly\": \"/build/multi-threaded.s\"}, \"%S/Inputs/main.swift\": {\"assembly\": \"/build/main.s\"}}" > %t/ofms.json -// RUN: %target-swiftc_driver -driver-print-jobs -module-name=ThisModule -wmo -num-threads 4 %S/Inputs/main.swift %s -output-file-map %t/ofms.json -S | FileCheck -check-prefix=ASSEMBLY %s -// RUN: %target-swiftc_driver -driver-print-jobs -module-name=ThisModule -wmo -num-threads 4 %S/Inputs/main.swift %s -c | FileCheck -check-prefix=OBJECT %s +// RUN: %target-swiftc_driver -driver-print-jobs -module-name=ThisModule -wmo -num-threads 4 %S/Inputs/main.swift %s -output-file-map %t/ofms.json -S | %FileCheck -check-prefix=ASSEMBLY %s +// RUN: %target-swiftc_driver -driver-print-jobs -module-name=ThisModule -wmo -num-threads 4 %S/Inputs/main.swift %s -c | %FileCheck -check-prefix=OBJECT %s // RUN: %target-swiftc_driver -parseable-output -module-name=ThisModule -wmo -num-threads 4 %S/Inputs/main.swift %s -c 2> %t/parseable-output -// RUN: cat %t/parseable-output | FileCheck -check-prefix=PARSEABLE %s -// RUN: env TMPDIR=/tmp %swiftc_driver -driver-print-jobs -module-name=ThisModule -wmo -num-threads 4 %S/Inputs/main.swift %s -o a.out | FileCheck -check-prefix=EXEC %s +// RUN: cat %t/parseable-output | %FileCheck -check-prefix=PARSEABLE %s +// RUN: env TMPDIR=/tmp %swiftc_driver -driver-print-jobs -module-name=ThisModule -wmo -num-threads 4 %S/Inputs/main.swift %s -o a.out | %FileCheck -check-prefix=EXEC %s // RUN: echo "{\"%s\": {\"llvm-bc\": \"multi-threaded.bc\", \"object\": \"%t/multi-threaded.o\"}, \"%S/Inputs/main.swift\": {\"llvm-bc\": \"main.bc\", \"object\": \"%t/main.o\"}}" > %t/ofmo.json // RUN: %target-swiftc_driver -module-name=ThisModule -wmo -num-threads 4 %S/Inputs/main.swift %s -emit-dependencies -output-file-map %t/ofmo.json -c -// RUN: cat %t/*.d | FileCheck -check-prefix=DEPENDENCIES %s +// RUN: cat %t/*.d | %FileCheck -check-prefix=DEPENDENCIES %s // Check if -embed-bitcode works -// RUN: %target-swiftc_driver -driver-print-jobs -module-name=ThisModule -embed-bitcode -wmo -num-threads 4 %S/Inputs/main.swift %s -output-file-map %t/ofmo.json -c | FileCheck -check-prefix=BITCODE %s +// RUN: %target-swiftc_driver -driver-print-jobs -module-name=ThisModule -embed-bitcode -wmo -num-threads 4 %S/Inputs/main.swift %s -output-file-map %t/ofmo.json -c | %FileCheck -check-prefix=BITCODE %s // Check if -embed-bitcode works with -parseable-output // RUN: %target-swiftc_driver -parseable-output -module-name=ThisModule -embed-bitcode -wmo -num-threads 4 %S/Inputs/main.swift %s -output-file-map %t/ofmo.json -c 2> %t/parseable2 -// RUN: cat %t/parseable2 | FileCheck -check-prefix=PARSEABLE2 %s +// RUN: cat %t/parseable2 | %FileCheck -check-prefix=PARSEABLE2 %s // Check if linking works with -parseable-output // RUN: %target-swiftc_driver -parseable-output -module-name=ThisModule -wmo -num-threads 4 %S/Inputs/main.swift %s -output-file-map %t/ofmo.json -o a.out 2> %t/parseable3 -// RUN: cat %t/parseable3 | FileCheck -check-prefix=PARSEABLE3 %s +// RUN: cat %t/parseable3 | %FileCheck -check-prefix=PARSEABLE3 %s // MODULE: -frontend // MODULE-DAG: -num-threads 4 diff --git a/test/Driver/multiple_input.swift b/test/Driver/multiple_input.swift index 8fa11259a9221..22d89ea4800b7 100644 --- a/test/Driver/multiple_input.swift +++ b/test/Driver/multiple_input.swift @@ -1,6 +1,6 @@ // RUN: %target-swift-frontend -parse %S/Inputs/main.swift %S/Inputs/lib.swift %s -module-name ThisModule // RUN: %target-swift-frontend -parse %s %S/Inputs/lib.swift %S/Inputs/main.swift -module-name ThisModule -// RUN: not %target-swift-frontend -parse -parse-as-library %S/Inputs/main.swift %S/Inputs/lib.swift %s 2>&1 | FileCheck %s +// RUN: not %target-swift-frontend -parse -parse-as-library %S/Inputs/main.swift %S/Inputs/lib.swift %s 2>&1 | %FileCheck %s // CHECK: main.swift: // CHECK: expressions are not allowed at the top level diff --git a/test/Driver/no-inputs.swift b/test/Driver/no-inputs.swift index 49b0d2aaf7047..ea268c639c227 100644 --- a/test/Driver/no-inputs.swift +++ b/test/Driver/no-inputs.swift @@ -1,6 +1,6 @@ -// RUN: %swiftc_driver_plain -v 2>&1 | FileCheck %s -// RUN: %swiftc_driver_plain -v -force-single-frontend-invocation 2>&1 | FileCheck %s -// RUN: not %swiftc_driver_plain -emit-executable 2>&1 | FileCheck --check-prefix=CHECK-ERROR %s +// RUN: %swiftc_driver_plain -v 2>&1 | %FileCheck %s +// RUN: %swiftc_driver_plain -v -force-single-frontend-invocation 2>&1 | %FileCheck %s +// RUN: not %swiftc_driver_plain -emit-executable 2>&1 | %FileCheck --check-prefix=CHECK-ERROR %s // CHECK-NOT: error: no input files diff --git a/test/Driver/options-interpreter.swift b/test/Driver/options-interpreter.swift index 67c75a53464bc..3592ddf6b5f77 100644 --- a/test/Driver/options-interpreter.swift +++ b/test/Driver/options-interpreter.swift @@ -1,67 +1,67 @@ -// RUN: not %swift_driver -deprecated-integrated-repl -emit-module 2>&1 | FileCheck -check-prefix=IMMEDIATE_NO_MODULE %s -// RUN: not %swift_driver -emit-module 2>&1 | FileCheck -check-prefix=IMMEDIATE_NO_MODULE %s +// RUN: not %swift_driver -deprecated-integrated-repl -emit-module 2>&1 | %FileCheck -check-prefix=IMMEDIATE_NO_MODULE %s +// RUN: not %swift_driver -emit-module 2>&1 | %FileCheck -check-prefix=IMMEDIATE_NO_MODULE %s // REQUIRES: swift_interpreter // IMMEDIATE_NO_MODULE: error: unsupported option '-emit-module' -// RUN: %swift_driver -### %s | FileCheck -check-prefix INTERPRET %s +// RUN: %swift_driver -### %s | %FileCheck -check-prefix INTERPRET %s // INTERPRET: -interpret -// RUN: %swift_driver -### %s a b c | FileCheck -check-prefix ARGS %s +// RUN: %swift_driver -### %s a b c | %FileCheck -check-prefix ARGS %s // ARGS: -- a b c -// RUN: %swift_driver -### -parse-stdlib %s | FileCheck -check-prefix PARSE_STDLIB %s -// RUN: %swift_driver -### -parse-stdlib | FileCheck -check-prefix PARSE_STDLIB %s +// RUN: %swift_driver -### -parse-stdlib %s | %FileCheck -check-prefix PARSE_STDLIB %s +// RUN: %swift_driver -### -parse-stdlib | %FileCheck -check-prefix PARSE_STDLIB %s // PARSE_STDLIB: -parse-stdlib -// RUN: %swift_driver -### -target x86_64-apple-macosx10.9 -resource-dir /RSRC/ %s | FileCheck -check-prefix=CHECK-RESOURCE-DIR-ONLY %s +// RUN: %swift_driver -### -target x86_64-apple-macosx10.9 -resource-dir /RSRC/ %s | %FileCheck -check-prefix=CHECK-RESOURCE-DIR-ONLY %s // CHECK-RESOURCE-DIR-ONLY: # DYLD_LIBRARY_PATH=/RSRC/macosx{{$}} -// RUN: %swift_driver -### -target x86_64-unknown-linux-gnu -resource-dir /RSRC/ %s | FileCheck -check-prefix=CHECK-RESOURCE-DIR-ONLY-LINUX${LD_LIBRARY_PATH+_LAX} %s +// RUN: %swift_driver -### -target x86_64-unknown-linux-gnu -resource-dir /RSRC/ %s | %FileCheck -check-prefix=CHECK-RESOURCE-DIR-ONLY-LINUX${LD_LIBRARY_PATH+_LAX} %s // CHECK-RESOURCE-DIR-ONLY-LINUX: # LD_LIBRARY_PATH=/RSRC/linux{{$}} // CHECK-RESOURCE-DIR-ONLY-LINUX_LAX: # LD_LIBRARY_PATH=/RSRC/linux{{$|:}} -// RUN: %swift_driver -### -target x86_64-apple-macosx10.9 -L/foo/ %s | FileCheck -check-prefix=CHECK-L %s +// RUN: %swift_driver -### -target x86_64-apple-macosx10.9 -L/foo/ %s | %FileCheck -check-prefix=CHECK-L %s // CHECK-L: # DYLD_LIBRARY_PATH={{/foo/:[^:]+/lib/swift/macosx$}} -// RUN: %swift_driver -### -target x86_64-apple-macosx10.9 -L/foo/ -L/bar/ %s | FileCheck -check-prefix=CHECK-L2 %s +// RUN: %swift_driver -### -target x86_64-apple-macosx10.9 -L/foo/ -L/bar/ %s | %FileCheck -check-prefix=CHECK-L2 %s // CHECK-L2: # DYLD_LIBRARY_PATH={{/foo/:/bar/:[^:]+/lib/swift/macosx$}} -// RUN: env DYLD_LIBRARY_PATH=/abc/ %swift_driver_plain -### -target x86_64-apple-macosx10.9 -L/foo/ -L/bar/ %s | FileCheck -check-prefix=CHECK-L2-ENV %s +// RUN: env DYLD_LIBRARY_PATH=/abc/ %swift_driver_plain -### -target x86_64-apple-macosx10.9 -L/foo/ -L/bar/ %s | %FileCheck -check-prefix=CHECK-L2-ENV %s // CHECK-L2-ENV: # DYLD_LIBRARY_PATH={{/foo/:/bar/:[^:]+/lib/swift/macosx:/abc/$}} -// RUN: %swift_driver -### -target x86_64-apple-macosx10.9 %s | FileCheck -check-prefix=CHECK-NO-FRAMEWORKS %s -// RUN: env DYLD_FRAMEWORK_PATH=/abc/ %swift_driver_plain -### -target x86_64-apple-macosx10.9 %s | FileCheck -check-prefix=CHECK-NO-FRAMEWORKS %s +// RUN: %swift_driver -### -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=CHECK-NO-FRAMEWORKS %s +// RUN: env DYLD_FRAMEWORK_PATH=/abc/ %swift_driver_plain -### -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=CHECK-NO-FRAMEWORKS %s // CHECK-NO-FRAMEWORKS-NOT: DYLD_FRAMEWORK_PATH -// RUN: %swift_driver -### -target x86_64-apple-macosx10.9 -F/foo/ %s | FileCheck -check-prefix=CHECK-F %s +// RUN: %swift_driver -### -target x86_64-apple-macosx10.9 -F/foo/ %s | %FileCheck -check-prefix=CHECK-F %s // CHECK-F: -F /foo/ // CHECK-F: # // CHECK-F: DYLD_FRAMEWORK_PATH=/foo/{{$}} -// RUN: %swift_driver -### -target x86_64-apple-macosx10.9 -F/foo/ -F/bar/ %s | FileCheck -check-prefix=CHECK-F2 %s +// RUN: %swift_driver -### -target x86_64-apple-macosx10.9 -F/foo/ -F/bar/ %s | %FileCheck -check-prefix=CHECK-F2 %s // CHECK-F2: -F /foo/ // CHECK-F2: -F /bar/ // CHECK-F2: # // CHECK-F2: DYLD_FRAMEWORK_PATH=/foo/:/bar/{{$}} -// RUN: env DYLD_FRAMEWORK_PATH=/abc/ %swift_driver_plain -### -target x86_64-apple-macosx10.9 -F/foo/ -F/bar/ %s | FileCheck -check-prefix=CHECK-F2-ENV %s +// RUN: env DYLD_FRAMEWORK_PATH=/abc/ %swift_driver_plain -### -target x86_64-apple-macosx10.9 -F/foo/ -F/bar/ %s | %FileCheck -check-prefix=CHECK-F2-ENV %s // CHECK-F2-ENV: -F /foo/ // CHECK-F2-ENV: -F /bar/ // CHECK-F2-ENV: # // CHECK-F2-ENV: DYLD_FRAMEWORK_PATH=/foo/:/bar/:/abc/{{$}} -// RUN: env DYLD_FRAMEWORK_PATH=/abc/ %swift_driver_plain -### -target x86_64-apple-macosx10.9 -F/foo/ -F/bar/ -L/foo2/ -L/bar2/ %s | FileCheck -check-prefix=CHECK-COMPLEX %s +// RUN: env DYLD_FRAMEWORK_PATH=/abc/ %swift_driver_plain -### -target x86_64-apple-macosx10.9 -F/foo/ -F/bar/ -L/foo2/ -L/bar2/ %s | %FileCheck -check-prefix=CHECK-COMPLEX %s // CHECK-COMPLEX: -F /foo/ // CHECK-COMPLEX: -F /bar/ // CHECK-COMPLEX: # // CHECK-COMPLEX-DAG: DYLD_FRAMEWORK_PATH=/foo/:/bar/:/abc/{{$| }} // CHECK-COMPLEX-DAG: DYLD_LIBRARY_PATH={{/foo2/:/bar2/:[^:]+/lib/swift/macosx($| )}} -// RUN: %swift_driver -### -target x86_64-unknown-linux-gnu -L/foo/ %s | FileCheck -check-prefix=CHECK-L-LINUX${LD_LIBRARY_PATH+_LAX} %s +// RUN: %swift_driver -### -target x86_64-unknown-linux-gnu -L/foo/ %s | %FileCheck -check-prefix=CHECK-L-LINUX${LD_LIBRARY_PATH+_LAX} %s // CHECK-L-LINUX: # LD_LIBRARY_PATH={{/foo/:[^:]+/lib/swift/linux$}} // CHECK-L-LINUX_LAX: # LD_LIBRARY_PATH={{/foo/:[^:]+/lib/swift/linux($|:)}} -// RUN: env LD_LIBRARY_PATH=/abc/ %swift_driver_plain -### -target x86_64-unknown-linux-gnu -L/foo/ -L/bar/ %s | FileCheck -check-prefix=CHECK-LINUX-COMPLEX${LD_LIBRARY_PATH+_LAX} %s +// RUN: env LD_LIBRARY_PATH=/abc/ %swift_driver_plain -### -target x86_64-unknown-linux-gnu -L/foo/ -L/bar/ %s | %FileCheck -check-prefix=CHECK-LINUX-COMPLEX${LD_LIBRARY_PATH+_LAX} %s // CHECK-LINUX-COMPLEX: # LD_LIBRARY_PATH={{/foo/:/bar/:[^:]+/lib/swift/linux:/abc/$}} // CHECK-LINUX-COMPLEX_LAX: # LD_LIBRARY_PATH={{/foo/:/bar/:[^:]+/lib/swift/linux:/abc/($|:)}} diff --git a/test/Driver/options-repl-darwin.swift b/test/Driver/options-repl-darwin.swift index fe0d4d80c9afd..636f786cec2cf 100644 --- a/test/Driver/options-repl-darwin.swift +++ b/test/Driver/options-repl-darwin.swift @@ -4,20 +4,20 @@ // like the Xcode installation environment. We use hard links to make sure // the Swift driver really thinks it's been moved. -// RUN: %swift_driver -repl -### | FileCheck -check-prefix=INTEGRATED %s -// RUN: %swift_driver -### | FileCheck -check-prefix=INTEGRATED %s +// RUN: %swift_driver -repl -### | %FileCheck -check-prefix=INTEGRATED %s +// RUN: %swift_driver -### | %FileCheck -check-prefix=INTEGRATED %s // RUN: rm -rf %t // RUN: mkdir -p %t/usr/bin/ // RUN: touch %t/usr/bin/lldb // RUN: chmod +x %t/usr/bin/lldb // RUN: ln %swift_driver_plain %t/usr/bin/swift -// RUN: %t/usr/bin/swift -repl -### | FileCheck -check-prefix=LLDB %s -// RUN: %t/usr/bin/swift -### | FileCheck -check-prefix=LLDB %s +// RUN: %t/usr/bin/swift -repl -### | %FileCheck -check-prefix=LLDB %s +// RUN: %t/usr/bin/swift -### | %FileCheck -check-prefix=LLDB %s // RUN: mkdir -p %t/Toolchains/Test.xctoolchain/usr/bin/ // RUN: mv %t/usr/bin/swift %t/Toolchains/Test.xctoolchain/usr/bin/swift -// RUN: %t/Toolchains/Test.xctoolchain/usr/bin/swift -repl -### | FileCheck -check-prefix=LLDB %s +// RUN: %t/Toolchains/Test.xctoolchain/usr/bin/swift -repl -### | %FileCheck -check-prefix=LLDB %s // Clean up the test executable because hard links are expensive. // RUN: rm -rf %t/Toolchains/Test.xctoolchain/usr/bin/swift diff --git a/test/Driver/options-repl.swift b/test/Driver/options-repl.swift index bf319900bd88a..7dce7ccc3deaf 100644 --- a/test/Driver/options-repl.swift +++ b/test/Driver/options-repl.swift @@ -1,19 +1,19 @@ -// RUN: not %swift -repl %s 2>&1 | FileCheck -check-prefix=REPL_NO_FILES %s -// RUN: not %swift_driver -repl %s 2>&1 | FileCheck -check-prefix=REPL_NO_FILES %s -// RUN: not %swift_driver -lldb-repl %s 2>&1 | FileCheck -check-prefix=REPL_NO_FILES %s -// RUN: not %swift_driver -deprecated-integrated-repl %s 2>&1 | FileCheck -check-prefix=REPL_NO_FILES %s +// RUN: not %swift -repl %s 2>&1 | %FileCheck -check-prefix=REPL_NO_FILES %s +// RUN: not %swift_driver -repl %s 2>&1 | %FileCheck -check-prefix=REPL_NO_FILES %s +// RUN: not %swift_driver -lldb-repl %s 2>&1 | %FileCheck -check-prefix=REPL_NO_FILES %s +// RUN: not %swift_driver -deprecated-integrated-repl %s 2>&1 | %FileCheck -check-prefix=REPL_NO_FILES %s // REPL_NO_FILES: REPL mode requires no input files -// RUN: %swift_driver -deprecated-integrated-repl -### | FileCheck -check-prefix=INTEGRATED %s +// RUN: %swift_driver -deprecated-integrated-repl -### | %FileCheck -check-prefix=INTEGRATED %s // INTEGRATED: swift -frontend -repl // INTEGRATED: -module-name REPL -// RUN: %swift_driver -lldb-repl -### | FileCheck -check-prefix=LLDB %s -// RUN: %swift_driver -lldb-repl -DA,B,C -DD -L /path/to/libraries -L /path/to/more/libraries -F /path/to/frameworks -lsomelib -framework SomeFramework -sdk / -I "this folder" -module-name Test -### | FileCheck -check-prefix=LLDB-OPTS %s +// RUN: %swift_driver -lldb-repl -### | %FileCheck -check-prefix=LLDB %s +// RUN: %swift_driver -lldb-repl -DA,B,C -DD -L /path/to/libraries -L /path/to/more/libraries -F /path/to/frameworks -lsomelib -framework SomeFramework -sdk / -I "this folder" -module-name Test -### | %FileCheck -check-prefix=LLDB-OPTS %s // LLDB: lldb{{"?}} "--repl= // LLDB-NOT: -module-name @@ -38,13 +38,13 @@ // like the Xcode installation environment. We use hard links to make sure // the Swift driver really thinks it's been moved. -// RUN: %swift_driver -repl -### | FileCheck -check-prefix=INTEGRATED %s -// RUN: %swift_driver -### | FileCheck -check-prefix=INTEGRATED %s +// RUN: %swift_driver -repl -### | %FileCheck -check-prefix=INTEGRATED %s +// RUN: %swift_driver -### | %FileCheck -check-prefix=INTEGRATED %s // RUN: rm -rf %t // RUN: mkdir -p %t/usr/bin/ // RUN: touch %t/usr/bin/lldb // RUN: chmod +x %t/usr/bin/lldb // RUN: ln %swift_driver_plain %t/usr/bin/swift -// RUN: %t/usr/bin/swift -repl -### | FileCheck -check-prefix=LLDB %s -// RUN: %t/usr/bin/swift -### | FileCheck -check-prefix=LLDB %s +// RUN: %t/usr/bin/swift -repl -### | %FileCheck -check-prefix=LLDB %s +// RUN: %t/usr/bin/swift -### | %FileCheck -check-prefix=LLDB %s diff --git a/test/Driver/options.swift b/test/Driver/options.swift index 0096ccea048cd..7044c2cc49308 100644 --- a/test/Driver/options.swift +++ b/test/Driver/options.swift @@ -1,29 +1,29 @@ // rdar://13723332 Crash on -emit-sil with no input files -// RUN: not %target-swift-frontend -emit-sil 2>&1 | FileCheck -check-prefix=NO_FILES %s -// RUN: not %target-swift-frontend -emit-sil -parse-as-library 2>&1 | FileCheck -check-prefix=NO_FILES %s +// RUN: not %target-swift-frontend -emit-sil 2>&1 | %FileCheck -check-prefix=NO_FILES %s +// RUN: not %target-swift-frontend -emit-sil -parse-as-library 2>&1 | %FileCheck -check-prefix=NO_FILES %s // NO_FILES: this mode requires at least one input file -// RUN: not %target-swift-frontend -parse-sil -emit-sil 2>&1 | FileCheck -check-prefix=SIL_FILES %s -// RUN: not %target-swift-frontend -parse-sil -emit-sil %s %s 2>&1 | FileCheck -check-prefix=SIL_FILES %s +// RUN: not %target-swift-frontend -parse-sil -emit-sil 2>&1 | %FileCheck -check-prefix=SIL_FILES %s +// RUN: not %target-swift-frontend -parse-sil -emit-sil %s %s 2>&1 | %FileCheck -check-prefix=SIL_FILES %s // SIL_FILES: this mode requires a single input file -// RUN: not %target-swift-frontend -emit-silgen -parse-as-library %S/Inputs/invalid-module-name.swift 2>&1 | FileCheck -check-prefix=INVALID_MODULE_NAME %s +// RUN: not %target-swift-frontend -emit-silgen -parse-as-library %S/Inputs/invalid-module-name.swift 2>&1 | %FileCheck -check-prefix=INVALID_MODULE_NAME %s // INVALID_MODULE_NAME: error: module name "invalid-module-name" is not a valid identifier; use -module-name flag to specify an alternate name -// RUN: not %target-swift-frontend -emit-silgen -parse-as-library %S/Inputs/invalid.module.name.swift 2>&1 | FileCheck -check-prefix=INVALID_MODULE_NAME2 %s +// RUN: not %target-swift-frontend -emit-silgen -parse-as-library %S/Inputs/invalid.module.name.swift 2>&1 | %FileCheck -check-prefix=INVALID_MODULE_NAME2 %s // INVALID_MODULE_NAME2: error: module name "invalid.module.name" is not a valid identifier; use -module-name flag to specify an alternate name -// RUN: not %target-swift-frontend -emit-silgen -parse-as-library %S/Inputs/invalid-module-name.swift -module-name still-invalid 2>&1 | FileCheck -check-prefix=STILL_INVALID %s +// RUN: not %target-swift-frontend -emit-silgen -parse-as-library %S/Inputs/invalid-module-name.swift -module-name still-invalid 2>&1 | %FileCheck -check-prefix=STILL_INVALID %s // STILL_INVALID: error: module name "still-invalid" is not a valid identifier{{$}} -// RUN: not %target-swiftc_driver -emit-silgen -parse-as-library %s -module-name "Swift" 2>&1 | FileCheck -check-prefix=STDLIB_MODULE %s +// RUN: not %target-swiftc_driver -emit-silgen -parse-as-library %s -module-name "Swift" 2>&1 | %FileCheck -check-prefix=STDLIB_MODULE %s // RUN: %target-swiftc_driver -emit-silgen -parse-as-library %s -module-name "Swift" -parse-stdlib -### // STDLIB_MODULE: error: module name "Swift" is reserved for the standard library{{$}} -// RUN: not %target-swift-frontend -parse -emit-module %s 2>&1 | FileCheck -check-prefix=PARSE_NO_MODULE %s +// RUN: not %target-swift-frontend -parse -emit-module %s 2>&1 | %FileCheck -check-prefix=PARSE_NO_MODULE %s // PARSE_NO_MODULE: error: this mode does not support emitting modules{{$}} -// RUN: not %target-swift-frontend -dump-ast -emit-dependencies %s 2>&1 | FileCheck -check-prefix=DUMP_NO_DEPS %s +// RUN: not %target-swift-frontend -dump-ast -emit-dependencies %s 2>&1 | %FileCheck -check-prefix=DUMP_NO_DEPS %s // DUMP_NO_DEPS: error: this mode does not support emitting dependency files{{$}} // Should not fail with non-zero exit code. @@ -31,85 +31,85 @@ // RUN: %target-swift-frontend -emit-silgen -parse-as-library %S/Inputs/invalid-module-name.swift -module-name foo > /dev/null // RUN: %target-swift-frontend -parse -parse-as-library %S/Inputs/invalid-module-name.swift -module-name foo -// RUN: not %swiftc_driver -crazy-option-that-does-not-exist %s 2>&1 | FileCheck -check-prefix=INVALID_OPTION %s -// RUN: not %swift_driver -crazy-option-that-does-not-exist 2>&1 | FileCheck -check-prefix=INVALID_OPTION %s +// RUN: not %swiftc_driver -crazy-option-that-does-not-exist %s 2>&1 | %FileCheck -check-prefix=INVALID_OPTION %s +// RUN: not %swift_driver -crazy-option-that-does-not-exist 2>&1 | %FileCheck -check-prefix=INVALID_OPTION %s // INVALID_OPTION: error: unknown argument: '-crazy-option-that-does-not-exist' -// RUN: %swiftc_driver -assert-config Debug -### %s | FileCheck -check-prefix=ASSERTCONFIG %s -// RUN: %swift_driver -assert-config Debug -### | FileCheck -check-prefix=ASSERTCONFIG %s +// RUN: %swiftc_driver -assert-config Debug -### %s | %FileCheck -check-prefix=ASSERTCONFIG %s +// RUN: %swift_driver -assert-config Debug -### | %FileCheck -check-prefix=ASSERTCONFIG %s // ASSERTCONFIG: -assert-config Debug -// RUN: %swiftc_driver -assert-config Release -### %s | FileCheck -check-prefix=ASSERTCONFIG_RELEASE %s -// RUN: %swift_driver -assert-config Release -### %s | FileCheck -check-prefix=ASSERTCONFIG_RELEASE %s +// RUN: %swiftc_driver -assert-config Release -### %s | %FileCheck -check-prefix=ASSERTCONFIG_RELEASE %s +// RUN: %swift_driver -assert-config Release -### %s | %FileCheck -check-prefix=ASSERTCONFIG_RELEASE %s // ASSERTCONFIG_RELEASE: -assert-config Release -// RUN: %swiftc_driver -assert-config Unchecked -### %s | FileCheck -check-prefix=ASSERTCONFIG_UNCHECKED %s -// RUN: %swift_driver -assert-config Unchecked -### %s | FileCheck -check-prefix=ASSERTCONFIG_UNCHECKED %s +// RUN: %swiftc_driver -assert-config Unchecked -### %s | %FileCheck -check-prefix=ASSERTCONFIG_UNCHECKED %s +// RUN: %swift_driver -assert-config Unchecked -### %s | %FileCheck -check-prefix=ASSERTCONFIG_UNCHECKED %s // ASSERTCONFIG_UNCHECKED: -assert-config Unchecked -// RUN: %swiftc_driver -assert-config DisableReplacement -### %s | FileCheck -check-prefix=ASSERTCONFIG_DISABLEREPLACEMENT %s -// RUN: %swift_driver -assert-config DisableReplacement -### %s | FileCheck -check-prefix=ASSERTCONFIG_DISABLEREPLACEMENT %s +// RUN: %swiftc_driver -assert-config DisableReplacement -### %s | %FileCheck -check-prefix=ASSERTCONFIG_DISABLEREPLACEMENT %s +// RUN: %swift_driver -assert-config DisableReplacement -### %s | %FileCheck -check-prefix=ASSERTCONFIG_DISABLEREPLACEMENT %s // ASSERTCONFIG_DISABLEREPLACEMENT: -assert-config DisableReplacement -// RUN: not %swiftc_driver -import-objc-header fake.h -import-underlying-module -c %s 2>&1 | FileCheck -check-prefix=FRAMEWORK_BRIDGING_HEADER %s +// RUN: not %swiftc_driver -import-objc-header fake.h -import-underlying-module -c %s 2>&1 | %FileCheck -check-prefix=FRAMEWORK_BRIDGING_HEADER %s // FRAMEWORK_BRIDGING_HEADER: error: using bridging headers with framework targets is unsupported -// RUN: %swift_driver -### | FileCheck -check-prefix=DEFAULT_REPL %s +// RUN: %swift_driver -### | %FileCheck -check-prefix=DEFAULT_REPL %s // DEFAULT_REPL: -repl -// RUN: not %swiftc_driver 2>&1 | FileCheck -check-prefix=DEFAULT_EXEC_ERR %s +// RUN: not %swiftc_driver 2>&1 | %FileCheck -check-prefix=DEFAULT_EXEC_ERR %s // DEFAULT_EXEC_ERR: error: no input files -// RUN: %swiftc_driver %s -### 2>&1 | FileCheck -check-prefix=DEFAULT_EXEC %s +// RUN: %swiftc_driver %s -### 2>&1 | %FileCheck -check-prefix=DEFAULT_EXEC %s // DEFAULT_EXEC: -c // DEFAULT_EXEC: ld -// RUN: %swift_driver -repl -### 2>&1 | FileCheck -check-prefix=REPL %s +// RUN: %swift_driver -repl -### 2>&1 | %FileCheck -check-prefix=REPL %s // REPL: warning: unnecessary option '-repl' -// RUN: %swift_driver -lldb-repl -### 2>&1 | FileCheck -check-prefix=LLDB_REPL %s +// RUN: %swift_driver -lldb-repl -### 2>&1 | %FileCheck -check-prefix=LLDB_REPL %s // LLDB_REPL-NOT: warning // LLDB_REPL: lldb // LLDB_REPL-NOT: warning -// RUN: %swift_driver -deprecated-integrated-repl -### 2>&1 | FileCheck -check-prefix=INTEGRATED_REPL %s +// RUN: %swift_driver -deprecated-integrated-repl -### 2>&1 | %FileCheck -check-prefix=INTEGRATED_REPL %s // INTEGRATED_REPL-NOT: warning // INTEGRATED_REPL: -repl // INTEGRATED_REPL-NOT: warning -// RUN: %swift_driver -### %s | FileCheck -check-prefix=DEFAULT_I %s +// RUN: %swift_driver -### %s | %FileCheck -check-prefix=DEFAULT_I %s // DEFAULT_I: -interpret -// RUN: not %swift_driver -### -i %s 2>&1 | FileCheck -check-prefix=I_MODE %s -// RUN: not %swift_driver -### -i 2>&1 | FileCheck -check-prefix=I_MODE %s -// RUN: not %swiftc_driver -### -i %s 2>&1 | FileCheck -check-prefix=I_MODE %s -// RUN: not %swiftc_driver -### -i 2>&1 | FileCheck -check-prefix=I_MODE %s +// RUN: not %swift_driver -### -i %s 2>&1 | %FileCheck -check-prefix=I_MODE %s +// RUN: not %swift_driver -### -i 2>&1 | %FileCheck -check-prefix=I_MODE %s +// RUN: not %swiftc_driver -### -i %s 2>&1 | %FileCheck -check-prefix=I_MODE %s +// RUN: not %swiftc_driver -### -i 2>&1 | %FileCheck -check-prefix=I_MODE %s // I_MODE: error: the flag '-i' is no longer required and has been removed; use 'swift input-filename' -// RUN: not %swift_driver -### -c %s 2>&1 | FileCheck -check-prefix=C_MODE %s +// RUN: not %swift_driver -### -c %s 2>&1 | %FileCheck -check-prefix=C_MODE %s // C_MODE: error: unsupported option '-c' -// RUN: not %swift_driver -### -emit-object %s 2>&1 | FileCheck -check-prefix=OBJ_MODE %s +// RUN: not %swift_driver -### -emit-object %s 2>&1 | %FileCheck -check-prefix=OBJ_MODE %s // OBJ_MODE: error: unsupported option '-emit-object' -// RUN: not %swift_driver -### -emit-executable %s 2>&1 | FileCheck -check-prefix=EXEC_MODE %s +// RUN: not %swift_driver -### -emit-executable %s 2>&1 | %FileCheck -check-prefix=EXEC_MODE %s // EXEC_MODE: error: unsupported option '-emit-executable' -// RUN: not %swift_driver -### -o %t %s 2>&1 | FileCheck -check-prefix=ARG_o %s +// RUN: not %swift_driver -### -o %t %s 2>&1 | %FileCheck -check-prefix=ARG_o %s // ARG_o: error: unsupported option '-o' -// RUN: not %swiftc_driver -### -repl 2>&1 | FileCheck -check-prefix=REPL_MODE_SWIFTC %s +// RUN: not %swiftc_driver -### -repl 2>&1 | %FileCheck -check-prefix=REPL_MODE_SWIFTC %s // REPL_MODE_SWIFTC: error: unsupported option '-repl' -// RUN: not %swiftc_driver -### -lldb-repl 2>&1 | FileCheck -check-prefix=LLDB_REPL_MODE_SWIFTC %s +// RUN: not %swiftc_driver -### -lldb-repl 2>&1 | %FileCheck -check-prefix=LLDB_REPL_MODE_SWIFTC %s // LLDB_REPL_MODE_SWIFTC: error: unsupported option '-lldb-repl' -// RUN: not %swiftc_driver -### -deprecated-integrated-repl 2>&1 | FileCheck -check-prefix=INT_REPL_MODE_SWIFTC %s +// RUN: not %swiftc_driver -### -deprecated-integrated-repl 2>&1 | %FileCheck -check-prefix=INT_REPL_MODE_SWIFTC %s // INT_REPL_MODE_SWIFTC: error: unsupported option '-deprecated-integrated-repl' -// RUN: %swift_driver -g -### %s 2>&1 | FileCheck -check-prefix=OPTIONS_BEFORE_FILE %s +// RUN: %swift_driver -g -### %s 2>&1 | %FileCheck -check-prefix=OPTIONS_BEFORE_FILE %s // OPTIONS_BEFORE_FILE: -g -// RUN: not %swift_driver -target abc -### %s 2>&1 | FileCheck -check-prefix=BAD_TARGET %s +// RUN: not %swift_driver -target abc -### %s 2>&1 | %FileCheck -check-prefix=BAD_TARGET %s // BAD_TARGET: error: unknown target 'abc' -// RUN: %swiftc_driver -incremental %s -### 2>&1 | FileCheck -check-prefix=INCREMENTAL_WITHOUT_OFM %s +// RUN: %swiftc_driver -incremental %s -### 2>&1 | %FileCheck -check-prefix=INCREMENTAL_WITHOUT_OFM %s // INCREMENTAL_WITHOUT_OFM: warning: ignoring -incremental (currently requires an output file map) // INCREMENTAL_WITHOUT_OFM: swift -frontend -// RUN: %swiftc_driver -incremental -output-file-map %S/Inputs/empty-ofm.json %s -### 2>&1 | FileCheck -check-prefix=INCREMENTAL_WITHOUT_OFM_ENTRY %s +// RUN: %swiftc_driver -incremental -output-file-map %S/Inputs/empty-ofm.json %s -### 2>&1 | %FileCheck -check-prefix=INCREMENTAL_WITHOUT_OFM_ENTRY %s // INCREMENTAL_WITHOUT_OFM_ENTRY: ignoring -incremental; output file map has no master dependencies entry ("swift-dependencies" under "") // INCREMENTAL_WITHOUT_OFM_ENTRY: swift -frontend diff --git a/test/Driver/os-deployment.swift b/test/Driver/os-deployment.swift index 4e97f69c7b329..7fd106de5dcce 100644 --- a/test/Driver/os-deployment.swift +++ b/test/Driver/os-deployment.swift @@ -1,7 +1,7 @@ -// RUN: not %swiftc_driver -target x86_64-apple-macosx10.8 %s 2>&1 | FileCheck --check-prefix=CHECK-OSX %s -// RUN: not %swiftc_driver -target x86_64-apple-ios6.0 %s 2>&1 | FileCheck --check-prefix=CHECK-IOS %s -// RUN: not %swiftc_driver -target x86_64-apple-tvos8.0 %s 2>&1 | FileCheck --check-prefix=CHECK-tvOS %s -// RUN: not %swiftc_driver -target x86_64-apple-watchos1.0 %s 2>&1 | FileCheck --check-prefix=CHECK-watchOS %s +// RUN: not %swiftc_driver -target x86_64-apple-macosx10.8 %s 2>&1 | %FileCheck --check-prefix=CHECK-OSX %s +// RUN: not %swiftc_driver -target x86_64-apple-ios6.0 %s 2>&1 | %FileCheck --check-prefix=CHECK-IOS %s +// RUN: not %swiftc_driver -target x86_64-apple-tvos8.0 %s 2>&1 | %FileCheck --check-prefix=CHECK-tvOS %s +// RUN: not %swiftc_driver -target x86_64-apple-watchos1.0 %s 2>&1 | %FileCheck --check-prefix=CHECK-watchOS %s // CHECK-OSX: Swift requires a minimum deployment target of OS X 10.9 diff --git a/test/Driver/output.swift b/test/Driver/output.swift index 5bd889405542d..8156441a6e75c 100644 --- a/test/Driver/output.swift +++ b/test/Driver/output.swift @@ -11,8 +11,8 @@ // RUN: %target-swift-frontend -emit-bc %s -o %t/explicit2.llvmbc -module-name explicit2 // RUN: echo | %target-swift-frontend -emit-bc - -o %t/sub -module-name stdin -// RUN: ls -1 %t | FileCheck %s -// RUN: ls -1 %t/sub/ | FileCheck %s -check-prefix=SUB +// RUN: ls -1 %t | %FileCheck %s +// RUN: ls -1 %t/sub/ | %FileCheck %s -check-prefix=SUB // CHECK: explicit.bc // CHECK-NEXT: explicit.llvmbc diff --git a/test/Driver/parseable_output.swift b/test/Driver/parseable_output.swift index 842be0ca2fede..37c6e57cf7dec 100644 --- a/test/Driver/parseable_output.swift +++ b/test/Driver/parseable_output.swift @@ -1,4 +1,4 @@ -// RUN: %swiftc_driver_plain -emit-executable %s -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: %swiftc_driver_plain -emit-executable %s -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 diff --git a/test/Driver/parseable_output_unicode.swift b/test/Driver/parseable_output_unicode.swift index aef49fefade1e..8445518c1e7cf 100644 --- a/test/Driver/parseable_output_unicode.swift +++ b/test/Driver/parseable_output_unicode.swift @@ -1,4 +1,4 @@ -// 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: %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 // XFAIL: freebsd, linux diff --git a/test/Driver/profiling.swift b/test/Driver/profiling.swift index c7e24ee49b531..ccf6aa0c02589 100644 --- a/test/Driver/profiling.swift +++ b/test/Driver/profiling.swift @@ -1,23 +1,23 @@ -// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-apple-macosx10.9 %s | FileCheck -check-prefix=CHECK -check-prefix=OSX %s +// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=CHECK -check-prefix=OSX %s -// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-apple-ios7.1 -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | FileCheck -check-prefix=CHECK -check-prefix=IOS %s -// RUN: %swiftc_driver -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 +// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-apple-ios7.1 -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=IOS %s +// RUN: %swiftc_driver -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 -// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-apple-ios7.1 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | FileCheck -check-prefix=CHECK -check-prefix=IOSSIM %s -// RUN: %swiftc_driver -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 +// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-apple-ios7.1 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=IOSSIM %s +// RUN: %swiftc_driver -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 -// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-apple-tvos9.0 -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | FileCheck -check-prefix=CHECK -check-prefix=tvOS %s -// RUN: %swiftc_driver -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 +// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-apple-tvos9.0 -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=tvOS %s +// RUN: %swiftc_driver -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 -// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-apple-tvos9.0 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | FileCheck -check-prefix=CHECK -check-prefix=tvOS_SIM %s -// RUN: %swiftc_driver -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 +// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-apple-tvos9.0 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=tvOS_SIM %s +// RUN: %swiftc_driver -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 -// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target i386-apple-watchos2.0 -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | FileCheck -check-prefix=CHECK -check-prefix=watchOS %s -// RUN: %swiftc_driver -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 -// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target i386-apple-watchos2.0 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | FileCheck -check-prefix=CHECK -check-prefix=watchOS_SIM %s -// RUN: %swiftc_driver -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 +// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target i386-apple-watchos2.0 -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=watchOS %s +// RUN: %swiftc_driver -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 +// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target i386-apple-watchos2.0 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=watchOS_SIM %s +// RUN: %swiftc_driver -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 -// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-unknown-linux-gnu %s | FileCheck -check-prefix=CHECK -check-prefix=LINUX %s +// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-unknown-linux-gnu %s | %FileCheck -check-prefix=CHECK -check-prefix=LINUX %s // CHECK: swift // CHECK: -profile-generate diff --git a/test/Driver/sanitize_coverage.swift b/test/Driver/sanitize_coverage.swift index 623c19b95c728..efcccc23a8288 100644 --- a/test/Driver/sanitize_coverage.swift +++ b/test/Driver/sanitize_coverage.swift @@ -1,21 +1,21 @@ // XFAIL: linux // Different sanitizer coverage types -// RUN: %swiftc_driver -driver-print-jobs -sanitize-coverage=func -sanitize=address %s | FileCheck -check-prefix=SANCOV_FUNC %s -// RUN: %swiftc_driver -driver-print-jobs -sanitize-coverage=bb -sanitize=address %s | FileCheck -check-prefix=SANCOV_BB %s -// RUN: %swiftc_driver -driver-print-jobs -sanitize-coverage=edge -sanitize=address %s | FileCheck -check-prefix=SANCOV_EDGE %s +// RUN: %swiftc_driver -driver-print-jobs -sanitize-coverage=func -sanitize=address %s | %FileCheck -check-prefix=SANCOV_FUNC %s +// RUN: %swiftc_driver -driver-print-jobs -sanitize-coverage=bb -sanitize=address %s | %FileCheck -check-prefix=SANCOV_BB %s +// RUN: %swiftc_driver -driver-print-jobs -sanitize-coverage=edge -sanitize=address %s | %FileCheck -check-prefix=SANCOV_EDGE %s // Try some options -// RUN: %swiftc_driver -driver-print-jobs -sanitize-coverage=edge,indirect-calls,trace-bb,trace-cmp,8bit-counters -sanitize=address %s | FileCheck -check-prefix=SANCOV_EDGE_WITH_OPTIONS %s +// RUN: %swiftc_driver -driver-print-jobs -sanitize-coverage=edge,indirect-calls,trace-bb,trace-cmp,8bit-counters -sanitize=address %s | %FileCheck -check-prefix=SANCOV_EDGE_WITH_OPTIONS %s // Invalid command line arguments -// RUN: not %swiftc_driver -driver-print-jobs -sanitize-coverage=func %s 2>&1 | FileCheck -check-prefix=SANCOV_WITHOUT_XSAN %s -// RUN: not %swiftc_driver -driver-print-jobs -sanitize-coverage=bb %s 2>&1 | FileCheck -check-prefix=SANCOV_WITHOUT_XSAN %s -// RUN: not %swiftc_driver -driver-print-jobs -sanitize-coverage=edge %s 2>&1 | FileCheck -check-prefix=SANCOV_WITHOUT_XSAN %s -// RUN: not %swiftc_driver -driver-print-jobs -sanitize=address -sanitize-coverage=unknown %s 2>&1 | FileCheck -check-prefix=SANCOV_BAD_ARG %s -// RUN: not %swiftc_driver -driver-print-jobs -sanitize=address -sanitize-coverage=indirect-calls %s 2>&1 | FileCheck -check-prefix=SANCOV_MISSING_ARG %s -// RUN: not %swiftc_driver -driver-print-jobs -sanitize=address -sanitize-coverage=trace-bb %s 2>&1 | FileCheck -check-prefix=SANCOV_MISSING_ARG %s -// RUN: not %swiftc_driver -driver-print-jobs -sanitize=address -sanitize-coverage=trace-cmp %s 2>&1 | FileCheck -check-prefix=SANCOV_MISSING_ARG %s -// RUN: not %swiftc_driver -driver-print-jobs -sanitize=address -sanitize-coverage=8bit-counters %s 2>&1 | FileCheck -check-prefix=SANCOV_MISSING_ARG %s +// RUN: not %swiftc_driver -driver-print-jobs -sanitize-coverage=func %s 2>&1 | %FileCheck -check-prefix=SANCOV_WITHOUT_XSAN %s +// RUN: not %swiftc_driver -driver-print-jobs -sanitize-coverage=bb %s 2>&1 | %FileCheck -check-prefix=SANCOV_WITHOUT_XSAN %s +// RUN: not %swiftc_driver -driver-print-jobs -sanitize-coverage=edge %s 2>&1 | %FileCheck -check-prefix=SANCOV_WITHOUT_XSAN %s +// RUN: not %swiftc_driver -driver-print-jobs -sanitize=address -sanitize-coverage=unknown %s 2>&1 | %FileCheck -check-prefix=SANCOV_BAD_ARG %s +// RUN: not %swiftc_driver -driver-print-jobs -sanitize=address -sanitize-coverage=indirect-calls %s 2>&1 | %FileCheck -check-prefix=SANCOV_MISSING_ARG %s +// RUN: not %swiftc_driver -driver-print-jobs -sanitize=address -sanitize-coverage=trace-bb %s 2>&1 | %FileCheck -check-prefix=SANCOV_MISSING_ARG %s +// RUN: not %swiftc_driver -driver-print-jobs -sanitize=address -sanitize-coverage=trace-cmp %s 2>&1 | %FileCheck -check-prefix=SANCOV_MISSING_ARG %s +// RUN: not %swiftc_driver -driver-print-jobs -sanitize=address -sanitize-coverage=8bit-counters %s 2>&1 | %FileCheck -check-prefix=SANCOV_MISSING_ARG %s // SANCOV_FUNC: swift // SANCOV_FUNC-DAG: -sanitize-coverage=func diff --git a/test/Driver/sanitizers.swift b/test/Driver/sanitizers.swift index 8776efd2c90cc..ecddad7da1cbb 100644 --- a/test/Driver/sanitizers.swift +++ b/test/Driver/sanitizers.swift @@ -1,25 +1,25 @@ -// RUN: %swiftc_driver -driver-print-jobs -sanitize=address -target x86_64-apple-macosx10.9 %s | FileCheck -check-prefix=ASAN -check-prefix=ASAN_OSX %s -// RUN: %swiftc_driver -driver-print-jobs -sanitize=address -target x86_64-apple-ios7.1 %s | FileCheck -check-prefix=ASAN -check-prefix=ASAN_IOSSIM %s -// RUN: %swiftc_driver -driver-print-jobs -sanitize=address -target arm64-apple-ios7.1 %s | FileCheck -check-prefix=ASAN -check-prefix=ASAN_IOS %s -// RUN: %swiftc_driver -driver-print-jobs -sanitize=address -target x86_64-apple-tvos9.0 %s | FileCheck -check-prefix=ASAN -check-prefix=ASAN_tvOS_SIM %s -// RUN: %swiftc_driver -driver-print-jobs -sanitize=address -target arm64-apple-tvos9.0 %s | FileCheck -check-prefix=ASAN -check-prefix=ASAN_tvOS %s -// RUN: %swiftc_driver -driver-print-jobs -sanitize=address -target i386-apple-watchos2.0 %s | FileCheck -check-prefix=ASAN -check-prefix=ASAN_watchOS_SIM %s -// RUN: %swiftc_driver -driver-print-jobs -sanitize=address -target armv7k-apple-watchos2.0 %s | FileCheck -check-prefix=ASAN -check-prefix=ASAN_watchOS %s -// RUN: not %swiftc_driver -driver-print-jobs -sanitize=address -target x86_64-unknown-linux-gnu %s 2>&1 | FileCheck -check-prefix=ASAN_LINUX %s - -// RUN: %swiftc_driver -driver-print-jobs -sanitize=thread -target x86_64-apple-macosx10.9 %s | FileCheck -check-prefix=TSAN -check-prefix=TSAN_OSX %s -// RUN: not %swiftc_driver -driver-print-jobs -sanitize=thread -target x86-apple-macosx10.9 %s 2>&1 | FileCheck -check-prefix=TSAN_OSX_32 %s -// RUN: %swiftc_driver -driver-print-jobs -sanitize=thread -target x86_64-apple-ios7.1 %s | FileCheck -check-prefix=TSAN -check-prefix=TSAN_IOSSIM %s -// RUN: not %swiftc_driver -driver-print-jobs -sanitize=thread -target arm64-apple-ios7.1 %s 2>&1 | FileCheck -check-prefix=TSAN_IOS %s -// RUN: %swiftc_driver -driver-print-jobs -sanitize=thread -target x86_64-apple-tvos9.0 %s | FileCheck -check-prefix=TSAN -check-prefix=TSAN_tvOS_SIM %s -// RUN: not %swiftc_driver -driver-print-jobs -sanitize=thread -target arm64-apple-tvos9.0 %s 2>&1 | FileCheck -check-prefix=TSAN_tvOS %s -// RUN: not %swiftc_driver -driver-print-jobs -sanitize=thread -target i386-apple-watchos2.0 %s 2>&1 | FileCheck -check-prefix=TSAN_watchOS_SIM %s -// RUN: not %swiftc_driver -driver-print-jobs -sanitize=thread -target armv7k-apple-watchos2.0 %s 2>&1 | FileCheck -check-prefix=TSAN_watchOS %s -// RUN: not %swiftc_driver -driver-print-jobs -sanitize=thread -target x86_64-unknown-linux-gnu %s 2>&1 | FileCheck -check-prefix=TSAN_LINUX %s - -// RUN: not %swiftc_driver -driver-print-jobs -sanitize=address,unknown %s 2>&1 | FileCheck -check-prefix=BADARG %s -// RUN: not %swiftc_driver -driver-print-jobs -sanitize=address -sanitize=unknown %s 2>&1 | FileCheck -check-prefix=BADARG %s -// RUN: not %swiftc_driver -driver-print-jobs -sanitize=address,thread %s 2>&1 | FileCheck -check-prefix=INCOMPATIBLESANITIZERS %s +// RUN: %swiftc_driver -driver-print-jobs -sanitize=address -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_OSX %s +// RUN: %swiftc_driver -driver-print-jobs -sanitize=address -target x86_64-apple-ios7.1 %s | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_IOSSIM %s +// RUN: %swiftc_driver -driver-print-jobs -sanitize=address -target arm64-apple-ios7.1 %s | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_IOS %s +// RUN: %swiftc_driver -driver-print-jobs -sanitize=address -target x86_64-apple-tvos9.0 %s | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_tvOS_SIM %s +// RUN: %swiftc_driver -driver-print-jobs -sanitize=address -target arm64-apple-tvos9.0 %s | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_tvOS %s +// RUN: %swiftc_driver -driver-print-jobs -sanitize=address -target i386-apple-watchos2.0 %s | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_watchOS_SIM %s +// RUN: %swiftc_driver -driver-print-jobs -sanitize=address -target armv7k-apple-watchos2.0 %s | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_watchOS %s +// RUN: not %swiftc_driver -driver-print-jobs -sanitize=address -target x86_64-unknown-linux-gnu %s 2>&1 | %FileCheck -check-prefix=ASAN_LINUX %s + +// RUN: %swiftc_driver -driver-print-jobs -sanitize=thread -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=TSAN -check-prefix=TSAN_OSX %s +// RUN: not %swiftc_driver -driver-print-jobs -sanitize=thread -target x86-apple-macosx10.9 %s 2>&1 | %FileCheck -check-prefix=TSAN_OSX_32 %s +// RUN: %swiftc_driver -driver-print-jobs -sanitize=thread -target x86_64-apple-ios7.1 %s | %FileCheck -check-prefix=TSAN -check-prefix=TSAN_IOSSIM %s +// RUN: not %swiftc_driver -driver-print-jobs -sanitize=thread -target arm64-apple-ios7.1 %s 2>&1 | %FileCheck -check-prefix=TSAN_IOS %s +// RUN: %swiftc_driver -driver-print-jobs -sanitize=thread -target x86_64-apple-tvos9.0 %s | %FileCheck -check-prefix=TSAN -check-prefix=TSAN_tvOS_SIM %s +// RUN: not %swiftc_driver -driver-print-jobs -sanitize=thread -target arm64-apple-tvos9.0 %s 2>&1 | %FileCheck -check-prefix=TSAN_tvOS %s +// RUN: not %swiftc_driver -driver-print-jobs -sanitize=thread -target i386-apple-watchos2.0 %s 2>&1 | %FileCheck -check-prefix=TSAN_watchOS_SIM %s +// RUN: not %swiftc_driver -driver-print-jobs -sanitize=thread -target armv7k-apple-watchos2.0 %s 2>&1 | %FileCheck -check-prefix=TSAN_watchOS %s +// RUN: not %swiftc_driver -driver-print-jobs -sanitize=thread -target x86_64-unknown-linux-gnu %s 2>&1 | %FileCheck -check-prefix=TSAN_LINUX %s + +// RUN: not %swiftc_driver -driver-print-jobs -sanitize=address,unknown %s 2>&1 | %FileCheck -check-prefix=BADARG %s +// RUN: not %swiftc_driver -driver-print-jobs -sanitize=address -sanitize=unknown %s 2>&1 | %FileCheck -check-prefix=BADARG %s +// RUN: not %swiftc_driver -driver-print-jobs -sanitize=address,thread %s 2>&1 | %FileCheck -check-prefix=INCOMPATIBLESANITIZERS %s // ASAN: swift // ASAN: -sanitize=address diff --git a/test/Driver/sdk-apple.swift b/test/Driver/sdk-apple.swift index c4c67dca2c820..6100cf25736a2 100644 --- a/test/Driver/sdk-apple.swift +++ b/test/Driver/sdk-apple.swift @@ -4,70 +4,70 @@ // RUN: rm -rf %t && mkdir -p %t/usr/bin/ // RUN: cp %S/Inputs/xcrun-bad.sh %t/usr/bin/xcrun -// RUN: env PATH=%t/usr/bin %swift_driver_plain -deprecated-integrated-repl -### | FileCheck -check-prefix=NOSDK %s -// RUN: env PATH=%t/usr/bin %swift_driver_plain -### %s | FileCheck -check-prefix=NOSDK %s +// RUN: env PATH=%t/usr/bin %swift_driver_plain -deprecated-integrated-repl -### | %FileCheck -check-prefix=NOSDK %s +// RUN: env PATH=%t/usr/bin %swift_driver_plain -### %s | %FileCheck -check-prefix=NOSDK %s // NOSDK-NOT: -sdk // RUN: cp %S/Inputs/xcrun.sh %t/usr/bin/xcrun -// RUN: env PATH=%t/usr/bin %swift_driver_plain -deprecated-integrated-repl -### | FileCheck -check-prefix=XCRUN-SDK %s -// RUN: env PATH=%t/usr/bin %swift_driver_plain -### %s | FileCheck -check-prefix=XCRUN-SDK %s +// RUN: env PATH=%t/usr/bin %swift_driver_plain -deprecated-integrated-repl -### | %FileCheck -check-prefix=XCRUN-SDK %s +// RUN: env PATH=%t/usr/bin %swift_driver_plain -### %s | %FileCheck -check-prefix=XCRUN-SDK %s // XCRUN-SDK: -sdk /path/to/sdk // RUN: cp %S/Inputs/xcrun-empty.sh %t/usr/bin/xcrun -// RUN: env PATH=%t/usr/bin %swift_driver_plain -deprecated-integrated-repl -### | FileCheck -check-prefix=ROOT-SDK %s -// RUN: env PATH=%t/usr/bin %swift_driver_plain -### %s | FileCheck -check-prefix=ROOT-SDK %s +// RUN: env PATH=%t/usr/bin %swift_driver_plain -deprecated-integrated-repl -### | %FileCheck -check-prefix=ROOT-SDK %s +// RUN: env PATH=%t/usr/bin %swift_driver_plain -### %s | %FileCheck -check-prefix=ROOT-SDK %s // ROOT-SDK: -sdk /{{ |$}} // RUN: rm -rf %t && mkdir %t -// RUN: mkdir %t/MacOSX10.8.sdk && not %swift_driver -sdk %t/MacOSX10.8.sdk -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/MacOSX10.9.sdk && not %swift_driver -sdk %t/MacOSX10.9.sdk -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/MacOSX10.9.Internal.sdk && not %swift_driver -sdk %t/MacOSX10.9.Internal.sdk -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/MacOSX10.10.sdk && not %swift_driver -sdk %t/MacOSX10.10.sdk -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/MacOSX10.10.Internal.sdk && not %swift_driver -sdk %t/MacOSX10.10.Internal.sdk -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/MacOSX10.11.sdk && not %swift_driver -sdk %t/MacOSX10.11.sdk -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/MacOSX10.11.Internal.sdk && not %swift_driver -sdk %t/MacOSX10.11.Internal.sdk -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/MacOSX10.12.sdk && %swift_driver -sdk %t/MacOSX10.12.sdk -### 2>&1 | FileCheck -check-prefix=SDK-OKAY %s -// RUN: mkdir %t/OSX12.sdk && %swift_driver -sdk %t/OSX12.sdk -### 2>&1 | FileCheck -check-prefix=SDK-OKAY %s - -// RUN: not %swift_driver -sdk %t/MacOSX10.9.sdk/ -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: not %swift_driver -sdk %t/MacOSX10.9.Internal.sdk/ -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: not %swift_driver -sdk %t/MacOSX10.10.sdk/ -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: not %swift_driver -sdk %t/MacOSX10.10.Internal.sdk/ -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: not %swift_driver -sdk %t/MacOSX10.11.sdk/ -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: not %swift_driver -sdk %t/MacOSX10.11.Internal.sdk/ -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: %swift_driver -sdk %t/MacOSX10.12.sdk/ -### 2>&1 | FileCheck -check-prefix=SDK-OKAY %s -// RUN: %swift_driver -sdk %t/MacOSX10.12.Internal.sdk/ -### 2>&1 | FileCheck -check-prefix=SDK-OKAY %s - -// RUN: mkdir %t/iPhoneOS7.0.sdk && not %swift_driver -sdk %t/iPhoneOS7.0.sdk -target x86_64-apple-ios7 -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/iPhoneOS7.0.Internal.sdk && not %swift_driver -sdk %t/iPhoneOS7.0.Internal.sdk -target x86_64-apple-ios7 -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/iPhoneOS8.0.sdk && not %swift_driver -sdk %t/iPhoneOS8.0.sdk -target x86_64-apple-ios7 -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/iPhoneOS8.0.Internal.sdk && not %swift_driver -sdk %t/iPhoneOS8.0.Internal.sdk -target x86_64-apple-ios7 -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/iPhoneOS9.0.sdk && not %swift_driver -sdk %t/iPhoneOS9.0.sdk -target x86_64-apple-ios7 -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/iPhoneOS10.0.sdk && %swift_driver -sdk %t/iPhoneOS10.0.sdk -target x86_64-apple-ios7 -### 2>&1 | FileCheck -check-prefix=SDK-OKAY %s - -// RUN: mkdir %t/tvOS8.0.sdk && not %swift_driver -sdk %t/tvOS8.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/tvOS8.0.Internal.sdk && not %swift_driver -sdk %t/tvOS8.0.Internal.sdk -target x86_64-apple-tvos9 -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/tvOS9.0.sdk && not %swift_driver -sdk %t/tvOS9.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/tvOS10.0.sdk && %swift_driver -sdk %t/tvOS10.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | FileCheck -check-prefix=SDK-OKAY %s - -// RUN: mkdir %t/watchOS1.0.sdk && not %swift_driver -sdk %t/watchOS1.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/watchOS1.0.Internal.sdk && not %swift_driver -sdk %t/watchOS1.0.Internal.sdk -target x86_64-apple-watchos2 -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/watchOS2.0.sdk && not %swift_driver -sdk %t/watchOS2.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/watchOS3.0.sdk && %swift_driver -sdk %t/watchOS3.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | FileCheck -check-prefix=SDK-OKAY %s - -// RUN: mkdir %t/iPhoneSimulator7.0.sdk && not %swift_driver -sdk %t/iPhoneSimulator7.0.sdk -target x86_64-apple-ios7 -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/iPhoneSimulator8.0.sdk && not %swift_driver -sdk %t/iPhoneSimulator8.0.sdk -target x86_64-apple-ios7 -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/AppleTVSimulator8.0.sdk && not %swift_driver -sdk %t/AppleTVSimulator8.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s -// RUN: mkdir %t/WatchSimulator1.0.sdk && not %swift_driver -sdk %t/WatchSimulator1.0.sdk -target i386-apple-watchos2 -### 2>&1 | FileCheck -check-prefix=SDK-TOO-OLD %s - -// RUN: mkdir %t/iPhoneOS.sdk && %swift_driver -sdk %t/iPhoneOS.sdk -target x86_64-apple-ios7 -### 2>&1 | FileCheck -check-prefix=SDK-OKAY %s -// RUN: mkdir %t/tvOS.sdk && %swift_driver -sdk %t/tvOS.sdk -target x86_64-apple-tvos9 -### 2>&1 | FileCheck -check-prefix=SDK-OKAY %s -// RUN: mkdir %t/watchOS.sdk && %swift_driver -sdk %t/watchOS.sdk -target x86_64-apple-watchos2 -### 2>&1 | FileCheck -check-prefix=SDK-OKAY %s - -// RUN: mkdir %t/custom-sdk && %swift_driver -sdk %t/custom-sdk -### 2>&1 | FileCheck -check-prefix=SDK-OKAY %s +// RUN: mkdir %t/MacOSX10.8.sdk && not %swift_driver -sdk %t/MacOSX10.8.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/MacOSX10.9.sdk && not %swift_driver -sdk %t/MacOSX10.9.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/MacOSX10.9.Internal.sdk && not %swift_driver -sdk %t/MacOSX10.9.Internal.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/MacOSX10.10.sdk && not %swift_driver -sdk %t/MacOSX10.10.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/MacOSX10.10.Internal.sdk && not %swift_driver -sdk %t/MacOSX10.10.Internal.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/MacOSX10.11.sdk && not %swift_driver -sdk %t/MacOSX10.11.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/MacOSX10.11.Internal.sdk && not %swift_driver -sdk %t/MacOSX10.11.Internal.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/MacOSX10.12.sdk && %swift_driver -sdk %t/MacOSX10.12.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s +// RUN: mkdir %t/OSX12.sdk && %swift_driver -sdk %t/OSX12.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s + +// RUN: not %swift_driver -sdk %t/MacOSX10.9.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: not %swift_driver -sdk %t/MacOSX10.9.Internal.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: not %swift_driver -sdk %t/MacOSX10.10.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: not %swift_driver -sdk %t/MacOSX10.10.Internal.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: not %swift_driver -sdk %t/MacOSX10.11.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: not %swift_driver -sdk %t/MacOSX10.11.Internal.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: %swift_driver -sdk %t/MacOSX10.12.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s +// RUN: %swift_driver -sdk %t/MacOSX10.12.Internal.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s + +// RUN: mkdir %t/iPhoneOS7.0.sdk && not %swift_driver -sdk %t/iPhoneOS7.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/iPhoneOS7.0.Internal.sdk && not %swift_driver -sdk %t/iPhoneOS7.0.Internal.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/iPhoneOS8.0.sdk && not %swift_driver -sdk %t/iPhoneOS8.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/iPhoneOS8.0.Internal.sdk && not %swift_driver -sdk %t/iPhoneOS8.0.Internal.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/iPhoneOS9.0.sdk && not %swift_driver -sdk %t/iPhoneOS9.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/iPhoneOS10.0.sdk && %swift_driver -sdk %t/iPhoneOS10.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s + +// RUN: mkdir %t/tvOS8.0.sdk && not %swift_driver -sdk %t/tvOS8.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/tvOS8.0.Internal.sdk && not %swift_driver -sdk %t/tvOS8.0.Internal.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/tvOS9.0.sdk && not %swift_driver -sdk %t/tvOS9.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/tvOS10.0.sdk && %swift_driver -sdk %t/tvOS10.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s + +// RUN: mkdir %t/watchOS1.0.sdk && not %swift_driver -sdk %t/watchOS1.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/watchOS1.0.Internal.sdk && not %swift_driver -sdk %t/watchOS1.0.Internal.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/watchOS2.0.sdk && not %swift_driver -sdk %t/watchOS2.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/watchOS3.0.sdk && %swift_driver -sdk %t/watchOS3.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s + +// RUN: mkdir %t/iPhoneSimulator7.0.sdk && not %swift_driver -sdk %t/iPhoneSimulator7.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/iPhoneSimulator8.0.sdk && not %swift_driver -sdk %t/iPhoneSimulator8.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/AppleTVSimulator8.0.sdk && not %swift_driver -sdk %t/AppleTVSimulator8.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s +// RUN: mkdir %t/WatchSimulator1.0.sdk && not %swift_driver -sdk %t/WatchSimulator1.0.sdk -target i386-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s + +// RUN: mkdir %t/iPhoneOS.sdk && %swift_driver -sdk %t/iPhoneOS.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s +// RUN: mkdir %t/tvOS.sdk && %swift_driver -sdk %t/tvOS.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s +// RUN: mkdir %t/watchOS.sdk && %swift_driver -sdk %t/watchOS.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s + +// RUN: mkdir %t/custom-sdk && %swift_driver -sdk %t/custom-sdk -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s // SDK-TOO-OLD: error: Swift does not support the SDK '{{.+}}.sdk'{{$}} // SDK-OKAY: -sdk {{.*}}/{{[^/ ]+}}sdk diff --git a/test/Driver/sdk-link.swift b/test/Driver/sdk-link.swift index a3b1cbdbd75db..d568fedb65c61 100644 --- a/test/Driver/sdk-link.swift +++ b/test/Driver/sdk-link.swift @@ -2,7 +2,7 @@ // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -o %t/test.swiftmodule %s // RUN: %target-build-swift -g -o %t/sdk-link %s -// RUN: %target-run %t/sdk-link | FileCheck %s +// RUN: %target-run %t/sdk-link | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Driver/sdk.swift b/test/Driver/sdk.swift index 7c54a4fb439c3..64e11d264af2f 100644 --- a/test/Driver/sdk.swift +++ b/test/Driver/sdk.swift @@ -1,10 +1,10 @@ -// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -g -sdk %S/../Inputs/clang-importer-sdk %s 2>&1 | FileCheck %s --check-prefix OSX -// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-linux-gnu -g -sdk %S/../Inputs/clang-importer-sdk %s 2>&1 | FileCheck %s --check-prefix LINUX -// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-freebsd -g -sdk %S/../Inputs/clang-importer-sdk %s 2>&1 | FileCheck %s --check-prefix FREEBSD +// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -g -sdk %S/../Inputs/clang-importer-sdk %s 2>&1 | %FileCheck %s --check-prefix OSX +// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-linux-gnu -g -sdk %S/../Inputs/clang-importer-sdk %s 2>&1 | %FileCheck %s --check-prefix LINUX +// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-freebsd -g -sdk %S/../Inputs/clang-importer-sdk %s 2>&1 | %FileCheck %s --check-prefix FREEBSD -// RUN: env SDKROOT=%S/../Inputs/clang-importer-sdk %swiftc_driver_plain -target x86_64-apple-macosx10.9 -g -driver-print-jobs %s 2>&1 | FileCheck %s --check-prefix OSX -// RUN: env SDKROOT=%S/../Inputs/clang-importer-sdk %swiftc_driver_plain -target x86_64-unknown-linux-gnu -g -driver-print-jobs %s 2>&1 | FileCheck %s --check-prefix LINUX -// RUN: env SDKROOT=%S/../Inputs/clang-importer-sdk %swiftc_driver_plain -target x86_64-unknown-freebsd -g -driver-print-jobs %s 2>&1 | FileCheck %s --check-prefix FREEBSD +// RUN: env SDKROOT=%S/../Inputs/clang-importer-sdk %swiftc_driver_plain -target x86_64-apple-macosx10.9 -g -driver-print-jobs %s 2>&1 | %FileCheck %s --check-prefix OSX +// RUN: env SDKROOT=%S/../Inputs/clang-importer-sdk %swiftc_driver_plain -target x86_64-unknown-linux-gnu -g -driver-print-jobs %s 2>&1 | %FileCheck %s --check-prefix LINUX +// RUN: env SDKROOT=%S/../Inputs/clang-importer-sdk %swiftc_driver_plain -target x86_64-unknown-freebsd -g -driver-print-jobs %s 2>&1 | %FileCheck %s --check-prefix FREEBSD // OSX-NOT: warning: no such SDK: // OSX: bin/swift @@ -35,13 +35,13 @@ // FREEBSD: {{-syslibroot|--sysroot}} {{.*}}/Inputs/clang-importer-sdk // FREEBSD: {{.*}}swift_end.o -// RUN: %swift_driver -driver-print-jobs -repl -sdk %S/Inputs/nonexistent-sdk 2>&1 | FileCheck %s --check-prefix=SDKWARNING -// RUN: %swift_driver -driver-print-jobs -sdk %S/Inputs/nonexistent-sdk 2>&1 | FileCheck %s --check-prefix=SDKWARNING -// RUN: env SDKROOT=%S/Inputs/nonexistent-sdk %swift_driver_plain -driver-print-jobs -repl 2>&1 | FileCheck %s --check-prefix=SDKWARNING +// RUN: %swift_driver -driver-print-jobs -repl -sdk %S/Inputs/nonexistent-sdk 2>&1 | %FileCheck %s --check-prefix=SDKWARNING +// RUN: %swift_driver -driver-print-jobs -sdk %S/Inputs/nonexistent-sdk 2>&1 | %FileCheck %s --check-prefix=SDKWARNING +// RUN: env SDKROOT=%S/Inputs/nonexistent-sdk %swift_driver_plain -driver-print-jobs -repl 2>&1 | %FileCheck %s --check-prefix=SDKWARNING // SDKWARNING: warning: no such SDK: '{{.*}}/Inputs/nonexistent-sdk' // SDKWARNING: -sdk {{.*}}/Inputs/nonexistent-sdk -// RUN: %swiftc_driver -driver-print-jobs -parse -sdk %S/../Inputs/clang-importer-sdk -module-cache-path /path/to/cache %s 2>&1 | FileCheck %s --check-prefix=CACHE-PATH +// RUN: %swiftc_driver -driver-print-jobs -parse -sdk %S/../Inputs/clang-importer-sdk -module-cache-path /path/to/cache %s 2>&1 | %FileCheck %s --check-prefix=CACHE-PATH // CACHE-PATH: -module-cache-path /path/to/cache diff --git a/test/Driver/static-stdlib-linux.swift b/test/Driver/static-stdlib-linux.swift index a52c2939e0d3b..47cbdfdecc8b1 100644 --- a/test/Driver/static-stdlib-linux.swift +++ b/test/Driver/static-stdlib-linux.swift @@ -4,7 +4,7 @@ print("hello world!") // RUN: rm -rf %t && mkdir %t // RUN: %target-swiftc_driver -static-stdlib -o %t/static-stdlib %s -// RUN: %t/static-stdlib | FileCheck %s -// RUN: ldd %t/static-stdlib | FileCheck %s --check-prefix=LDD +// RUN: %t/static-stdlib | %FileCheck %s +// RUN: ldd %t/static-stdlib | %FileCheck %s --check-prefix=LDD // CHECK: hello world! // LDD-NOT: libswiftCore.so diff --git a/test/Driver/static-stdlib.swift b/test/Driver/static-stdlib.swift index 503822ccb30f4..bf6cbd87f261b 100644 --- a/test/Driver/static-stdlib.swift +++ b/test/Driver/static-stdlib.swift @@ -4,7 +4,7 @@ print("hello world!") // RUN: rm -rf %t && mkdir %t // RUN: %target-build-swift -static-stdlib -o %t/static-stdlib %s -// RUN: %target-run %t/static-stdlib | FileCheck %s -// RUN: otool -L %t/static-stdlib | FileCheck %s --check-prefix=OTOOL +// RUN: %target-run %t/static-stdlib | %FileCheck %s +// RUN: otool -L %t/static-stdlib | %FileCheck %s --check-prefix=OTOOL // CHECK: hello world! // OTOOL-NOT: libswiftCore.dylib diff --git a/test/Driver/subcommands.swift b/test/Driver/subcommands.swift index feebed52feb10..aef6109cef717 100644 --- a/test/Driver/subcommands.swift +++ b/test/Driver/subcommands.swift @@ -2,9 +2,9 @@ // // REQUIRES: swift_interpreter // -// RUN: %swift_driver_plain -### 2>&1 | FileCheck -check-prefix=CHECK-SWIFT-INVOKES-REPL %s -// RUN: %swift_driver_plain run -### 2>&1 | FileCheck -check-prefix=CHECK-SWIFT-INVOKES-REPL %s -// RUN: %swift_driver_plain repl -### 2>&1 | FileCheck -check-prefix=CHECK-SWIFT-INVOKES-REPL %s +// RUN: %swift_driver_plain -### 2>&1 | %FileCheck -check-prefix=CHECK-SWIFT-INVOKES-REPL %s +// RUN: %swift_driver_plain run -### 2>&1 | %FileCheck -check-prefix=CHECK-SWIFT-INVOKES-REPL %s +// RUN: %swift_driver_plain repl -### 2>&1 | %FileCheck -check-prefix=CHECK-SWIFT-INVOKES-REPL %s // // CHECK-SWIFT-INVOKES-REPL: {{.*}}/swift -frontend -repl @@ -18,11 +18,11 @@ // RUN: echo "print(\"exec: \" + #file)" > %t.dir/stdin // RUN: echo "print(\"exec: \" + #file)" > %t.dir/t.swift // RUN: echo "print(\"exec: \" + #file)" > %t.dir/subpath/build -// RUN: cd %t.dir && %swift_driver_plain - < %t.dir/stdin -### 2>&1 | FileCheck -check-prefix=CHECK-SWIFT-STDIN-INVOKES-INTERPRETER %s +// RUN: cd %t.dir && %swift_driver_plain - < %t.dir/stdin -### 2>&1 | %FileCheck -check-prefix=CHECK-SWIFT-STDIN-INVOKES-INTERPRETER %s // CHECK-SWIFT-STDIN-INVOKES-INTERPRETER: exec: -// RUN: cd %t.dir && %swift_driver_plain t.swift -### 2>&1 | FileCheck -check-prefix=CHECK-SWIFT-SUFFIX-INVOKES-INTERPRETER %s +// RUN: cd %t.dir && %swift_driver_plain t.swift -### 2>&1 | %FileCheck -check-prefix=CHECK-SWIFT-SUFFIX-INVOKES-INTERPRETER %s // CHECK-SWIFT-SUFFIX-INVOKES-INTERPRETER: exec: t.swift -// RUN: cd %t.dir && %swift_driver_plain subpath/build -### 2>&1 | FileCheck -check-prefix=CHECK-SWIFT-PATH-INVOKES-INTERPRETER %s +// RUN: cd %t.dir && %swift_driver_plain subpath/build -### 2>&1 | %FileCheck -check-prefix=CHECK-SWIFT-PATH-INVOKES-INTERPRETER %s // CHECK-SWIFT-PATH-INVOKES-INTERPRETER: exec: subpath/build @@ -33,5 +33,5 @@ // RUN: echo "#!/bin/sh" > %t.dir/swift-foo // RUN: echo "echo \"exec: \$0\"" >> %t.dir/swift-foo // RUN: chmod +x %t.dir/swift-foo -// RUN: env PATH=%t.dir %swift_driver_plain foo | FileCheck -check-prefix=CHECK-SWIFT-SUBCOMMAND %s +// RUN: env PATH=%t.dir %swift_driver_plain foo | %FileCheck -check-prefix=CHECK-SWIFT-SUBCOMMAND %s // CHECK-SWIFT-SUBCOMMAND: exec: {{.*}}/swift-foo diff --git a/test/Driver/temp-files.swift b/test/Driver/temp-files.swift index f41f7005bd563..3fa22f74b9df7 100644 --- a/test/Driver/temp-files.swift +++ b/test/Driver/temp-files.swift @@ -4,7 +4,7 @@ // RUN: rm -rf %t && mkdir -p %t/tmp/ && touch %t/tmp/dummy // RUN: env TMPDIR=%t/tmp/ %target-swiftc_driver -emit-executable %s -o %t/main // RUN: ls %t/main -// RUN: ls %t/tmp | FileCheck -check-prefix=EMPTY %s +// RUN: ls %t/tmp | %FileCheck -check-prefix=EMPTY %s // EMPTY-NOT: .{{(o|swiftmodule|swiftdoc)}} @@ -12,19 +12,19 @@ // RUN: env TMPDIR=%t/tmp/ %swiftc_driver -target %target-triple -sdk %sdk -module-cache-path %t -emit-executable %s -o %t/main2 -emit-module-path %t/main2.swiftmodule // RUN: ls %t/main2 // RUN: ls %t/main2.swiftmodule -// RUN: ls %t/tmp | FileCheck -check-prefix=EMPTY %s +// RUN: ls %t/tmp | %FileCheck -check-prefix=EMPTY %s // RUN: rm -rf %t && mkdir -p %t/tmp/ && touch %t/tmp/dummy // RUN: env TMPDIR=%t/tmp/ %swiftc_driver -target %target-triple -sdk %sdk -module-cache-path %t -emit-executable %s -o %t/main3 -g // RUN: ls %t/main3 -// RUN: ls %t/tmp | FileCheck -check-prefix=EMPTY %s +// RUN: ls %t/tmp | %FileCheck -check-prefix=EMPTY %s // RUN: rm -rf %t && mkdir -p %t/tmp/ && touch %t/tmp/dummy // RUN: env TMPDIR=%t/tmp/ %swiftc_driver -target %target-triple -sdk %sdk -module-cache-path %t -emit-executable %s -o %t/main4 -emit-module-path %t/main4.swiftmodule -g // RUN: ls %t/main4 // RUN: ls %t/main4.swiftmodule -// RUN: ls %t | FileCheck -check-prefix=MAIN4-%target-object-format %s -// RUN: ls %t/tmp | FileCheck -check-prefix=EMPTY %s +// RUN: ls %t | %FileCheck -check-prefix=MAIN4-%target-object-format %s +// RUN: ls %t/tmp | %FileCheck -check-prefix=EMPTY %s // MAIN4-macho: main4.dSYM // MAIN4-elf-NOT: .dSYM @@ -34,8 +34,8 @@ // RUN: env TMPDIR=%t/tmp/ %swiftc_driver -target %target-triple -sdk %sdk -module-cache-path %t -emit-executable %s -o %t/main5 -output-file-map %t.json -g // RUN: ls %t/main5 // RUN: ls %t/main5.o -// RUN: ls %t | FileCheck -check-prefix=MAIN5-%target-object-format %s -// RUN: ls %t/tmp | FileCheck -check-prefix=EMPTY %s +// RUN: ls %t | %FileCheck -check-prefix=MAIN5-%target-object-format %s +// RUN: ls %t/tmp | %FileCheck -check-prefix=EMPTY %s // MAIN5-macho: main5.dSYM // MAIN5-elf-NOT: .dSYM @@ -43,9 +43,9 @@ // RUN: rm -rf %t && mkdir -p %t/tmp/ && touch %t/tmp/dummy // RUN: env TMPDIR=%t/tmp/ %swiftc_driver -target %target-triple -sdk %sdk -module-cache-path %t -emit-executable %s -o %t/main6 -g -save-temps // RUN: ls %t/main6 -// RUN: ls %t | FileCheck -check-prefix=MAIN6-%target-object-format %s -// RUN: ls %t/tmp | FileCheck -check-prefix=SAVE-TEMPS %s -// RUN: ls %t/tmp | FileCheck -check-prefix=SAVE-TEMPS-%target-object-format %s +// RUN: ls %t | %FileCheck -check-prefix=MAIN6-%target-object-format %s +// RUN: ls %t/tmp | %FileCheck -check-prefix=SAVE-TEMPS %s +// RUN: ls %t/tmp | %FileCheck -check-prefix=SAVE-TEMPS-%target-object-format %s // MAIN6-macho: main6.dSYM // MAIN6-elf-NOT: .dSYM diff --git a/test/Driver/unknown-inputs.swift b/test/Driver/unknown-inputs.swift index 34e092302b612..ab06ae3d639fa 100644 --- a/test/Driver/unknown-inputs.swift +++ b/test/Driver/unknown-inputs.swift @@ -10,11 +10,11 @@ // COMPILE: 0: input // COMPILE: 1: compile, {0}, object -// RUN: %swiftc_driver -driver-print-actions %t/empty 2>&1 | FileCheck -check-prefix=LINK-%target-object-format %s -// RUN: not %swiftc_driver -driver-print-actions %t/empty.swiftmodule 2>&1 | FileCheck -check-prefix=ERROR %s -// RUN: %swiftc_driver -driver-print-actions %t/empty.o 2>&1 | FileCheck -check-prefix=LINK-%target-object-format %s -// RUN: not %swiftc_driver -driver-print-actions %t/empty.h 2>&1 | FileCheck -check-prefix=ERROR %s -// RUN: %swiftc_driver -driver-print-actions %t/empty.swift 2>&1 | FileCheck -check-prefix=COMPILE %s +// RUN: %swiftc_driver -driver-print-actions %t/empty 2>&1 | %FileCheck -check-prefix=LINK-%target-object-format %s +// RUN: not %swiftc_driver -driver-print-actions %t/empty.swiftmodule 2>&1 | %FileCheck -check-prefix=ERROR %s +// RUN: %swiftc_driver -driver-print-actions %t/empty.o 2>&1 | %FileCheck -check-prefix=LINK-%target-object-format %s +// RUN: not %swiftc_driver -driver-print-actions %t/empty.h 2>&1 | %FileCheck -check-prefix=ERROR %s +// RUN: %swiftc_driver -driver-print-actions %t/empty.swift 2>&1 | %FileCheck -check-prefix=COMPILE %s // LINK-macho: 0: input // LINK-macho: 1: link, {0}, image @@ -23,17 +23,17 @@ // LINK-elf: 1: swift-autolink-extract, {0}, autolink // LINK-elf: 2: link, {0, 1}, image -// RUN: not %swiftc_driver -driver-print-actions -emit-module %t/empty 2>&1 | FileCheck -check-prefix=ERROR %s -// RUN: %swiftc_driver -driver-print-actions -emit-module %t/empty.swiftmodule 2>&1 | FileCheck -check-prefix=MODULE %s -// RUN: not %swiftc_driver -driver-print-actions -emit-module %t/empty.o 2>&1 | FileCheck -check-prefix=ERROR %s -// RUN: not %swiftc_driver -driver-print-actions -emit-module %t/empty.h 2>&1 | FileCheck -check-prefix=ERROR %s -// RUN: %swiftc_driver -driver-print-actions %t/empty.swift 2>&1 | FileCheck -check-prefix=COMPILE %s +// RUN: not %swiftc_driver -driver-print-actions -emit-module %t/empty 2>&1 | %FileCheck -check-prefix=ERROR %s +// RUN: %swiftc_driver -driver-print-actions -emit-module %t/empty.swiftmodule 2>&1 | %FileCheck -check-prefix=MODULE %s +// RUN: not %swiftc_driver -driver-print-actions -emit-module %t/empty.o 2>&1 | %FileCheck -check-prefix=ERROR %s +// RUN: not %swiftc_driver -driver-print-actions -emit-module %t/empty.h 2>&1 | %FileCheck -check-prefix=ERROR %s +// RUN: %swiftc_driver -driver-print-actions %t/empty.swift 2>&1 | %FileCheck -check-prefix=COMPILE %s // MODULE: 0: input // MODULE: 1: merge-module, {0}, swiftmodule -// RUN: not %swiftc_driver -driver-print-actions -parse %t/empty 2>&1 | FileCheck -check-prefix=ERROR %s -// RUN: not %swiftc_driver -driver-print-actions -parse %t/empty.swiftmodule 2>&1 | FileCheck -check-prefix=ERROR %s -// RUN: not %swiftc_driver -driver-print-actions -parse %t/empty.o 2>&1 | FileCheck -check-prefix=ERROR %s -// RUN: not %swiftc_driver -driver-print-actions -parse %t/empty.h 2>&1 | FileCheck -check-prefix=ERROR %s -// RUN: %swiftc_driver -driver-print-actions %t/empty.swift 2>&1 | FileCheck -check-prefix=COMPILE %s +// RUN: not %swiftc_driver -driver-print-actions -parse %t/empty 2>&1 | %FileCheck -check-prefix=ERROR %s +// RUN: not %swiftc_driver -driver-print-actions -parse %t/empty.swiftmodule 2>&1 | %FileCheck -check-prefix=ERROR %s +// RUN: not %swiftc_driver -driver-print-actions -parse %t/empty.o 2>&1 | %FileCheck -check-prefix=ERROR %s +// RUN: not %swiftc_driver -driver-print-actions -parse %t/empty.h 2>&1 | %FileCheck -check-prefix=ERROR %s +// RUN: %swiftc_driver -driver-print-actions %t/empty.swift 2>&1 | %FileCheck -check-prefix=COMPILE %s diff --git a/test/Driver/warnings-control.swift b/test/Driver/warnings-control.swift index d512aa395a285..e99b23028ab83 100644 --- a/test/Driver/warnings-control.swift +++ b/test/Driver/warnings-control.swift @@ -1,8 +1,8 @@ -// RUN: not %target-swiftc_driver %s 2>&1 | FileCheck -check-prefix=DEFAULT %s -// RUN: not %target-swiftc_driver -warnings-as-errors %s 2>&1 | FileCheck -check-prefix=WERR %s -// RUN: not %target-swiftc_driver -suppress-warnings %s 2>&1 | FileCheck -check-prefix=NOWARN %s +// RUN: not %target-swiftc_driver %s 2>&1 | %FileCheck -check-prefix=DEFAULT %s +// RUN: not %target-swiftc_driver -warnings-as-errors %s 2>&1 | %FileCheck -check-prefix=WERR %s +// RUN: not %target-swiftc_driver -suppress-warnings %s 2>&1 | %FileCheck -check-prefix=NOWARN %s -// RUN: not %target-swiftc_driver -suppress-warnings -warnings-as-errors %s 2>&1 | FileCheck -check-prefix=FLAGS_CONFLICT %s +// RUN: not %target-swiftc_driver -suppress-warnings -warnings-as-errors %s 2>&1 | %FileCheck -check-prefix=FLAGS_CONFLICT %s // FLAGS_CONFLICT: error: conflicting options '-warnings-as-errors' and '-suppress-warnings' func foo() -> Int { diff --git a/test/FixCode/multi-inputs.swift b/test/FixCode/multi-inputs.swift index 3cdedf2702844..caa884069c4c0 100644 --- a/test/FixCode/multi-inputs.swift +++ b/test/FixCode/multi-inputs.swift @@ -2,7 +2,7 @@ // RUN: echo "{\"%S/Inputs/t1.swift\": {\"remap\": \"%t.out/t1.remap\"}, \"%S/Inputs/t2.swift\": {\"remap\": \"%t.out/t2.remap\"}}" > %t.json // RUN: not %swiftc_driver -target %target-triple -module-name Blah -fixit-code %S/Inputs/t1.swift %S/Inputs/t2.swift -emit-module -emit-module-path %t.mod -emit-objc-header -emit-objc-header-path %t.h -j 1 -output-file-map %t.json 2> %t.err.txt // RUN: c-arcmt-test %t.out/t1.remap %t.out/t2.remap | arcmt-test -verify-transformed-files %S/Inputs/t1.swift.result %S/Inputs/t2.swift.result -// RUN: FileCheck --input-file=%t.err.txt %s +// RUN: %FileCheck --input-file=%t.err.txt %s // CHECK: error: use of unresolved identifier 'undeclared_foo1' // CHECK: error: use of unresolved identifier 'undeclared_foo2' diff --git a/test/Frontend/InternalChecks.swift b/test/Frontend/InternalChecks.swift index 80f91e3b42ecc..eec55a907ce99 100644 --- a/test/Frontend/InternalChecks.swift +++ b/test/Frontend/InternalChecks.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -O -parse-stdlib -D INTERNAL_CHECKS_ENABLED -primary-file %s -emit-sil | FileCheck %s --check-prefix=CHECKS -// RUN: %target-swift-frontend -O -parse-stdlib -primary-file %s -emit-sil | FileCheck %s --check-prefix=NOCHECKS +// RUN: %target-swift-frontend -O -parse-stdlib -D INTERNAL_CHECKS_ENABLED -primary-file %s -emit-sil | %FileCheck %s --check-prefix=CHECKS +// RUN: %target-swift-frontend -O -parse-stdlib -primary-file %s -emit-sil | %FileCheck %s --check-prefix=NOCHECKS import Swift diff --git a/test/Frontend/OptimizationOptions-with-stdlib-checks.swift b/test/Frontend/OptimizationOptions-with-stdlib-checks.swift index 747e9d3eb6683..cd7ba2814e55e 100644 --- a/test/Frontend/OptimizationOptions-with-stdlib-checks.swift +++ b/test/Frontend/OptimizationOptions-with-stdlib-checks.swift @@ -1,7 +1,7 @@ -// RUN: %target-swift-frontend -module-name OptimizationOptions -Onone -emit-sil -primary-file %s 2>&1 | FileCheck %s --check-prefix=DEBUG -// RUN: %target-swift-frontend -module-name OptimizationOptions -O -emit-sil -primary-file %s 2>&1 | FileCheck %s --check-prefix=RELEASE -// RUN: %target-swift-frontend -module-name OptimizationOptions -Ounchecked -emit-sil -primary-file %s 2>&1 | FileCheck %s --check-prefix=UNCHECKED -// RUN: %target-swift-frontend -module-name OptimizationOptions -Oplayground -emit-sil -primary-file %s 2>&1 | FileCheck %s --check-prefix=PLAYGROUND +// RUN: %target-swift-frontend -module-name OptimizationOptions -Onone -emit-sil -primary-file %s 2>&1 | %FileCheck %s --check-prefix=DEBUG +// RUN: %target-swift-frontend -module-name OptimizationOptions -O -emit-sil -primary-file %s 2>&1 | %FileCheck %s --check-prefix=RELEASE +// RUN: %target-swift-frontend -module-name OptimizationOptions -Ounchecked -emit-sil -primary-file %s 2>&1 | %FileCheck %s --check-prefix=UNCHECKED +// RUN: %target-swift-frontend -module-name OptimizationOptions -Oplayground -emit-sil -primary-file %s 2>&1 | %FileCheck %s --check-prefix=PLAYGROUND // REQUIRES: optimized_stdlib // REQUIRES: swift_stdlib_asserts diff --git a/test/Frontend/OptimizationOptions-without-stdlib-checks.swift b/test/Frontend/OptimizationOptions-without-stdlib-checks.swift index 0adace8550bc6..8b9b11eb8384d 100644 --- a/test/Frontend/OptimizationOptions-without-stdlib-checks.swift +++ b/test/Frontend/OptimizationOptions-without-stdlib-checks.swift @@ -1,7 +1,7 @@ -// RUN: %target-swift-frontend -module-name OptimizationOptions -Onone -emit-sil -primary-file %s 2>&1 | FileCheck %s --check-prefix=DEBUG -// RUN: %target-swift-frontend -module-name OptimizationOptions -O -emit-sil -primary-file %s 2>&1 | FileCheck %s --check-prefix=RELEASE -// RUN: %target-swift-frontend -module-name OptimizationOptions -Ounchecked -emit-sil -primary-file %s 2>&1 | FileCheck %s --check-prefix=UNCHECKED -// RUN: %target-swift-frontend -module-name OptimizationOptions -Oplayground -emit-sil -primary-file %s 2>&1 | FileCheck %s --check-prefix=PLAYGROUND +// RUN: %target-swift-frontend -module-name OptimizationOptions -Onone -emit-sil -primary-file %s 2>&1 | %FileCheck %s --check-prefix=DEBUG +// RUN: %target-swift-frontend -module-name OptimizationOptions -O -emit-sil -primary-file %s 2>&1 | %FileCheck %s --check-prefix=RELEASE +// RUN: %target-swift-frontend -module-name OptimizationOptions -Ounchecked -emit-sil -primary-file %s 2>&1 | %FileCheck %s --check-prefix=UNCHECKED +// RUN: %target-swift-frontend -module-name OptimizationOptions -Oplayground -emit-sil -primary-file %s 2>&1 | %FileCheck %s --check-prefix=PLAYGROUND // REQUIRES: optimized_stdlib // REQUIRES: swift_stdlib_asserts diff --git a/test/Frontend/Xllvm.swift b/test/Frontend/Xllvm.swift index b6fd994d0aa16..fe19983a994aa 100644 --- a/test/Frontend/Xllvm.swift +++ b/test/Frontend/Xllvm.swift @@ -1,5 +1,5 @@ -// RUN: %swift -repl -Xllvm -help 2>&1 | FileCheck %s --check-prefix=CHECK-HELP +// RUN: %swift -repl -Xllvm -help 2>&1 | %FileCheck %s --check-prefix=CHECK-HELP // CHECK-HELP: -version -// RUN: %swift -Xllvm -version -emit-sil %s 2>&1 | FileCheck %s -check-prefix=CHECK-SIL +// RUN: %swift -Xllvm -version -emit-sil %s 2>&1 | %FileCheck %s -check-prefix=CHECK-SIL // CHECK-SIL: LLVM (http://llvm.org/) diff --git a/test/Frontend/clang-args-diags.swift b/test/Frontend/clang-args-diags.swift index ba9966f26335c..00e319a988900 100644 --- a/test/Frontend/clang-args-diags.swift +++ b/test/Frontend/clang-args-diags.swift @@ -1,10 +1,10 @@ -// RUN: not %swift -Xcc -fake-argument -parse %s 2>&1 | FileCheck %s -check-prefix=CHECK-UNKNOWN-ARG +// RUN: not %swift -Xcc -fake-argument -parse %s 2>&1 | %FileCheck %s -check-prefix=CHECK-UNKNOWN-ARG // CHECK-UNKNOWN-ARG: unknown argument: '-fake-argument' -// RUN: not %swift -Xcc -ivfsoverlay -Xcc %t.nonexistent -parse %s 2>&1 | FileCheck %s -check-prefix=CHECK-VFS-NONEXISTENT +// RUN: not %swift -Xcc -ivfsoverlay -Xcc %t.nonexistent -parse %s 2>&1 | %FileCheck %s -check-prefix=CHECK-VFS-NONEXISTENT // CHECK-VFS-NONEXISTENT: virtual filesystem overlay file '{{.*}}' not found -// RUN: not %swift -Xcc --version -parse %s 2>&1 | FileCheck %s -check-prefix=CHECK-DRIVER-OPTION +// RUN: not %swift -Xcc --version -parse %s 2>&1 | %FileCheck %s -check-prefix=CHECK-DRIVER-OPTION // CHECK-DRIVER-OPTION-DAG: {{clang|LLVM}} version {{[0-9]+\.[0-9]+}} // CHECK-DRIVER-OPTION-DAG: error: unable to handle compilation, expected exactly one compiler job // CHECK-DRIVER-OPTION-DAG: error: clang importer creation failed diff --git a/test/Frontend/dependencies.swift b/test/Frontend/dependencies.swift index a882965151ab8..c8a925b45849d 100644 --- a/test/Frontend/dependencies.swift +++ b/test/Frontend/dependencies.swift @@ -2,12 +2,12 @@ // RUN: rm -rf %t && mkdir %t -// RUN: %target-swift-frontend -emit-dependencies-path - -parse %S/../Inputs/empty\ file.swift | FileCheck -check-prefix=CHECK-BASIC %s -// RUN: %target-swift-frontend -emit-reference-dependencies-path - -parse -primary-file %S/../Inputs/empty\ file.swift | FileCheck -check-prefix=CHECK-BASIC-YAML %s +// RUN: %target-swift-frontend -emit-dependencies-path - -parse %S/../Inputs/empty\ file.swift | %FileCheck -check-prefix=CHECK-BASIC %s +// RUN: %target-swift-frontend -emit-reference-dependencies-path - -parse -primary-file %S/../Inputs/empty\ file.swift | %FileCheck -check-prefix=CHECK-BASIC-YAML %s // RUN: %target-swift-frontend -emit-dependencies-path %t.d -emit-reference-dependencies-path %t.swiftdeps -parse -primary-file %S/../Inputs/empty\ file.swift -// RUN: FileCheck -check-prefix=CHECK-BASIC %s < %t.d -// RUN: FileCheck -check-prefix=CHECK-BASIC-YAML %s < %t.swiftdeps +// RUN: %FileCheck -check-prefix=CHECK-BASIC %s < %t.d +// RUN: %FileCheck -check-prefix=CHECK-BASIC-YAML %s < %t.swiftdeps // CHECK-BASIC-LABEL: - : // CHECK-BASIC: Inputs/empty\ file.swift @@ -20,12 +20,12 @@ // CHECK-BASIC-YAML-NOT: {{:$}} -// RUN: %target-swift-frontend -emit-dependencies-path %t.d -emit-reference-dependencies-path %t.swiftdeps -parse %S/../Inputs/empty\ file.swift 2>&1 | FileCheck -check-prefix=NO-PRIMARY-FILE %s +// RUN: %target-swift-frontend -emit-dependencies-path %t.d -emit-reference-dependencies-path %t.swiftdeps -parse %S/../Inputs/empty\ file.swift 2>&1 | %FileCheck -check-prefix=NO-PRIMARY-FILE %s // NO-PRIMARY-FILE: warning: ignoring -emit-reference-dependencies (requires -primary-file) -// RUN: %target-swift-frontend -emit-dependencies-path - -emit-module %S/../Inputs/empty\ file.swift -o %t/empty\ file.swiftmodule -emit-module-doc-path %t/empty\ file.swiftdoc -emit-objc-header-path %t/empty\ file.h | FileCheck -check-prefix=CHECK-MULTIPLE-OUTPUTS %s +// RUN: %target-swift-frontend -emit-dependencies-path - -emit-module %S/../Inputs/empty\ file.swift -o %t/empty\ file.swiftmodule -emit-module-doc-path %t/empty\ file.swiftdoc -emit-objc-header-path %t/empty\ file.h | %FileCheck -check-prefix=CHECK-MULTIPLE-OUTPUTS %s // CHECK-MULTIPLE-OUTPUTS-LABEL: empty\ file.swiftmodule : // CHECK-MULTIPLE-OUTPUTS: Inputs/empty\ file.swift @@ -38,8 +38,8 @@ // CHECK-MULTIPLE-OUTPUTS: Swift.swiftmodule // CHECK-MULTIPLE-OUTPUTS-NOT: : -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -import-objc-header %S/Inputs/dependencies/extra-header.h -emit-dependencies-path - -parse %s | FileCheck -check-prefix=CHECK-IMPORT %s -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -import-objc-header %S/Inputs/dependencies/extra-header.h -emit-reference-dependencies-path - -parse -primary-file %s | FileCheck -check-prefix=CHECK-IMPORT-YAML %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -import-objc-header %S/Inputs/dependencies/extra-header.h -emit-dependencies-path - -parse %s | %FileCheck -check-prefix=CHECK-IMPORT %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -import-objc-header %S/Inputs/dependencies/extra-header.h -emit-reference-dependencies-path - -parse -primary-file %s | %FileCheck -check-prefix=CHECK-IMPORT-YAML %s // CHECK-IMPORT-LABEL: - : // CHECK-IMPORT: dependencies.swift @@ -66,8 +66,8 @@ // CHECK-IMPORT-YAML-NOT: {{^-}} // CHECK-IMPORT-YAML-NOT: {{:$}} -// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -DERROR -import-objc-header %S/Inputs/dependencies/extra-header.h -emit-dependencies-path - -parse %s | FileCheck -check-prefix=CHECK-IMPORT %s -// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -DERROR -import-objc-header %S/Inputs/dependencies/extra-header.h -emit-reference-dependencies-path - -parse -primary-file %s | FileCheck -check-prefix=CHECK-IMPORT-YAML %s +// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -DERROR -import-objc-header %S/Inputs/dependencies/extra-header.h -emit-dependencies-path - -parse %s | %FileCheck -check-prefix=CHECK-IMPORT %s +// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -DERROR -import-objc-header %S/Inputs/dependencies/extra-header.h -emit-reference-dependencies-path - -parse -primary-file %s | %FileCheck -check-prefix=CHECK-IMPORT-YAML %s import Foundation diff --git a/test/Frontend/embed-bitcode.ll b/test/Frontend/embed-bitcode.ll index 2ca551a93f401..2c60e8884f4fd 100644 --- a/test/Frontend/embed-bitcode.ll +++ b/test/Frontend/embed-bitcode.ll @@ -2,13 +2,13 @@ ; REQUIRES: rdar23493035 ; RUN: llvm-as %s -o %t.bc ; RUN: %swift -target x86_64-apple-darwin10 -c -module-name someModule -embed-bitcode -disable-llvm-optzns -o %t2.o %t.bc -dump-clang-diagnostics 2> %t.diags.txt -; RUN: llvm-objdump -macho -section="__LLVM,__bitcode" %t2.o | FileCheck %s -; RUN: llvm-objdump -macho -section="__LLVM,__swift_cmdline" %t2.o | FileCheck -check-prefix=CHECK-CMD %s -; RUN: FileCheck -check-prefix CHECK-IMPORTER %s < %t.diags.txt +; RUN: llvm-objdump -macho -section="__LLVM,__bitcode" %t2.o | %FileCheck %s +; RUN: llvm-objdump -macho -section="__LLVM,__swift_cmdline" %t2.o | %FileCheck -check-prefix=CHECK-CMD %s +; RUN: %FileCheck -check-prefix CHECK-IMPORTER %s < %t.diags.txt ; RUN: %swift -target x86_64-apple-darwin10 -c -module-name someModule -embed-bitcode-marker -o %t3.o %t.bc -; RUN: llvm-objdump -macho -section="__LLVM,__bitcode" %t3.o | FileCheck -check-prefix=MARKER %s -; RUN: llvm-objdump -macho -section="__LLVM,__swift_cmdline" %t3.o | FileCheck -check-prefix=MARKER-CMD %s +; RUN: llvm-objdump -macho -section="__LLVM,__bitcode" %t3.o | %FileCheck -check-prefix=MARKER %s +; RUN: llvm-objdump -macho -section="__LLVM,__swift_cmdline" %t3.o | %FileCheck -check-prefix=MARKER-CMD %s target triple = "x86_64-apple-darwin10" target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" diff --git a/test/Frontend/embed-bitcode.swift b/test/Frontend/embed-bitcode.swift index bdd3c2f546f4d..a1a3703716d24 100644 --- a/test/Frontend/embed-bitcode.swift +++ b/test/Frontend/embed-bitcode.swift @@ -1,8 +1,8 @@ // REQUIRES: CPU=x86_64 // REQUIRES: rdar23493035 // RUN: %target-swift-frontend -c -module-name someModule -embed-bitcode-marker -o %t.o %s -// RUN: llvm-objdump -macho -section="__LLVM,__bitcode" %t.o | FileCheck -check-prefix=MARKER %s -// RUN: llvm-objdump -macho -section="__LLVM,__swift_cmdline" %t.o | FileCheck -check-prefix=MARKER-CMD %s +// RUN: llvm-objdump -macho -section="__LLVM,__bitcode" %t.o | %FileCheck -check-prefix=MARKER %s +// RUN: llvm-objdump -macho -section="__LLVM,__swift_cmdline" %t.o | %FileCheck -check-prefix=MARKER-CMD %s // This file tests Mach-O file output, but Linux variants do not produce Mach-O // files. diff --git a/test/Frontend/filelist.swift b/test/Frontend/filelist.swift index e88b03afca624..75d5d11ce6668 100644 --- a/test/Frontend/filelist.swift +++ b/test/Frontend/filelist.swift @@ -2,13 +2,13 @@ // RUN: echo '%S/Inputs/filelist-other.swift' >> %t/input.txt // RUN: echo '%s' >> %t/input.txt // RUN: echo '%S/../Inputs/empty.swift' >> %t/input.txt -// RUN: not %target-swift-frontend -parse -filelist %t/input.txt -primary-file %s 2>&1 | FileCheck %s -// RUN: not %target-swift-frontend -parse -filelist %t/input.txt 2>&1 | FileCheck %s +// RUN: not %target-swift-frontend -parse -filelist %t/input.txt -primary-file %s 2>&1 | %FileCheck %s +// RUN: not %target-swift-frontend -parse -filelist %t/input.txt 2>&1 | %FileCheck %s -// RUN: not %target-swift-frontend -emit-bc -filelist %t/nonexistent-input.txt 2>&1 | FileCheck -check-prefix=CHECK-BADFILE %s +// RUN: not %target-swift-frontend -emit-bc -filelist %t/nonexistent-input.txt 2>&1 | %FileCheck -check-prefix=CHECK-BADFILE %s // CHECK-BADFILE: error: cannot open file -// RUN: not %target-swift-frontend -emit-bc -filelist %t/input.txt -primary-file nonexistent.swift 2>&1 | FileCheck -check-prefix=CHECK-BADPRIMARYFILE %s +// RUN: not %target-swift-frontend -emit-bc -filelist %t/input.txt -primary-file nonexistent.swift 2>&1 | %FileCheck -check-prefix=CHECK-BADPRIMARYFILE %s // CHECK-BADPRIMARYFILE: error: primary file 'nonexistent.swift' was not found in file list // RUN: echo '%t/filelist-other.bc' >> %t/output.txt diff --git a/test/Frontend/invalid-target.swift b/test/Frontend/invalid-target.swift index 17e8ff37c01c5..3233326ea6bee 100644 --- a/test/Frontend/invalid-target.swift +++ b/test/Frontend/invalid-target.swift @@ -1,5 +1,5 @@ -// RUN: not %swift %s -target 6502-apple-ios9.0 2>&1 | FileCheck %s -check-prefix=CHECKARCH -// RUN: not %swift %s -target x86_64-apple-eyeOS 2>&1 | FileCheck %s -check-prefix=CHECKOS +// RUN: not %swift %s -target 6502-apple-ios9.0 2>&1 | %FileCheck %s -check-prefix=CHECKARCH +// RUN: not %swift %s -target x86_64-apple-eyeOS 2>&1 | %FileCheck %s -check-prefix=CHECKOS // CHECKARCH: :0: error: unsupported target architecture: '6502' // CHECKOS: :0: error: unsupported target OS: 'eyeOS' diff --git a/test/Frontend/ir-support-codegen.ll b/test/Frontend/ir-support-codegen.ll index ea9957c751127..731fbd7c099d8 100644 --- a/test/Frontend/ir-support-codegen.ll +++ b/test/Frontend/ir-support-codegen.ll @@ -1,7 +1,7 @@ ; REQUIRES: CPU=x86_64 -; RUN: %swift -target x86_64-apple-darwin10 -S -module-name someModule -o - %s | FileCheck %s +; RUN: %swift -target x86_64-apple-darwin10 -S -module-name someModule -o - %s | %FileCheck %s ; RUN: llvm-as %s -o %t.bc -; RUN: %swift -target x86_64-apple-darwin10 -S -module-name someModule -o - %t.bc | FileCheck -check-prefix=CHECK-BC %s +; RUN: %swift -target x86_64-apple-darwin10 -S -module-name someModule -o - %t.bc | %FileCheck -check-prefix=CHECK-BC %s target triple = "x86_64-apple-darwin10" target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" diff --git a/test/Frontend/no-arguments.swift b/test/Frontend/no-arguments.swift index 183e66e8979fb..7d4cf1f7a4c2d 100644 --- a/test/Frontend/no-arguments.swift +++ b/test/Frontend/no-arguments.swift @@ -1,8 +1,8 @@ -// RUN: not %swift 2>&1 | FileCheck %s -check-prefix=CHECK1 -// RUN: not %swift %s 2>&1 | FileCheck %s -check-prefix=CHECK1 -// RUN: not %swift -parse 2>&1 | FileCheck %s -check-prefix=CHECK2 -// RUN: not %swift -emit-sil 2>&1 | FileCheck %s -check-prefix=CHECK2 -// RUN: not %swift -emit-object 2>&1 | FileCheck %s -check-prefix=CHECK2 +// RUN: not %swift 2>&1 | %FileCheck %s -check-prefix=CHECK1 +// RUN: not %swift %s 2>&1 | %FileCheck %s -check-prefix=CHECK1 +// RUN: not %swift -parse 2>&1 | %FileCheck %s -check-prefix=CHECK2 +// RUN: not %swift -emit-sil 2>&1 | %FileCheck %s -check-prefix=CHECK2 +// RUN: not %swift -emit-object 2>&1 | %FileCheck %s -check-prefix=CHECK2 // CHECK1: :0: error: no frontend action was selected // CHECK2: :0: error: this mode requires at least one input file diff --git a/test/Frontend/sil-primary-file-with-sib.swift b/test/Frontend/sil-primary-file-with-sib.swift index cf785c353094d..2f7862968d5c9 100644 --- a/test/Frontend/sil-primary-file-with-sib.swift +++ b/test/Frontend/sil-primary-file-with-sib.swift @@ -6,7 +6,7 @@ // RUN: %llvm-link %t/test-orig.ll -override %t/test-func.ll -o %t/test.bc // RUN: %target-swift-frontend -c %t/test.bc -o %t/test.o // RUN: %target-build-swift %t/test.o -o %t/test -// RUN: %target-run %t/test | FileCheck %s +// RUN: %target-run %t/test | %FileCheck %s // REQUIRES: executable_test diff --git a/test/Frontend/unknown-arguments.swift b/test/Frontend/unknown-arguments.swift index 2f274148c5785..d80a2a7f428de 100644 --- a/test/Frontend/unknown-arguments.swift +++ b/test/Frontend/unknown-arguments.swift @@ -1,8 +1,8 @@ -// RUN: not %swift -fake-argument -abcdef -c %s -o %t.o 2>&1 | FileCheck %s +// RUN: not %swift -fake-argument -abcdef -c %s -o %t.o 2>&1 | %FileCheck %s // CHECK: :0: error: unknown argument: '-fake-argument' // CHECK-NEXT: :0: error: unknown argument: '-abcdef' -// RUN: not %swiftc_driver -c %s -o %t.o -Xfrontend -fake-frontend-arg -Xfrontend fakevalue 2>&1 | FileCheck -check-prefix=XFRONTEND %s +// RUN: not %swiftc_driver -c %s -o %t.o -Xfrontend -fake-frontend-arg -Xfrontend fakevalue 2>&1 | %FileCheck -check-prefix=XFRONTEND %s // XFRONTEND: :0: error: unknown argument: '-fake-frontend-arg' diff --git a/test/Generics/associated_type_typo.swift b/test/Generics/associated_type_typo.swift index 3ab163c203fd4..e80d209b9783a 100644 --- a/test/Generics/associated_type_typo.swift +++ b/test/Generics/associated_type_typo.swift @@ -1,7 +1,7 @@ // RUN: %target-parse-verify-swift // RUN: not %target-swift-frontend -parse -debug-generic-signatures %s > %t.dump 2>&1 -// RUN: FileCheck -check-prefix CHECK-GENERIC %s < %t.dump +// RUN: %FileCheck -check-prefix CHECK-GENERIC %s < %t.dump protocol P1 { associatedtype Assoc diff --git a/test/Generics/requirement_inference.swift b/test/Generics/requirement_inference.swift index 9f24b3b5a4e83..19e3c787fe37d 100644 --- a/test/Generics/requirement_inference.swift +++ b/test/Generics/requirement_inference.swift @@ -1,6 +1,6 @@ // RUN: %target-parse-verify-swift -parse %s -verify // RUN: %target-parse-verify-swift -parse -debug-generic-signatures %s > %t.dump 2>&1 -// RUN: FileCheck %s < %t.dump +// RUN: %FileCheck %s < %t.dump protocol P1 { func p1() diff --git a/test/Generics/superclass_constraint.swift b/test/Generics/superclass_constraint.swift index b9ff602ddabf2..e513f06f97678 100644 --- a/test/Generics/superclass_constraint.swift +++ b/test/Generics/superclass_constraint.swift @@ -1,7 +1,7 @@ // RUN: %target-parse-verify-swift // RUN: %target-parse-verify-swift -parse -debug-generic-signatures %s > %t.dump 2>&1 -// RUN: FileCheck %s < %t.dump +// RUN: %FileCheck %s < %t.dump class A { func foo() { } diff --git a/test/IDE/annotation.swift b/test/IDE/annotation.swift index 02365a614d970..cf1c87c6d32ef 100644 --- a/test/IDE/annotation.swift +++ b/test/IDE/annotation.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -annotate -source-filename %s | FileCheck %s +// RUN: %target-swift-ide-test -annotate -source-filename %s | %FileCheck %s // CHECK: import struct Swift.Int import struct Swift.Int diff --git a/test/IDE/annotation_foundation.swift b/test/IDE/annotation_foundation.swift index e4696752e1b5e..6ee344395d7ca 100644 --- a/test/IDE/annotation_foundation.swift +++ b/test/IDE/annotation_foundation.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -annotate -source-filename %s | FileCheck %s +// RUN: %target-swift-ide-test -annotate -source-filename %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IDE/coloring.swift b/test/IDE/coloring.swift index ad764e3a89298..49eaf9bd06b8c 100644 --- a/test/IDE/coloring.swift +++ b/test/IDE/coloring.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-ide-test -syntax-coloring -source-filename %s | FileCheck %s -// RUN: %target-swift-ide-test -syntax-coloring -typecheck -source-filename %s | FileCheck %s +// RUN: %target-swift-ide-test -syntax-coloring -source-filename %s | %FileCheck %s +// RUN: %target-swift-ide-test -syntax-coloring -typecheck -source-filename %s | %FileCheck %s // XFAIL: broken_std_regex #line 17 "abc.swift" diff --git a/test/IDE/coloring_configs.swift b/test/IDE/coloring_configs.swift index 0d15972331b44..7c8dfb31c3be8 100644 --- a/test/IDE/coloring_configs.swift +++ b/test/IDE/coloring_configs.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -syntax-coloring -source-filename %s -D CONF | FileCheck %s +// RUN: %target-swift-ide-test -syntax-coloring -source-filename %s -D CONF | %FileCheck %s // CHECK: var f : Int var f : Int diff --git a/test/IDE/coloring_playground.swift b/test/IDE/coloring_playground.swift index 15db69d35a29b..03b460c058e87 100644 --- a/test/IDE/coloring_playground.swift +++ b/test/IDE/coloring_playground.swift @@ -1,6 +1,6 @@ // REQUIRES: objc_interop -// RUN: %target-swift-ide-test -syntax-coloring -playground -source-filename %s | FileCheck %s -// RUN: %target-swift-ide-test -syntax-coloring -playground -typecheck -source-filename %s | FileCheck %s +// RUN: %target-swift-ide-test -syntax-coloring -playground -source-filename %s | %FileCheck %s +// RUN: %target-swift-ide-test -syntax-coloring -playground -typecheck -source-filename %s | %FileCheck %s //: playground doc comment line func playgroundCommentLine(f : () throws -> ()) rethrows {} diff --git a/test/IDE/comment_attach.swift b/test/IDE/comment_attach.swift index 3f2e848f04782..0c00d6cd27f32 100644 --- a/test/IDE/comment_attach.swift +++ b/test/IDE/comment_attach.swift @@ -220,8 +220,8 @@ func docCommentWithGybLineNumber() {} func unterminatedBlockDocComment() {} // RUN: %target-swift-ide-test -print-comments -source-filename %s > %t.txt -// RUN: FileCheck %s -check-prefix=WRONG < %t.txt -// RUN: FileCheck %s < %t.txt +// RUN: %FileCheck %s -check-prefix=WRONG < %t.txt +// RUN: %FileCheck %s < %t.txt // Some comments are not attached to anything. // WRONG-NOT: IS_DOC_NOT_ATTACHED diff --git a/test/IDE/comment_attach_huge.swift b/test/IDE/comment_attach_huge.swift index 04f35b9200214..b7a8e31869305 100644 --- a/test/IDE/comment_attach_huge.swift +++ b/test/IDE/comment_attach_huge.swift @@ -846,7 +846,7 @@ END */ func decl_func_1() {} -// RUN: %target-swift-ide-test -print-comments -source-filename %s | FileCheck %s +// RUN: %target-swift-ide-test -print-comments -source-filename %s | %FileCheck %s // CHECK: Func/decl_func_1 RawComment=[/**\nBEGIN\n{{[^]]*}}\nEND\n*/] diff --git a/test/IDE/comment_brief.swift b/test/IDE/comment_brief.swift index 1af3f2709f76b..1409f3e9fd36f 100644 --- a/test/IDE/comment_brief.swift +++ b/test/IDE/comment_brief.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -print-comments -source-filename %s | FileCheck %s +// RUN: %target-swift-ide-test -print-comments -source-filename %s | %FileCheck %s // REQUIRES: no_asan /// diff --git a/test/IDE/comment_extensions.swift b/test/IDE/comment_extensions.swift index 664f32636bd59..1d48c13eb0e92 100644 --- a/test/IDE/comment_extensions.swift +++ b/test/IDE/comment_extensions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -print-comments -source-filename %S/Inputs/comment_extensions.swift -comments-xml-schema %S/../../bindings/xml/comment-xml-schema.rng | FileCheck %s +// RUN: %target-swift-ide-test -print-comments -source-filename %S/Inputs/comment_extensions.swift -comments-xml-schema %S/../../bindings/xml/comment-xml-schema.rng | %FileCheck %s // Content is in separate file in ./Inputs due to the "requires" keyword getting // recognized by lit. diff --git a/test/IDE/comment_inherited_class.swift b/test/IDE/comment_inherited_class.swift index 0d52213a0614c..ca3ebff5fcf0d 100644 --- a/test/IDE/comment_inherited_class.swift +++ b/test/IDE/comment_inherited_class.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -print-comments -source-filename %s | FileCheck %s +// RUN: %target-swift-ide-test -print-comments -source-filename %s | %FileCheck %s // REQUIRES: no_asan class Base { diff --git a/test/IDE/comment_inherited_protocol.swift b/test/IDE/comment_inherited_protocol.swift index 6f984ad19b23b..ec813b8f24090 100644 --- a/test/IDE/comment_inherited_protocol.swift +++ b/test/IDE/comment_inherited_protocol.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -print-comments -source-filename %s | FileCheck %s +// RUN: %target-swift-ide-test -print-comments -source-filename %s | %FileCheck %s protocol ParentProtocol1 { /// ParentProtocol1.onlyParent1() diff --git a/test/IDE/comment_measurement.swift b/test/IDE/comment_measurement.swift index 71a54d6702203..d1127e72ffe47 100644 --- a/test/IDE/comment_measurement.swift +++ b/test/IDE/comment_measurement.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -print-comments -source-filename %s -comments-xml-schema %S/../../bindings/xml/comment-xml-schema.rng | FileCheck %s +// RUN: %target-swift-ide-test -print-comments -source-filename %s -comments-xml-schema %S/../../bindings/xml/comment-xml-schema.rng | %FileCheck %s /// Brief. /// diff --git a/test/IDE/comment_merge.swift b/test/IDE/comment_merge.swift index 75ce6662e81e6..563670d786809 100644 --- a/test/IDE/comment_merge.swift +++ b/test/IDE/comment_merge.swift @@ -93,8 +93,8 @@ func is_doc18() {} func is_doc19() {} // RUN: %target-swift-ide-test -print-comments -source-filename %s > %t.txt -// RUN: FileCheck %s -check-prefix=WRONG < %t.txt -// RUN: FileCheck %s < %t.txt +// RUN: %FileCheck %s -check-prefix=WRONG < %t.txt +// RUN: %FileCheck %s < %t.txt // Non-documentation comments should not be attached to anything. // WRONG-NOT: NOT_DOC diff --git a/test/IDE/comment_to_xml.swift b/test/IDE/comment_to_xml.swift index 85e3fb56c60a9..af833b3fa77b1 100644 --- a/test/IDE/comment_to_xml.swift +++ b/test/IDE/comment_to_xml.swift @@ -2,8 +2,8 @@ // RUN: %target-swift-frontend -parse -verify -disable-objc-attr-requires-foundation-module %S/../Inputs/comment_to_something_conversion.swift // RUN: %target-swift-ide-test -print-comments -source-filename %S/../Inputs/comment_to_something_conversion.swift -comments-xml-schema %S/../../bindings/xml/comment-xml-schema.rng > %t.txt -// RUN: FileCheck %S/../Inputs/comment_to_something_conversion.swift < %t.txt -// RUN: FileCheck %s -check-prefix=WRONG < %t.txt +// RUN: %FileCheck %S/../Inputs/comment_to_something_conversion.swift < %t.txt +// RUN: %FileCheck %s -check-prefix=WRONG < %t.txt // REQUIRES: no_asan // WRONG-NOT: CommentXMLInvalid diff --git a/test/IDE/compatibility_alias.swift b/test/IDE/compatibility_alias.swift index 776d5f8186c23..947daa0c88284 100644 --- a/test/IDE/compatibility_alias.swift +++ b/test/IDE/compatibility_alias.swift @@ -3,7 +3,7 @@ // RUN: %build-clang-importer-objc-overlays // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk-nosource) -I %t -I %S/Inputs/custom-modules -print-module -source-filename %s -module-to-print=CompatibilityAlias > %t.printed.CompatibilityAlias.txt -// RUN: FileCheck %s -check-prefix=PRINT -strict-whitespace < %t.printed.CompatibilityAlias.txt +// RUN: %FileCheck %s -check-prefix=PRINT -strict-whitespace < %t.printed.CompatibilityAlias.txt // RUN: %target-parse-verify-swift -sdk %clang-importer-sdk -I %S/Inputs/custom-modules -I %t %s // REQUIRES: objc_interop diff --git a/test/IDE/complete_after_self.swift b/test/IDE/complete_after_self.swift index 3b621739ba7d7..992a9ddca8d2b 100644 --- a/test/IDE/complete_after_self.swift +++ b/test/IDE/complete_after_self.swift @@ -1,32 +1,32 @@ // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONSTRUCTOR_SELF_NO_DOT_1 > %t.self.txt -// RUN: FileCheck %s -check-prefix=CONSTRUCTOR_SELF_NO_DOT_1 < %t.self.txt -// RUN: FileCheck %s -check-prefix=COMMON_SELF_NO_DOT_1 < %t.self.txt +// RUN: %FileCheck %s -check-prefix=CONSTRUCTOR_SELF_NO_DOT_1 < %t.self.txt +// RUN: %FileCheck %s -check-prefix=COMMON_SELF_NO_DOT_1 < %t.self.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONSTRUCTOR_SELF_DOT_1 > %t.self.txt -// RUN: FileCheck %s -check-prefix=CONSTRUCTOR_SELF_DOT_1 < %t.self.txt -// RUN: FileCheck %s -check-prefix=COMMON_SELF_DOT_1 < %t.self.txt +// RUN: %FileCheck %s -check-prefix=CONSTRUCTOR_SELF_DOT_1 < %t.self.txt +// RUN: %FileCheck %s -check-prefix=COMMON_SELF_DOT_1 < %t.self.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DESTRUCTOR_SELF_NO_DOT_1 > %t.self.txt -// RUN: FileCheck %s -check-prefix=DESTRUCTOR_SELF_NO_DOT_1 < %t.self.txt -// RUN: FileCheck %s -check-prefix=COMMON_SELF_NO_DOT_1 < %t.self.txt +// RUN: %FileCheck %s -check-prefix=DESTRUCTOR_SELF_NO_DOT_1 < %t.self.txt +// RUN: %FileCheck %s -check-prefix=COMMON_SELF_NO_DOT_1 < %t.self.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DESTRUCTOR_SELF_DOT_1 > %t.self.txt -// RUN: FileCheck %s -check-prefix=DESTRUCTOR_SELF_DOT_1 < %t.self.txt -// RUN: FileCheck %s -check-prefix=COMMON_SELF_DOT_1 < %t.self.txt +// RUN: %FileCheck %s -check-prefix=DESTRUCTOR_SELF_DOT_1 < %t.self.txt +// RUN: %FileCheck %s -check-prefix=COMMON_SELF_DOT_1 < %t.self.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FUNC_SELF_NO_DOT_1 > %t.self.txt -// RUN: FileCheck %s -check-prefix=FUNC_SELF_NO_DOT_1 < %t.self.txt -// RUN: FileCheck %s -check-prefix=COMMON_SELF_NO_DOT_1 < %t.self.txt +// RUN: %FileCheck %s -check-prefix=FUNC_SELF_NO_DOT_1 < %t.self.txt +// RUN: %FileCheck %s -check-prefix=COMMON_SELF_NO_DOT_1 < %t.self.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FUNC_SELF_DOT_1 > %t.self.txt -// RUN: FileCheck %s -check-prefix=FUNC_SELF_DOT_1 < %t.self.txt -// RUN: FileCheck %s -check-prefix=COMMON_SELF_DOT_1 < %t.self.txt +// RUN: %FileCheck %s -check-prefix=FUNC_SELF_DOT_1 < %t.self.txt +// RUN: %FileCheck %s -check-prefix=COMMON_SELF_DOT_1 < %t.self.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FUNC_STATIC_SELF_NO_DOT_1 > %t.self.txt -// RUN: FileCheck %s -check-prefix=FUNC_STATIC_SELF_NO_DOT_1 < %t.self.txt +// RUN: %FileCheck %s -check-prefix=FUNC_STATIC_SELF_NO_DOT_1 < %t.self.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FUNC_STATIC_SELF_DOT_1 > %t.self.txt -// RUN: FileCheck %s -check-prefix=FUNC_STATIC_SELF_DOT_1 < %t.self.txt +// RUN: %FileCheck %s -check-prefix=FUNC_STATIC_SELF_DOT_1 < %t.self.txt //===--- //===--- Tests for code completion after 'self'. diff --git a/test/IDE/complete_after_super.swift b/test/IDE/complete_after_super.swift index 82ca414fd8bc9..624943bcd5c88 100644 --- a/test/IDE/complete_after_super.swift +++ b/test/IDE/complete_after_super.swift @@ -2,105 +2,105 @@ // RUN: %target-swift-frontend -verify -parse %t_no_errors.swift // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONSTRUCTOR_SUPER_NO_DOT_1 > %t.super.txt -// RUN: FileCheck %s -check-prefix=COMMON_BASE_A_NO_DOT < %t.super.txt -// RUN: FileCheck %s -check-prefix=CONSTRUCTOR_SUPER_NO_DOT_1 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=COMMON_BASE_A_NO_DOT < %t.super.txt +// RUN: %FileCheck %s -check-prefix=CONSTRUCTOR_SUPER_NO_DOT_1 < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONSTRUCTOR_SUPER_DOT_1 > %t.super.txt -// RUN: FileCheck %s -check-prefix=COMMON_BASE_A_DOT < %t.super.txt -// RUN: FileCheck %s -check-prefix=CONSTRUCTOR_SUPER_DOT_1 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=COMMON_BASE_A_DOT < %t.super.txt +// RUN: %FileCheck %s -check-prefix=CONSTRUCTOR_SUPER_DOT_1 < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONSTRUCTOR_SUPER_INIT_PAREN_1 > %t.super.txt -// RUN: FileCheck %s -check-prefix=CONSTRUCTOR_SUPER_INIT_PAREN_1 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=CONSTRUCTOR_SUPER_INIT_PAREN_1 < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DESTRUCTOR_SUPER_NO_DOT_1 > %t.super.txt -// RUN: FileCheck %s -check-prefix=COMMON_BASE_A_NO_DOT < %t.super.txt -// RUN: FileCheck %s -check-prefix=DESTRUCTOR_SUPER_NO_DOT_1 < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=COMMON_BASE_A_NO_DOT < %t.super.txt +// RUN: %FileCheck %s -check-prefix=DESTRUCTOR_SUPER_NO_DOT_1 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DESTRUCTOR_SUPER_DOT_1 > %t.super.txt -// RUN: FileCheck %s -check-prefix=COMMON_BASE_A_DOT < %t.super.txt -// RUN: FileCheck %s -check-prefix=DESTRUCTOR_SUPER_DOT_1 < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=COMMON_BASE_A_DOT < %t.super.txt +// RUN: %FileCheck %s -check-prefix=DESTRUCTOR_SUPER_DOT_1 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FUNC_SUPER_NO_DOT_1 > %t.super.txt -// RUN: FileCheck %s -check-prefix=COMMON_BASE_A_NO_DOT < %t.super.txt -// RUN: FileCheck %s -check-prefix=FUNC_SUPER_NO_DOT_1 < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=COMMON_BASE_A_NO_DOT < %t.super.txt +// RUN: %FileCheck %s -check-prefix=FUNC_SUPER_NO_DOT_1 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FUNC_SUPER_DOT_1 > %t.super.txt -// RUN: FileCheck %s -check-prefix=COMMON_BASE_A_DOT < %t.super.txt -// RUN: FileCheck %s -check-prefix=FUNC_SUPER_DOT_1 < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=COMMON_BASE_A_DOT < %t.super.txt +// RUN: %FileCheck %s -check-prefix=FUNC_SUPER_DOT_1 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONSTRUCTOR_SUPER_NO_DOT_2 > %t.super.txt -// RUN: FileCheck %s -check-prefix=COMMON_BASE_B_NO_DOT < %t.super.txt -// RUN: FileCheck %s -check-prefix=CONSTRUCTOR_SUPER_NO_DOT_2 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=COMMON_BASE_B_NO_DOT < %t.super.txt +// RUN: %FileCheck %s -check-prefix=CONSTRUCTOR_SUPER_NO_DOT_2 < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONSTRUCTOR_SUPER_DOT_2 > %t.super.txt -// RUN: FileCheck %s -check-prefix=COMMON_BASE_B_DOT < %t.super.txt -// RUN: FileCheck %s -check-prefix=CONSTRUCTOR_SUPER_DOT_2 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=COMMON_BASE_B_DOT < %t.super.txt +// RUN: %FileCheck %s -check-prefix=CONSTRUCTOR_SUPER_DOT_2 < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DESTRUCTOR_SUPER_NO_DOT_2 > %t.super.txt -// RUN: FileCheck %s -check-prefix=COMMON_BASE_B_NO_DOT < %t.super.txt -// RUN: FileCheck %s -check-prefix=DESTRUCTOR_SUPER_NO_DOT_2 < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=COMMON_BASE_B_NO_DOT < %t.super.txt +// RUN: %FileCheck %s -check-prefix=DESTRUCTOR_SUPER_NO_DOT_2 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DESTRUCTOR_SUPER_DOT_2 > %t.super.txt -// RUN: FileCheck %s -check-prefix=COMMON_BASE_B_DOT < %t.super.txt -// RUN: FileCheck %s -check-prefix=DESTRUCTOR_SUPER_DOT_2 < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=COMMON_BASE_B_DOT < %t.super.txt +// RUN: %FileCheck %s -check-prefix=DESTRUCTOR_SUPER_DOT_2 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FUNC_SUPER_NO_DOT_2 > %t.super.txt -// RUN: FileCheck %s -check-prefix=COMMON_BASE_B_NO_DOT < %t.super.txt -// RUN: FileCheck %s -check-prefix=FUNC_SUPER_NO_DOT_2 < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=COMMON_BASE_B_NO_DOT < %t.super.txt +// RUN: %FileCheck %s -check-prefix=FUNC_SUPER_NO_DOT_2 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FUNC_SUPER_DOT_2 > %t.super.txt -// RUN: FileCheck %s -check-prefix=COMMON_BASE_B_DOT < %t.super.txt -// RUN: FileCheck %s -check-prefix=FUNC_SUPER_DOT_2 < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=COMMON_BASE_B_DOT < %t.super.txt +// RUN: %FileCheck %s -check-prefix=FUNC_SUPER_DOT_2 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SEMANTIC_CONTEXT_OVERRIDDEN_DECL_1 > %t.super.txt -// RUN: FileCheck %s -check-prefix=SEMANTIC_CONTEXT_OVERRIDDEN_DECL_1 < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_SUPER_DECLS < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=SEMANTIC_CONTEXT_OVERRIDDEN_DECL_1 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_SUPER_DECLS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SEMANTIC_CONTEXT_OVERRIDDEN_DECL_2 > %t.super.txt -// RUN: FileCheck %s -check-prefix=SEMANTIC_CONTEXT_OVERRIDDEN_DECL_2 < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_SUPER_DECLS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=SEMANTIC_CONTEXT_OVERRIDDEN_DECL_2 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_SUPER_DECLS < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SEMANTIC_CONTEXT_OVERRIDDEN_DECL_3 > %t.super.txt -// RUN: FileCheck %s -check-prefix=SEMANTIC_CONTEXT_OVERRIDDEN_DECL_3 < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_SUPER_DECLS < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=SEMANTIC_CONTEXT_OVERRIDDEN_DECL_3 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_SUPER_DECLS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SEMANTIC_CONTEXT_OVERRIDDEN_DECL_4 > %t.super.txt -// RUN: FileCheck %s -check-prefix=SEMANTIC_CONTEXT_OVERRIDDEN_DECL_4 < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_SUPER_DECLS < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=SEMANTIC_CONTEXT_OVERRIDDEN_DECL_4 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_SUPER_DECLS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SEMANTIC_CONTEXT_OVERRIDDEN_DECL_5 > %t.super.txt -// RUN: FileCheck %s -check-prefix=SEMANTIC_CONTEXT_OVERRIDDEN_DECL_5 < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_SUPER_DECLS < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=SEMANTIC_CONTEXT_OVERRIDDEN_DECL_5 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_SUPER_DECLS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLOSURE_1 > %t.super.txt -// RUN: FileCheck %s -check-prefix=COMMON_BASE_A_DOT < %t.super.txt -// RUN: FileCheck %s -check-prefix=CLOSURE_1 < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=COMMON_BASE_A_DOT < %t.super.txt +// RUN: %FileCheck %s -check-prefix=CLOSURE_1 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLOSURE_2 > %t.super.txt -// RUN: FileCheck %s -check-prefix=COMMON_BASE_A_DOT < %t.super.txt -// RUN: FileCheck %s -check-prefix=CLOSURE_2 < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=COMMON_BASE_A_DOT < %t.super.txt +// RUN: %FileCheck %s -check-prefix=CLOSURE_2 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLOSURE_CAPTURE_1 > %t.super.txt -// RUN: FileCheck %s -check-prefix=CLOSURE_CAPTURE_1 < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_SUPER_DECLS < %t.super.txt -// RUN: FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=CLOSURE_CAPTURE_1 < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_SUPER_DECLS < %t.super.txt +// RUN: %FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt // NO_CONSTRUCTORS-NOT: init( diff --git a/test/IDE/complete_assignment.swift b/test/IDE/complete_assignment.swift index 100d38e403b5b..80c5c93b13556 100644 --- a/test/IDE/complete_assignment.swift +++ b/test/IDE/complete_assignment.swift @@ -1,24 +1,24 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_1 | FileCheck %s -check-prefix=ASSIGN_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_2 | FileCheck %s -check-prefix=ASSIGN_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_3 | FileCheck %s -check-prefix=ASSIGN_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_4 | FileCheck %s -check-prefix=ASSIGN_4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_5 | FileCheck %s -check-prefix=ASSIGN_5 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_6 | FileCheck %s -check-prefix=ASSIGN_6 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_7 | FileCheck %s -check-prefix=ASSIGN_7 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_8 | FileCheck %s -check-prefix=ASSIGN_8 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_9 | FileCheck %s -check-prefix=ASSIGN_9 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_10 | FileCheck %s -check-prefix=ASSIGN_10 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_11 | FileCheck %s -check-prefix=ASSIGN_11 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_12 | FileCheck %s -check-prefix=ASSIGN_12 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_13 | FileCheck %s -check-prefix=ASSIGN_13 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_14 | FileCheck %s -check-prefix=ASSIGN_14 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_15 | FileCheck %s -check-prefix=ASSIGN_15 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_16 | FileCheck %s -check-prefix=ASSIGN_16 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_17 | FileCheck %s -check-prefix=ASSIGN_17 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_18 | FileCheck %s -check-prefix=ASSIGN_18 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_19 | FileCheck %s -check-prefix=ASSIGN_19 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_1 | %FileCheck %s -check-prefix=ASSIGN_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_2 | %FileCheck %s -check-prefix=ASSIGN_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_3 | %FileCheck %s -check-prefix=ASSIGN_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_4 | %FileCheck %s -check-prefix=ASSIGN_4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_5 | %FileCheck %s -check-prefix=ASSIGN_5 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_6 | %FileCheck %s -check-prefix=ASSIGN_6 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_7 | %FileCheck %s -check-prefix=ASSIGN_7 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_8 | %FileCheck %s -check-prefix=ASSIGN_8 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_9 | %FileCheck %s -check-prefix=ASSIGN_9 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_10 | %FileCheck %s -check-prefix=ASSIGN_10 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_11 | %FileCheck %s -check-prefix=ASSIGN_11 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_12 | %FileCheck %s -check-prefix=ASSIGN_12 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_13 | %FileCheck %s -check-prefix=ASSIGN_13 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_14 | %FileCheck %s -check-prefix=ASSIGN_14 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_15 | %FileCheck %s -check-prefix=ASSIGN_15 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_16 | %FileCheck %s -check-prefix=ASSIGN_16 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_17 | %FileCheck %s -check-prefix=ASSIGN_17 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_18 | %FileCheck %s -check-prefix=ASSIGN_18 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSIGN_19 | %FileCheck %s -check-prefix=ASSIGN_19 class C1 { var I1 = 1 diff --git a/test/IDE/complete_associated_types.swift b/test/IDE/complete_associated_types.swift index 49b8d75649f8f..597b08df0d185 100644 --- a/test/IDE/complete_associated_types.swift +++ b/test/IDE/complete_associated_types.swift @@ -2,23 +2,23 @@ // RUN: %target-swift-frontend -parse -verify %t_no_errors.swift // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=STRUCT_AS_TYPE > %t.types.txt -// RUN: FileCheck %s -check-prefix=STRUCT_TYPE_COUNT < %t.types.txt -// RUN: FileCheck %s -check-prefix=STRUCT_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=STRUCT_TYPE_COUNT < %t.types.txt +// RUN: %FileCheck %s -check-prefix=STRUCT_TYPES < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=STRUCT_AS_EXPR > %t.types.txt -// RUN: FileCheck %s -check-prefix=STRUCT_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=STRUCT_TYPES < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=STRUCT_INSTANCE > %t.types.txt -// RUN: FileCheck %s -check-prefix=STRUCT_INSTANCE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=STRUCT_INSTANCE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSOCIATED_TYPES_UNQUAL_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=ASSOCIATED_TYPES_UNQUAL < %t.types.txt +// RUN: %FileCheck %s -check-prefix=ASSOCIATED_TYPES_UNQUAL < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSOCIATED_TYPES_UNQUAL_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=ASSOCIATED_TYPES_UNQUAL < %t.types.txt +// RUN: %FileCheck %s -check-prefix=ASSOCIATED_TYPES_UNQUAL < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BROKEN_CONFORMANCE_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=BROKEN_CONFORMANCE_1 < %t.types.txt +// RUN: %FileCheck %s -check-prefix=BROKEN_CONFORMANCE_1 < %t.types.txt // FIXME: extensions that introduce conformances? diff --git a/test/IDE/complete_at_eof_1.swift b/test/IDE/complete_at_eof_1.swift index 60e2e4992a93d..d2fba46ec59e7 100644 --- a/test/IDE/complete_at_eof_1.swift +++ b/test/IDE/complete_at_eof_1.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | FileCheck %s -check-prefix=A +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | %FileCheck %s -check-prefix=A // Make sure we can code complete at EOF. // Don't add any tests at the end of the file! diff --git a/test/IDE/complete_at_eof_in_call_1.swift b/test/IDE/complete_at_eof_in_call_1.swift index 9cb31c9305567..e8b5bd8e701bb 100644 --- a/test/IDE/complete_at_eof_in_call_1.swift +++ b/test/IDE/complete_at_eof_in_call_1.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | FileCheck %s -check-prefix=A +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | %FileCheck %s -check-prefix=A // Make sure we can code complete at EOF. // Don't add any tests at the end of the file! diff --git a/test/IDE/complete_at_eof_in_call_no_newline_1.swift b/test/IDE/complete_at_eof_in_call_no_newline_1.swift index 33784a3323725..81e73476fd224 100644 --- a/test/IDE/complete_at_eof_in_call_no_newline_1.swift +++ b/test/IDE/complete_at_eof_in_call_no_newline_1.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | FileCheck %s -check-prefix=A +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | %FileCheck %s -check-prefix=A // Make sure we can code complete at EOF. // Don't add any tests at the end of the file! diff --git a/test/IDE/complete_at_eof_no_newline_1.swift b/test/IDE/complete_at_eof_no_newline_1.swift index 008e411ac5979..dd0df398b5c6e 100644 --- a/test/IDE/complete_at_eof_no_newline_1.swift +++ b/test/IDE/complete_at_eof_no_newline_1.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | FileCheck %s -check-prefix=A +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | %FileCheck %s -check-prefix=A // Make sure we can code complete at EOF when there is no newline in the last // line. diff --git a/test/IDE/complete_at_eof_no_newline_2.swift b/test/IDE/complete_at_eof_no_newline_2.swift index 6d1bc8e3e3f63..eb9065b457245 100644 --- a/test/IDE/complete_at_eof_no_newline_2.swift +++ b/test/IDE/complete_at_eof_no_newline_2.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | FileCheck %s -check-prefix=A +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | %FileCheck %s -check-prefix=A // Make sure we can code complete at EOF when there is no newline in the last // line. diff --git a/test/IDE/complete_at_start_1.swift b/test/IDE/complete_at_start_1.swift index d604a10147d0b..c5c410b195ac4 100644 --- a/test/IDE/complete_at_start_1.swift +++ b/test/IDE/complete_at_start_1.swift @@ -2,7 +2,7 @@ // Make sure we can code complete at the beginning of the file. // rdar://14585108 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | FileCheck %s -check-prefix=A +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | %FileCheck %s -check-prefix=A // A: Begin completions // A-DAG: Keyword[func]/None: func{{; name=.+$}} // A-DAG: Literal[Boolean]/None: true[#Bool#]{{; name=.+$}} diff --git a/test/IDE/complete_at_top_level.swift b/test/IDE/complete_at_top_level.swift index 378dd72064338..f45d4094e117d 100644 --- a/test/IDE/complete_at_top_level.swift +++ b/test/IDE/complete_at_top_level.swift @@ -1,117 +1,117 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_CHECKED_EXPR_1 | FileCheck %s -check-prefix=TYPE_CHECKED_EXPR_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_CHECKED_EXPR_2 | FileCheck %s -check-prefix=TYPE_CHECKED_EXPR_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_CHECKED_EXPR_3 | FileCheck %s -check-prefix=TYPE_CHECKED_EXPR_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_CHECKED_EXPR_4 | FileCheck %s -check-prefix=TYPE_CHECKED_EXPR_4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_CHECKED_EXPR_5 | FileCheck %s -check-prefix=TYPE_CHECKED_EXPR_5 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_CHECKED_EXPR_6 | FileCheck %s -check-prefix=PLAIN_TOP_LEVEL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_CHECKED_EXPR_1 | %FileCheck %s -check-prefix=TYPE_CHECKED_EXPR_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_CHECKED_EXPR_2 | %FileCheck %s -check-prefix=TYPE_CHECKED_EXPR_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_CHECKED_EXPR_3 | %FileCheck %s -check-prefix=TYPE_CHECKED_EXPR_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_CHECKED_EXPR_4 | %FileCheck %s -check-prefix=TYPE_CHECKED_EXPR_4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_CHECKED_EXPR_5 | %FileCheck %s -check-prefix=TYPE_CHECKED_EXPR_5 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_CHECKED_EXPR_6 | %FileCheck %s -check-prefix=PLAIN_TOP_LEVEL -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_CHECKED_EXPR_KW_1 | FileCheck %s -check-prefix=TYPE_CHECKED_EXPR_KW_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_CHECKED_EXPR_WITH_ERROR_IN_INIT_1 | FileCheck %s -check-prefix=TYPE_CHECKED_EXPR_WITH_ERROR_IN_INIT_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_CHECKED_EXPR_KW_1 | %FileCheck %s -check-prefix=TYPE_CHECKED_EXPR_KW_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_CHECKED_EXPR_WITH_ERROR_IN_INIT_1 | %FileCheck %s -check-prefix=TYPE_CHECKED_EXPR_WITH_ERROR_IN_INIT_1 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_VAR_INIT_1 > %t.toplevel.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_INIT_1 < %t.toplevel.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_INIT_1_NEGATIVE < %t.toplevel.txt -// RUN: FileCheck %s -check-prefix=NEGATIVE < %t.toplevel.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_INIT_1 < %t.toplevel.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_INIT_1_NEGATIVE < %t.toplevel.txt +// RUN: %FileCheck %s -check-prefix=NEGATIVE < %t.toplevel.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_VAR_INIT_2 | FileCheck %s -check-prefix=TOP_LEVEL_VAR_INIT_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_VAR_INIT_2 | %FileCheck %s -check-prefix=TOP_LEVEL_VAR_INIT_2 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PLAIN_TOP_LEVEL_1 > %t.toplevel.txt -// RUN: FileCheck %s -check-prefix=PLAIN_TOP_LEVEL < %t.toplevel.txt -// RUN: FileCheck %s -check-prefix=PLAIN_TOP_LEVEL_NO_DUPLICATES < %t.toplevel.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PLAIN_TOP_LEVEL_2 | FileCheck %s -check-prefix=PLAIN_TOP_LEVEL +// RUN: %FileCheck %s -check-prefix=PLAIN_TOP_LEVEL < %t.toplevel.txt +// RUN: %FileCheck %s -check-prefix=PLAIN_TOP_LEVEL_NO_DUPLICATES < %t.toplevel.txt +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PLAIN_TOP_LEVEL_2 | %FileCheck %s -check-prefix=PLAIN_TOP_LEVEL -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_CLOSURE_1 | FileCheck %s -check-prefix=TOP_LEVEL_CLOSURE_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_CLOSURE_1 | %FileCheck %s -check-prefix=TOP_LEVEL_CLOSURE_1 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_VAR_TYPE_1 > %t.toplevel.1.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel.1.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel.1.txt -// RUN: FileCheck %s -check-prefix=NEGATIVE < %t.toplevel.1.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel.1.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel.1.txt +// RUN: %FileCheck %s -check-prefix=NEGATIVE < %t.toplevel.1.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_VAR_TYPE_2 > %t.toplevel.2.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel.2.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel.2.txt -// RUN: FileCheck %s -check-prefix=NEGATIVE < %t.toplevel.2.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel.2.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel.2.txt +// RUN: %FileCheck %s -check-prefix=NEGATIVE < %t.toplevel.2.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_VAR_TYPE_3 > %t.toplevel.3.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel.3.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel.3.txt -// RUN: FileCheck %s -check-prefix=NEGATIVE < %t.toplevel.3.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel.3.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel.3.txt +// RUN: %FileCheck %s -check-prefix=NEGATIVE < %t.toplevel.3.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_VAR_TYPE_4 > %t.toplevel.4.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel.4.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel.4.txt -// RUN: FileCheck %s -check-prefix=NEGATIVE < %t.toplevel.4.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel.4.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel.4.txt +// RUN: %FileCheck %s -check-prefix=NEGATIVE < %t.toplevel.4.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_VAR_TYPE_5 > %t.toplevel.5.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel.5.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel.5.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel.5.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel.5.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_VAR_TYPE_5 > %t.toplevel.5.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel.5.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel.5.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel.5.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel.5.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_VAR_TYPE_6 > %t.toplevel.6.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel.6.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel.6.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel.6.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel.6.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_EXPR_TYPE_1 > %t.toplevel-expr.1.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel-expr.1.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel-expr.1.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel-expr.1.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel-expr.1.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_EXPR_TYPE_2 > %t.toplevel-expr.2.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel-expr.2.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel-expr.2.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel-expr.2.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel-expr.2.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_EXPR_TYPE_3 > %t.toplevel-expr.3.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel-expr.3.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel-expr.3.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel-expr.3.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel-expr.3.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_EXPR_TYPE_4 > %t.toplevel-expr.4.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel-expr.4.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel-expr.4.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel-expr.4.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel-expr.4.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_EXPR_TYPE_2 > %t.toplevel-expr.2.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel-expr.2.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel-expr.2.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_1 < %t.toplevel-expr.2.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_VAR_TYPE_NEGATIVE_1 < %t.toplevel-expr.2.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_STMT_1 | FileCheck %s -check-prefix=PLAIN_TOP_LEVEL -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_STMT_2 | FileCheck %s -check-prefix=PLAIN_TOP_LEVEL -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_STMT_3 | FileCheck %s -check-prefix=PLAIN_TOP_LEVEL -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_STMT_4 | FileCheck %s -check-prefix=PLAIN_TOP_LEVEL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_STMT_1 | %FileCheck %s -check-prefix=PLAIN_TOP_LEVEL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_STMT_2 | %FileCheck %s -check-prefix=PLAIN_TOP_LEVEL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_STMT_3 | %FileCheck %s -check-prefix=PLAIN_TOP_LEVEL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_STMT_4 | %FileCheck %s -check-prefix=PLAIN_TOP_LEVEL // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_STMT_5 > %t.toplevel.txt -// RUN: FileCheck %s -check-prefix=PLAIN_TOP_LEVEL < %t.toplevel.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_STMT_5 < %t.toplevel.txt +// RUN: %FileCheck %s -check-prefix=PLAIN_TOP_LEVEL < %t.toplevel.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_STMT_5 < %t.toplevel.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_STMT_6 > %t.toplevel.txt -// RUN: FileCheck %s -check-prefix=PLAIN_TOP_LEVEL < %t.toplevel.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_STMT_6 < %t.toplevel.txt +// RUN: %FileCheck %s -check-prefix=PLAIN_TOP_LEVEL < %t.toplevel.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_STMT_6 < %t.toplevel.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_STMT_7 > %t.toplevel.txt -// RUN: FileCheck %s -check-prefix=PLAIN_TOP_LEVEL < %t.toplevel.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_STMT_7 < %t.toplevel.txt +// RUN: %FileCheck %s -check-prefix=PLAIN_TOP_LEVEL < %t.toplevel.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_STMT_7 < %t.toplevel.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_STMT_8 > %t.toplevel.txt -// RUN: FileCheck %s -check-prefix=PLAIN_TOP_LEVEL < %t.toplevel.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_STMT_8 < %t.toplevel.txt +// RUN: %FileCheck %s -check-prefix=PLAIN_TOP_LEVEL < %t.toplevel.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_STMT_8 < %t.toplevel.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_STMT_9 | FileCheck %s -check-prefix=PLAIN_TOP_LEVEL -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_STMT_10 | FileCheck %s -check-prefix=PLAIN_TOP_LEVEL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_STMT_9 | %FileCheck %s -check-prefix=PLAIN_TOP_LEVEL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_STMT_10 | %FileCheck %s -check-prefix=PLAIN_TOP_LEVEL -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_AUTOCLOSURE_1 | FileCheck %s -check-prefix=AUTOCLOSURE_STRING +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_AUTOCLOSURE_1 | %FileCheck %s -check-prefix=AUTOCLOSURE_STRING -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_SWITCH_CASE_1 | FileCheck %s -check-prefix=TOP_LEVEL_SWITCH_CASE_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_SWITCH_CASE_1 | %FileCheck %s -check-prefix=TOP_LEVEL_SWITCH_CASE_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_BEFORE_GUARD_NAME_1 | FileCheck %s -check-prefix=TOP_LEVEL_BEFORE_GUARD_NAME -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_BEFORE_GUARD_NAME_2 | FileCheck %s -check-prefix=TOP_LEVEL_BEFORE_GUARD_NAME +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_BEFORE_GUARD_NAME_1 | %FileCheck %s -check-prefix=TOP_LEVEL_BEFORE_GUARD_NAME +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_BEFORE_GUARD_NAME_2 | %FileCheck %s -check-prefix=TOP_LEVEL_BEFORE_GUARD_NAME -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_GUARD_1 | FileCheck %s -check-prefix=TOP_LEVEL_GUARD -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_GUARD_2 | FileCheck %s -check-prefix=TOP_LEVEL_GUARD +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_GUARD_1 | %FileCheck %s -check-prefix=TOP_LEVEL_GUARD +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_GUARD_2 | %FileCheck %s -check-prefix=TOP_LEVEL_GUARD -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=STRING_INTERP_1 | FileCheck %s -check-prefix=STRING_INTERP -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=STRING_INTERP_2 | FileCheck %s -check-prefix=STRING_INTERP -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=STRING_INTERP_3 | FileCheck %s -check-prefix=STRING_INTERP -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=STRING_INTERP_4 | FileCheck %s -check-prefix=STRING_INTERP +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=STRING_INTERP_1 | %FileCheck %s -check-prefix=STRING_INTERP +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=STRING_INTERP_2 | %FileCheck %s -check-prefix=STRING_INTERP +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=STRING_INTERP_3 | %FileCheck %s -check-prefix=STRING_INTERP +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=STRING_INTERP_4 | %FileCheck %s -check-prefix=STRING_INTERP // Test code completion in top-level code. // diff --git a/test/IDE/complete_attributes.swift b/test/IDE/complete_attributes.swift index 9f24c21196b61..3a46ca81cba5d 100644 --- a/test/IDE/complete_attributes.swift +++ b/test/IDE/complete_attributes.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_ATTR_1 -code-completion-keywords=false | FileCheck %s -check-prefix=ERROR_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_DECL_ATTR_1 -code-completion-keywords=false | FileCheck %s -check-prefix=ERROR_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_ATTR_1 -code-completion-keywords=false | %FileCheck %s -check-prefix=ERROR_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_DECL_ATTR_1 -code-completion-keywords=false | %FileCheck %s -check-prefix=ERROR_COMMON // ERROR_COMMON: found code completion token // ERROR_COMMON-NOT: Begin completions diff --git a/test/IDE/complete_cache.swift b/test/IDE/complete_cache.swift index e354d57014311..8e3f272b00b7e 100644 --- a/test/IDE/complete_cache.swift +++ b/test/IDE/complete_cache.swift @@ -2,42 +2,42 @@ // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=CLANG_UNQUAL_1 -completion-cache-path=%t.ccp > %t.ccp1.compl.txt // RUN: cp -r %t.ccp %t.ccp.bak -// RUN: FileCheck %s -check-prefix=CLANG_CTYPES < %t.ccp1.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_MACROS < %t.ccp1.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_DARWIN < %t.ccp1.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_DARWIN_NEG < %t.ccp1.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_CTYPES < %t.ccp1.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_MACROS < %t.ccp1.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_DARWIN < %t.ccp1.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_DARWIN_NEG < %t.ccp1.compl.txt // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=CLANG_UNQUAL_1 -completion-cache-path=%t.ccp > %t.ccp2.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_CTYPES < %t.ccp2.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_MACROS < %t.ccp2.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_DARWIN < %t.ccp2.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_DARWIN_NEG < %t.ccp2.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_CTYPES < %t.ccp2.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_MACROS < %t.ccp2.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_DARWIN < %t.ccp2.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_DARWIN_NEG < %t.ccp2.compl.txt // Check for modifications to cache // RUN: diff -r -u %t.ccp %t.ccp.bak // Check the individual cache items. -// RUN: %target-swift-ide-test -dump-completion-cache %t.ccp/macros-* | FileCheck %s -check-prefix=CLANG_MACROS -// RUN: %target-swift-ide-test -dump-completion-cache %t.ccp/ctypes-* | FileCheck %s -check-prefix=CLANG_CTYPES -// RUN: %target-swift-ide-test -dump-completion-cache %t.ccp/Darwin-* | FileCheck %s -check-prefix=CLANG_DARWIN -// RUN: %target-swift-ide-test -dump-completion-cache %t.ccp/Darwin-* | FileCheck %s -check-prefix=CLANG_DARWIN_NEG +// RUN: %target-swift-ide-test -dump-completion-cache %t.ccp/macros-* | %FileCheck %s -check-prefix=CLANG_MACROS +// RUN: %target-swift-ide-test -dump-completion-cache %t.ccp/ctypes-* | %FileCheck %s -check-prefix=CLANG_CTYPES +// RUN: %target-swift-ide-test -dump-completion-cache %t.ccp/Darwin-* | %FileCheck %s -check-prefix=CLANG_DARWIN +// RUN: %target-swift-ide-test -dump-completion-cache %t.ccp/Darwin-* | %FileCheck %s -check-prefix=CLANG_DARWIN_NEG // Qualified. // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=CLANG_QUAL_MACROS_1 -completion-cache-path=%t.ccp > %t.macros.ccp1.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_QUAL_MACROS_1 -check-prefix=CLANG_QUAL_MACROS_1-%target-runtime < %t.macros.ccp1.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_QUAL_MACROS_1 -check-prefix=CLANG_QUAL_MACROS_1-%target-runtime < %t.macros.ccp1.compl.txt // RUN: diff -r -u %t.ccp %t.ccp.bak // Check the individual cache item. -// RUN: %target-swift-ide-test -dump-completion-cache %t.ccp/macros-* | FileCheck %s -check-prefix=CLANG_QUAL_MACROS_1 +// RUN: %target-swift-ide-test -dump-completion-cache %t.ccp/macros-* | %FileCheck %s -check-prefix=CLANG_QUAL_MACROS_1 // Qualified with dot. // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=CLANG_QUAL_MACROS_2 -completion-cache-path=%t.ccp > %t.macros2.ccp1.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_QUAL_MACROS_2 -check-prefix=CLANG_QUAL_MACROS_2-%target-runtime < %t.macros2.ccp1.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_QUAL_MACROS_2 -check-prefix=CLANG_QUAL_MACROS_2-%target-runtime < %t.macros2.ccp1.compl.txt // Check the individual cache item. -// RUN: %target-swift-ide-test -dump-completion-cache %t.ccp/macros-dot-* | FileCheck %s -check-prefix=CLANG_QUAL_MACROS_2 +// RUN: %target-swift-ide-test -dump-completion-cache %t.ccp/macros-dot-* | %FileCheck %s -check-prefix=CLANG_QUAL_MACROS_2 // Ensure the testable import showed up mangled correctly. // RUN: ls %t.ccp/Darwin-testable* diff --git a/test/IDE/complete_call_arg.swift b/test/IDE/complete_call_arg.swift index 31ad114b4b9e3..2228b91b193bc 100644 --- a/test/IDE/complete_call_arg.swift +++ b/test/IDE/complete_call_arg.swift @@ -1,44 +1,44 @@ -// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG1 | FileCheck %s -check-prefix=EXPECT_OINT -// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG2 | FileCheck %s -check-prefix=ARG-NAME1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG3 | FileCheck %s -check-prefix=ARG-NAME2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG4 | FileCheck %s -check-prefix=EXPECT_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG5 | FileCheck %s -check-prefix=EXPECT_OSTRING -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG6 | FileCheck %s -check-prefix=ARG-NAME2 -// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG7 | FileCheck %s -check-prefix=ARG-NAME1 -// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG8 | FileCheck %s -check-prefix=EXPECT_STRING - -// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OVERLOAD1 | FileCheck %s -check-prefix=OVERLOAD1 -// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OVERLOAD2 | FileCheck %s -check-prefix=OVERLOAD2 -// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OVERLOAD3 | FileCheck %s -check-prefix=OVERLOAD3 -// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OVERLOAD4 | FileCheck %s -check-prefix=OVERLOAD4 - -// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER1 | FileCheck %s -check-prefix=MEMBER1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER2 | FileCheck %s -check-prefix=MEMBER2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER3 | FileCheck %s -check-prefix=MEMBER3 -// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER4 | FileCheck %s -check-prefix=MEMBER4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER5 | FileCheck %s -check-prefix=MEMBER2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER6 | FileCheck %s -check-prefix=MEMBER4 -// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER7 | FileCheck %s -check-prefix=MEMBER7 -// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER8 | FileCheck %s -check-prefix=MEMBER8 -// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER9 | FileCheck %s -check-prefix=MEMBER1 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FARG1 | FileCheck %s -check-prefix=EXPECT_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FARG2 | FileCheck %s -check-prefix=EXPECT_STRING -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FARG3 | FileCheck %s -check-prefix=MEMBER2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FARG4 | FileCheck %s -check-prefix=MEMBER4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FARG5 | FileCheck %s -check-prefix=MEMBER2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FARG6 | FileCheck %s -check-prefix=FARG6 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FARG7 | FileCheck %s -check-prefix=EXPECT_OINT - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIRST_ARG_NAME_1 | FileCheck %s -check-prefix=FIRST_ARG_NAME_PATTERN -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIRST_ARG_NAME_2 | FileCheck %s -check-prefix=FIRST_ARG_NAME_PATTERN -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIRST_ARG_NAME_3 | FileCheck %s -check-prefix=FIRST_ARG_NAME_3 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BOUND_GENERIC_1_1 | FileCheck %s -check-prefix=BOUND_GENERIC_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BOUND_GENERIC_1_2 | FileCheck %s -check-prefix=BOUND_GENERIC_1 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EMPTY_OVERLOAD_1 | FileCheck %s -check-prefix=EMPTY_OVERLOAD -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EMPTY_OVERLOAD_2 | FileCheck %s -check-prefix=EMPTY_OVERLOAD +// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG1 | %FileCheck %s -check-prefix=EXPECT_OINT +// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG2 | %FileCheck %s -check-prefix=ARG-NAME1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG3 | %FileCheck %s -check-prefix=ARG-NAME2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG4 | %FileCheck %s -check-prefix=EXPECT_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG5 | %FileCheck %s -check-prefix=EXPECT_OSTRING +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG6 | %FileCheck %s -check-prefix=ARG-NAME2 +// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG7 | %FileCheck %s -check-prefix=ARG-NAME1 +// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG8 | %FileCheck %s -check-prefix=EXPECT_STRING + +// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OVERLOAD1 | %FileCheck %s -check-prefix=OVERLOAD1 +// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OVERLOAD2 | %FileCheck %s -check-prefix=OVERLOAD2 +// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OVERLOAD3 | %FileCheck %s -check-prefix=OVERLOAD3 +// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OVERLOAD4 | %FileCheck %s -check-prefix=OVERLOAD4 + +// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER1 | %FileCheck %s -check-prefix=MEMBER1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER2 | %FileCheck %s -check-prefix=MEMBER2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER3 | %FileCheck %s -check-prefix=MEMBER3 +// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER4 | %FileCheck %s -check-prefix=MEMBER4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER5 | %FileCheck %s -check-prefix=MEMBER2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER6 | %FileCheck %s -check-prefix=MEMBER4 +// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER7 | %FileCheck %s -check-prefix=MEMBER7 +// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER8 | %FileCheck %s -check-prefix=MEMBER8 +// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER9 | %FileCheck %s -check-prefix=MEMBER1 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FARG1 | %FileCheck %s -check-prefix=EXPECT_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FARG2 | %FileCheck %s -check-prefix=EXPECT_STRING +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FARG3 | %FileCheck %s -check-prefix=MEMBER2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FARG4 | %FileCheck %s -check-prefix=MEMBER4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FARG5 | %FileCheck %s -check-prefix=MEMBER2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FARG6 | %FileCheck %s -check-prefix=FARG6 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FARG7 | %FileCheck %s -check-prefix=EXPECT_OINT + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIRST_ARG_NAME_1 | %FileCheck %s -check-prefix=FIRST_ARG_NAME_PATTERN +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIRST_ARG_NAME_2 | %FileCheck %s -check-prefix=FIRST_ARG_NAME_PATTERN +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIRST_ARG_NAME_3 | %FileCheck %s -check-prefix=FIRST_ARG_NAME_3 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BOUND_GENERIC_1_1 | %FileCheck %s -check-prefix=BOUND_GENERIC_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BOUND_GENERIC_1_2 | %FileCheck %s -check-prefix=BOUND_GENERIC_1 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EMPTY_OVERLOAD_1 | %FileCheck %s -check-prefix=EMPTY_OVERLOAD +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EMPTY_OVERLOAD_2 | %FileCheck %s -check-prefix=EMPTY_OVERLOAD var i1 = 1 var i2 = 2 diff --git a/test/IDE/complete_constructor.swift b/test/IDE/complete_constructor.swift index fb1267b54fdad..70e60340055f6 100644 --- a/test/IDE/complete_constructor.swift +++ b/test/IDE/complete_constructor.swift @@ -1,30 +1,30 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_CONSTRUCTORS_1 | FileCheck %s -check-prefix=IMPLICIT_CONSTRUCTORS_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_CONSTRUCTORS_1P | FileCheck %s -check-prefix=IMPLICIT_CONSTRUCTORS_1P -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_CONSTRUCTORS_2 | FileCheck %s -check-prefix=IMPLICIT_CONSTRUCTORS_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_CONSTRUCTORS_2P | FileCheck %s -check-prefix=IMPLICIT_CONSTRUCTORS_2P +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_CONSTRUCTORS_1 | %FileCheck %s -check-prefix=IMPLICIT_CONSTRUCTORS_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_CONSTRUCTORS_1P | %FileCheck %s -check-prefix=IMPLICIT_CONSTRUCTORS_1P +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_CONSTRUCTORS_2 | %FileCheck %s -check-prefix=IMPLICIT_CONSTRUCTORS_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_CONSTRUCTORS_2P | %FileCheck %s -check-prefix=IMPLICIT_CONSTRUCTORS_2P -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_1 | FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_1P | FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_1P +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_1 | %FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_1P | %FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_1P -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_2 | FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_2P | FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_2P +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_2 | %FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_2P | %FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_2P -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_3P | FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_3P +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_3P | %FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_3P -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_SELECTOR_1 | FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_SELECTOR_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_SELECTOR_1 | %FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_SELECTOR_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_BASE_DERIVED_1 | FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_BASE_DERIVED_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_BASE_DERIVED_1 | %FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_BASE_DERIVED_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FROM_METATYPE1 | FileCheck %s -check-prefix=INIT_FROM_METATYPE1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FROM_METATYPE2 | FileCheck %s -check-prefix=INIT_FROM_METATYPE2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FROM_METATYPE3 | FileCheck %s -check-prefix=INIT_FROM_METATYPE3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FROM_METATYPE4 | FileCheck %s -check-prefix=INIT_FROM_METATYPE4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FROM_METATYPE5 | FileCheck %s -check-prefix=INIT_FROM_METATYPE4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FROM_METATYPE6 | FileCheck %s -check-prefix=INIT_FROM_METATYPE6 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FROM_METATYPE1 | %FileCheck %s -check-prefix=INIT_FROM_METATYPE1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FROM_METATYPE2 | %FileCheck %s -check-prefix=INIT_FROM_METATYPE2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FROM_METATYPE3 | %FileCheck %s -check-prefix=INIT_FROM_METATYPE3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FROM_METATYPE4 | %FileCheck %s -check-prefix=INIT_FROM_METATYPE4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FROM_METATYPE5 | %FileCheck %s -check-prefix=INIT_FROM_METATYPE4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FROM_METATYPE6 | %FileCheck %s -check-prefix=INIT_FROM_METATYPE6 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=HAVE_RPAREN_1 | FileCheck %s -check-prefix=HAVE_RPAREN_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=HAVE_RPAREN_2 | FileCheck %s -check-prefix=HAVE_RPAREN_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=HAVE_COMMA_1 | FileCheck %s -check-prefix=HAVE_COMMA_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=HAVE_RPAREN_1 | %FileCheck %s -check-prefix=HAVE_RPAREN_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=HAVE_RPAREN_2 | %FileCheck %s -check-prefix=HAVE_RPAREN_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=HAVE_COMMA_1 | %FileCheck %s -check-prefix=HAVE_COMMA_1 func freeFunc() {} diff --git a/test/IDE/complete_crashes.swift b/test/IDE/complete_crashes.swift index f7a14b07577cb..8ea8b2ec4efb6 100644 --- a/test/IDE/complete_crashes.swift +++ b/test/IDE/complete_crashes.swift @@ -1,6 +1,6 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BAD_MEMBERS_1 | FileCheck %s -check-prefix=BAD_MEMBERS_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BAD_MEMBERS_2 | FileCheck %s -check-prefix=BAD_MEMBERS_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLOSURE_CALLED_IN_PLACE_1 | FileCheck %s -check-prefix=WITH_GLOBAL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BAD_MEMBERS_1 | %FileCheck %s -check-prefix=BAD_MEMBERS_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BAD_MEMBERS_2 | %FileCheck %s -check-prefix=BAD_MEMBERS_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLOSURE_CALLED_IN_PLACE_1 | %FileCheck %s -check-prefix=WITH_GLOBAL class BadMembers1 { var prop: Int { @@ -36,7 +36,7 @@ func badMembers2(_ a: BadMembers2) { func globalFunc() {} -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LET_COMPUTED | FileCheck %s -check-prefix=WITH_GLOBAL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LET_COMPUTED | %FileCheck %s -check-prefix=WITH_GLOBAL class C { let x : Int { #^LET_COMPUTED^# } } @@ -56,7 +56,7 @@ while true { } // rdar://problem/21197042 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_PARAM_AND_ASSOC_TYPE | FileCheck %s -check-prefix=GENERIC_PARAM_AND_ASSOC_TYPE +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_PARAM_AND_ASSOC_TYPE | %FileCheck %s -check-prefix=GENERIC_PARAM_AND_ASSOC_TYPE struct CustomGenericCollection : ExpressibleByDictionaryLiteral { // GENERIC_PARAM_AND_ASSOC_TYPE: Begin completions // GENERIC_PARAM_AND_ASSOC_TYPE-DAG: Decl[InstanceVar]/CurrNominal: count[#Int#]; name=count @@ -126,7 +126,7 @@ protocol Fooable { } // rdar://problem/22688199 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RDAR_22688199 | FileCheck %s -check-prefix=FLIP_CURRIED +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RDAR_22688199 | %FileCheck %s -check-prefix=FLIP_CURRIED func curried(_ a: Int)(_ b1: Int, _ b2: Int) { } func flip(_ f: A -> B -> C) -> B -> A -> C { } func rdar22688199() { @@ -147,7 +147,7 @@ func rdar22835966() { } } -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RDAR_22834017 | FileCheck %s -check-prefix=INVALID_TYPE_INIT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RDAR_22834017 | %FileCheck %s -check-prefix=INVALID_TYPE_INIT struct Foo { let a: Anosuchtype let b: Bnosuchtype @@ -160,13 +160,13 @@ func rdar22834017() { // FIXME: We could provide a useful completion here. rdar://problem/22846558 // INVALID_TYPE_INIT-NOT: Begin completions -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RDAR_23173692 | FileCheck %s -check-prefix=RDAR_23173692 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RDAR_23173692 | %FileCheck %s -check-prefix=RDAR_23173692 func rdar23173692() { return IndexingIterator(#^RDAR_23173692^#) } // RDAR_23173692: Begin completions -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RDAR_22769393 | FileCheck %s -check-prefix=RDAR_22769393 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RDAR_22769393 | %FileCheck %s -check-prefix=RDAR_22769393 public enum PropertyListItem { case PLString(String) case PLDict([String:PropertyListItem]) diff --git a/test/IDE/complete_decl_attribute.swift b/test/IDE/complete_decl_attribute.swift index 8363f0f545146..09315b08ac1e4 100644 --- a/test/IDE/complete_decl_attribute.swift +++ b/test/IDE/complete_decl_attribute.swift @@ -1,11 +1,11 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AVAILABILITY1 | FileCheck %s -check-prefix=AVAILABILITY1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AVAILABILITY2 | FileCheck %s -check-prefix=AVAILABILITY2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=KEYWORD1 | FileCheck %s -check-prefix=KEYWORD1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=KEYWORD2 | FileCheck %s -check-prefix=KEYWORD2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=KEYWORD3 | FileCheck %s -check-prefix=KEYWORD3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=KEYWORD4 | FileCheck %s -check-prefix=KEYWORD4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=KEYWORD5 | FileCheck %s -check-prefix=KEYWORD5 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=KEYWORD_LAST | FileCheck %s -check-prefix=KEYWORD_LAST +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AVAILABILITY1 | %FileCheck %s -check-prefix=AVAILABILITY1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AVAILABILITY2 | %FileCheck %s -check-prefix=AVAILABILITY2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=KEYWORD1 | %FileCheck %s -check-prefix=KEYWORD1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=KEYWORD2 | %FileCheck %s -check-prefix=KEYWORD2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=KEYWORD3 | %FileCheck %s -check-prefix=KEYWORD3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=KEYWORD4 | %FileCheck %s -check-prefix=KEYWORD4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=KEYWORD5 | %FileCheck %s -check-prefix=KEYWORD5 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=KEYWORD_LAST | %FileCheck %s -check-prefix=KEYWORD_LAST @available(#^AVAILABILITY1^#) diff --git a/test/IDE/complete_default_arguments.swift b/test/IDE/complete_default_arguments.swift index a680264fcc0cc..06b3f97e10771 100644 --- a/test/IDE/complete_default_arguments.swift +++ b/test/IDE/complete_default_arguments.swift @@ -1,26 +1,26 @@ // RUN: sed -n -e '1,/NO_ERRORS_UP_TO_HERE$/ p' %s > %t_no_errors.swift // RUN: %target-swift-frontend -verify -parse %t_no_errors.swift -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_1 | FileCheck %s -check-prefix=DEFAULT_ARGS_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_2 | FileCheck %s -check-prefix=DEFAULT_ARGS_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_3 | FileCheck %s -check-prefix=DEFAULT_ARGS_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_4 | FileCheck %s -check-prefix=DEFAULT_ARGS_4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_5 | FileCheck %s -check-prefix=DEFAULT_ARGS_5 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_6 | FileCheck %s -check-prefix=DEFAULT_ARGS_6 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_7 | FileCheck %s -check-prefix=DEFAULT_ARGS_7 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_1 | %FileCheck %s -check-prefix=DEFAULT_ARGS_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_2 | %FileCheck %s -check-prefix=DEFAULT_ARGS_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_3 | %FileCheck %s -check-prefix=DEFAULT_ARGS_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_4 | %FileCheck %s -check-prefix=DEFAULT_ARGS_4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_5 | %FileCheck %s -check-prefix=DEFAULT_ARGS_5 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_6 | %FileCheck %s -check-prefix=DEFAULT_ARGS_6 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_7 | %FileCheck %s -check-prefix=DEFAULT_ARGS_7 // // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_8 > %t -// RUN: FileCheck %s -check-prefix=DEFAULT_ARGS_8 < %t -// RUN: FileCheck %s -check-prefix=NEGATIVE_DEFAULT_ARGS_8 < %t +// RUN: %FileCheck %s -check-prefix=DEFAULT_ARGS_8 < %t +// RUN: %FileCheck %s -check-prefix=NEGATIVE_DEFAULT_ARGS_8 < %t // // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_9 > %t -// RUN: FileCheck %s -check-prefix=DEFAULT_ARGS_9 < %t -// RUN: FileCheck %s -check-prefix=NEGATIVE_DEFAULT_ARGS_9 < %t +// RUN: %FileCheck %s -check-prefix=DEFAULT_ARGS_9 < %t +// RUN: %FileCheck %s -check-prefix=NEGATIVE_DEFAULT_ARGS_9 < %t // -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARG_INIT_1 | FileCheck %s -check-prefix=DEFAULT_ARG_INIT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARG_INIT_2 | FileCheck %s -check-prefix=DEFAULT_ARG_INIT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARG_INIT_3 | FileCheck %s -check-prefix=DEFAULT_ARG_INIT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARG_INIT_4 | FileCheck %s -check-prefix=DEFAULT_ARG_INIT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARG_INIT_1 | %FileCheck %s -check-prefix=DEFAULT_ARG_INIT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARG_INIT_2 | %FileCheck %s -check-prefix=DEFAULT_ARG_INIT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARG_INIT_3 | %FileCheck %s -check-prefix=DEFAULT_ARG_INIT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARG_INIT_4 | %FileCheck %s -check-prefix=DEFAULT_ARG_INIT func freeFuncWithDefaultArgs1( _ a: Int, b: Int = 42, file: String = #file, line: Int = #line, diff --git a/test/IDE/complete_doc_keyword.swift b/test/IDE/complete_doc_keyword.swift index a84659fd16998..7ed141cabba56 100644 --- a/test/IDE/complete_doc_keyword.swift +++ b/test/IDE/complete_doc_keyword.swift @@ -1,6 +1,6 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE1 | FileCheck %s -check-prefix=TYPE1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER1 | FileCheck %s -check-prefix=MEMBER1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER2 | FileCheck %s -check-prefix=MEMBER2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE1 | %FileCheck %s -check-prefix=TYPE1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER1 | %FileCheck %s -check-prefix=MEMBER1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER2 | %FileCheck %s -check-prefix=MEMBER2 /** - keyword: C1, Class diff --git a/test/IDE/complete_dynamic_lookup.swift b/test/IDE/complete_dynamic_lookup.swift index 5a9e7b7a3ba38..9161fbd444715 100644 --- a/test/IDE/complete_dynamic_lookup.swift +++ b/test/IDE/complete_dynamic_lookup.swift @@ -6,60 +6,60 @@ // RUN: cp %S/Inputs/AnyObject/module.map %t // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -disable-objc-attr-requires-foundation-module -code-completion-token=DL_FUNC_PARAM_NO_DOT_1 > %t.dl.txt -// RUN: FileCheck %s -check-prefix=DL_INSTANCE_NO_DOT < %t.dl.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=DL_INSTANCE_NO_DOT < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -disable-objc-attr-requires-foundation-module -code-completion-token=DL_FUNC_PARAM_DOT_1 > %t.dl.txt -// RUN: FileCheck %s -check-prefix=DL_INSTANCE_DOT < %t.dl.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=DL_INSTANCE_DOT < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -disable-objc-attr-requires-foundation-module -code-completion-token=DL_VAR_NO_DOT_1 > %t.dl.txt -// RUN: FileCheck %s -check-prefix=DL_INSTANCE_NO_DOT < %t.dl.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=DL_INSTANCE_NO_DOT < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -disable-objc-attr-requires-foundation-module -code-completion-token=DL_VAR_DOT_1 > %t.dl.txt -// RUN: FileCheck %s -check-prefix=DL_INSTANCE_DOT < %t.dl.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=DL_INSTANCE_DOT < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -disable-objc-attr-requires-foundation-module -code-completion-token=DL_RETURN_VAL_NO_DOT_1 > %t.dl.txt -// RUN: FileCheck %s -check-prefix=DL_INSTANCE_NO_DOT < %t.dl.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=DL_INSTANCE_NO_DOT < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -disable-objc-attr-requires-foundation-module -code-completion-token=DL_RETURN_VAL_DOT_1 > %t.dl.txt -// RUN: FileCheck %s -check-prefix=DL_INSTANCE_DOT < %t.dl.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=DL_INSTANCE_DOT < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -disable-objc-attr-requires-foundation-module -code-completion-token=DL_CALL_RETURN_VAL_NO_DOT_1 > %t.dl.txt -// RUN: FileCheck %s -check-prefix=TLOC_MEMBERS_NO_DOT < %t.dl.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=TLOC_MEMBERS_NO_DOT < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -disable-objc-attr-requires-foundation-module -code-completion-token=DL_CALL_RETURN_VAL_DOT_1 > %t.dl.txt -// RUN: FileCheck %s -check-prefix=TLOC_MEMBERS_DOT < %t.dl.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=TLOC_MEMBERS_DOT < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -disable-objc-attr-requires-foundation-module -code-completion-token=DL_FUNC_NAME_1 > %t.dl.txt -// RUN: FileCheck %s -check-prefix=DL_FUNC_NAME_1 < %t.dl.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=DL_FUNC_NAME_1 < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -disable-objc-attr-requires-foundation-module -code-completion-token=DL_FUNC_NAME_PAREN_1 > %t.dl.txt -// RUN: FileCheck %s -check-prefix=DL_FUNC_NAME_PAREN_1 < %t.dl.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=DL_FUNC_NAME_PAREN_1 < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -disable-objc-attr-requires-foundation-module -code-completion-token=DL_FUNC_NAME_DOT_1 > %t.dl.txt -// RUN: FileCheck %s -check-prefix=DL_FUNC_NAME_DOT_1 < %t.dl.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=DL_FUNC_NAME_DOT_1 < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -disable-objc-attr-requires-foundation-module -code-completion-token=DL_FUNC_NAME_BANG_1 > %t.dl.txt -// RUN: FileCheck %s -check-prefix=DL_FUNC_NAME_BANG_1 < %t.dl.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=DL_FUNC_NAME_BANG_1 < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -disable-objc-attr-requires-foundation-module -code-completion-token=DL_CLASS_NO_DOT_1 > %t.dl.txt -// RUN: FileCheck %s -check-prefix=DL_CLASS_NO_DOT < %t.dl.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=DL_CLASS_NO_DOT < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -disable-objc-attr-requires-foundation-module -code-completion-token=DL_CLASS_DOT_1 > %t.dl.txt -// RUN: FileCheck %s -check-prefix=DL_CLASS_DOT < %t.dl.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=DL_CLASS_DOT < %t.dl.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.dl.txt // REQUIRES: objc_interop diff --git a/test/IDE/complete_enum_elements.swift b/test/IDE/complete_enum_elements.swift index d1ab5bc35f991..7219d3bda1ea9 100644 --- a/test/IDE/complete_enum_elements.swift +++ b/test/IDE/complete_enum_elements.swift @@ -1,71 +1,71 @@ // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_SW_1 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_RESULTS < %t.enum.txt -// RUN: FileCheck %s -check-prefix=FOO_ENUM_TYPE_CONTEXT < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_RESULTS < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=FOO_ENUM_TYPE_CONTEXT < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_SW_2 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_RESULTS < %t.enum.txt -// RUN: FileCheck %s -check-prefix=FOO_ENUM_TYPE_CONTEXT < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_RESULTS < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=FOO_ENUM_TYPE_CONTEXT < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_SW_3 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_RESULTS < %t.enum.txt -// RUN: FileCheck %s -check-prefix=BAR_ENUM_TYPE_CONTEXT < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_RESULTS < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=BAR_ENUM_TYPE_CONTEXT < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_SW_4 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_RESULTS < %t.enum.txt -// RUN: FileCheck %s -check-prefix=BAZ_ENUM_TYPE_CONTEXT < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_RESULTS < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=BAZ_ENUM_TYPE_CONTEXT < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_SW_5 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_RESULTS < %t.enum.txt -// RUN: FileCheck %s -check-prefix=QUX_ENUM_TYPE_CONTEXT < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_RESULTS < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=QUX_ENUM_TYPE_CONTEXT < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_SW_WITH_DOT_1 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=FOO_ENUM_DOT_ELEMENTS < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=FOO_ENUM_DOT_ELEMENTS < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_SW_WITH_QUAL_1 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=FOO_ENUM_DOT < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=FOO_ENUM_DOT < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_SW_EXPR_ERROR_1 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=FOO_ENUM_DOT < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=FOO_ENUM_DOT < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_SW_IN_PATTERN_1 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_RESULTS < %t.enum.txt -// RUN: FileCheck %s -check-prefix=ENUM_SW_IN_PATTERN_1 < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_RESULTS < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=ENUM_SW_IN_PATTERN_1 < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_SW_IN_PATTERN_2 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=ENUM_SW_IN_PATTERN_2 < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=ENUM_SW_IN_PATTERN_2 < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_QUAL_NO_DOT_1 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=FOO_ENUM_NO_DOT < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=FOO_ENUM_NO_DOT < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_QUAL_NO_DOT_2 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=BAR_ENUM_NO_DOT < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=BAR_ENUM_NO_DOT < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_QUAL_NO_DOT_3 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=BAZ_INT_ENUM_NO_DOT < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=BAZ_INT_ENUM_NO_DOT < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_QUAL_NO_DOT_4 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=BAZ_T_ENUM_NO_DOT < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=BAZ_T_ENUM_NO_DOT < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_QUAL_NO_DOT_5 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=QUX_ENUM_NO_DOT < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=QUX_ENUM_NO_DOT < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_QUAL_DOT_1 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=FOO_ENUM_DOT < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=FOO_ENUM_DOT < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_QUAL_DOT_2 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=BAR_ENUM_DOT < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=BAR_ENUM_DOT < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_QUAL_DOT_3 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=BAZ_INT_ENUM_DOT < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=BAZ_INT_ENUM_DOT < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_QUAL_DOT_4 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=BAZ_T_ENUM_DOT < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=BAZ_T_ENUM_DOT < %t.enum.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_QUAL_DOT_5 > %t.enum.txt -// RUN: FileCheck %s -check-prefix=QUX_ENUM_DOT < %t.enum.txt +// RUN: %FileCheck %s -check-prefix=QUX_ENUM_DOT < %t.enum.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=WITH_INVALID_DOT_1 | FileCheck %s -check-prefix=WITH_INVALID_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_1 | FileCheck %s -check-prefix=UNRESOLVED_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=WITH_INVALID_DOT_1 | %FileCheck %s -check-prefix=WITH_INVALID_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_1 | %FileCheck %s -check-prefix=UNRESOLVED_1 //===--- //===--- Test that we can complete enum elements. diff --git a/test/IDE/complete_exception.swift b/test/IDE/complete_exception.swift index 0db98fc413440..a3e18e1a6ec41 100644 --- a/test/IDE/complete_exception.swift +++ b/test/IDE/complete_exception.swift @@ -1,53 +1,53 @@ -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=CATCH1 | FileCheck %s -check-prefix=CATCH1 +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=CATCH1 | %FileCheck %s -check-prefix=CATCH1 // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=THROW1 > %t.throw1 -// RUN: FileCheck %s -check-prefix=THROW1 < %t.throw1 -// RUN: FileCheck %s -check-prefix=THROW1-LOCAL < %t.throw1 -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=CATCH2 | FileCheck %s -check-prefix=CATCH2 -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=THROW2 | FileCheck %s -check-prefix=THROW2 -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=CATCH3 | FileCheck %s -check-prefix=CATCH3 -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_CATCH1 | FileCheck %s -check-prefix=CATCH1 -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_THROW1 | FileCheck %s -check-prefix=THROW1 +// RUN: %FileCheck %s -check-prefix=THROW1 < %t.throw1 +// RUN: %FileCheck %s -check-prefix=THROW1-LOCAL < %t.throw1 +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=CATCH2 | %FileCheck %s -check-prefix=CATCH2 +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=THROW2 | %FileCheck %s -check-prefix=THROW2 +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=CATCH3 | %FileCheck %s -check-prefix=CATCH3 +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_CATCH1 | %FileCheck %s -check-prefix=CATCH1 +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_THROW1 | %FileCheck %s -check-prefix=THROW1 // FIXME: No dot code completion results in switch case or catch stmt at top-level -// RUNdisabled: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_CATCH2 | FileCheck %s -check-prefix=CATCH2 -// RUNdisabled: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_THROW2 | FileCheck %s -check-prefix=THROW2 +// RUNdisabled: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_CATCH2 | %FileCheck %s -check-prefix=CATCH2 +// RUNdisabled: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_THROW2 | %FileCheck %s -check-prefix=THROW2 // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=INSIDE_CATCH1 > %t.inside_catch1 -// RUN: FileCheck %s -check-prefix=STMT < %t.inside_catch1 -// RUN: FileCheck %s -check-prefix=IMPLICIT_ERROR < %t.inside_catch1 +// RUN: %FileCheck %s -check-prefix=STMT < %t.inside_catch1 +// RUN: %FileCheck %s -check-prefix=IMPLICIT_ERROR < %t.inside_catch1 // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=INSIDE_CATCH2 > %t.inside_catch2 -// RUN: FileCheck %s -check-prefix=STMT < %t.inside_catch2 -// RUN: FileCheck %s -check-prefix=EXPLICIT_ERROR_E < %t.inside_catch2 +// RUN: %FileCheck %s -check-prefix=STMT < %t.inside_catch2 +// RUN: %FileCheck %s -check-prefix=EXPLICIT_ERROR_E < %t.inside_catch2 // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=INSIDE_CATCH3 > %t.inside_catch3 -// RUN: FileCheck %s -check-prefix=STMT < %t.inside_catch3 -// RUN: FileCheck %s -check-prefix=EXPLICIT_NSERROR_E < %t.inside_catch3 +// RUN: %FileCheck %s -check-prefix=STMT < %t.inside_catch3 +// RUN: %FileCheck %s -check-prefix=EXPLICIT_NSERROR_E < %t.inside_catch3 // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=INSIDE_CATCH4 > %t.inside_catch4 -// RUN: FileCheck %s -check-prefix=STMT < %t.inside_catch4 -// RUN: FileCheck %s -check-prefix=EXPLICIT_ERROR_PAYLOAD_I < %t.inside_catch4 +// RUN: %FileCheck %s -check-prefix=STMT < %t.inside_catch4 +// RUN: %FileCheck %s -check-prefix=EXPLICIT_ERROR_PAYLOAD_I < %t.inside_catch4 // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=INSIDE_CATCH5 > %t.inside_catch5 -// RUN: FileCheck %s -check-prefix=STMT < %t.inside_catch5 -// RUN: FileCheck %s -check-prefix=EXPLICIT_ERROR_E < %t.inside_catch5 -// RUN: FileCheck %s -check-prefix=NO_ERROR_AND_A < %t.inside_catch5 +// RUN: %FileCheck %s -check-prefix=STMT < %t.inside_catch5 +// RUN: %FileCheck %s -check-prefix=EXPLICIT_ERROR_E < %t.inside_catch5 +// RUN: %FileCheck %s -check-prefix=NO_ERROR_AND_A < %t.inside_catch5 // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=INSIDE_CATCH6 > %t.inside_catch6 -// RUN: FileCheck %s -check-prefix=STMT < %t.inside_catch6 -// RUN: FileCheck %s -check-prefix=NO_E < %t.inside_catch6 -// RUN: FileCheck %s -check-prefix=NO_ERROR_AND_A < %t.inside_catch6 +// RUN: %FileCheck %s -check-prefix=STMT < %t.inside_catch6 +// RUN: %FileCheck %s -check-prefix=NO_E < %t.inside_catch6 +// RUN: %FileCheck %s -check-prefix=NO_ERROR_AND_A < %t.inside_catch6 -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=INSIDE_CATCH_ERR_DOT1 | FileCheck %s -check-prefix=ERROR_DOT -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=INSIDE_CATCH_ERR_DOT2 | FileCheck %s -check-prefix=ERROR_DOT -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=INSIDE_CATCH_ERR_DOT3 | FileCheck %s -check-prefix=NSERROR_DOT -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=INSIDE_CATCH_ERR_DOT4 | FileCheck %s -check-prefix=INT_DOT +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=INSIDE_CATCH_ERR_DOT1 | %FileCheck %s -check-prefix=ERROR_DOT +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=INSIDE_CATCH_ERR_DOT2 | %FileCheck %s -check-prefix=ERROR_DOT +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=INSIDE_CATCH_ERR_DOT3 | %FileCheck %s -check-prefix=NSERROR_DOT +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=INSIDE_CATCH_ERR_DOT4 | %FileCheck %s -check-prefix=INT_DOT // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_INSIDE_CATCH1 > %t.top_level_inside_catch1 -// RUN: FileCheck %s -check-prefix=STMT < %t.top_level_inside_catch1 -// RUN: FileCheck %s -check-prefix=IMPLICIT_ERROR < %t.top_level_inside_catch1 +// RUN: %FileCheck %s -check-prefix=STMT < %t.top_level_inside_catch1 +// RUN: %FileCheck %s -check-prefix=IMPLICIT_ERROR < %t.top_level_inside_catch1 -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_INSIDE_CATCH_ERR_DOT1 | FileCheck %s -check-prefix=ERROR_DOT +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_INSIDE_CATCH_ERR_DOT1 | %FileCheck %s -check-prefix=ERROR_DOT // REQUIRES: objc_interop diff --git a/test/IDE/complete_expr_postfix_begin.swift b/test/IDE/complete_expr_postfix_begin.swift index 2ccf2ac6621ee..9470a1cbd58d6 100644 --- a/test/IDE/complete_expr_postfix_begin.swift +++ b/test/IDE/complete_expr_postfix_begin.swift @@ -1,68 +1,68 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_1 | FileCheck %s -check-prefix=COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_2 | FileCheck %s -check-prefix=COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_3 | FileCheck %s -check-prefix=COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_4 | FileCheck %s -check-prefix=COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_5 | FileCheck %s -check-prefix=COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_6 | FileCheck %s -check-prefix=COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_1 | %FileCheck %s -check-prefix=COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_2 | %FileCheck %s -check-prefix=COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_3 | %FileCheck %s -check-prefix=COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_4 | %FileCheck %s -check-prefix=COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_5 | %FileCheck %s -check-prefix=COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_6 | %FileCheck %s -check-prefix=COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_IGNORED_1 | FileCheck %s -check-prefix=COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_IGNORED_2 | FileCheck %s -check-prefix=COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_IGNORED_3 | FileCheck %s -check-prefix=COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_IGNORED_1 | %FileCheck %s -check-prefix=COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_IGNORED_2 | %FileCheck %s -check-prefix=COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_IGNORED_3 | %FileCheck %s -check-prefix=COMMON // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_FUNC_PARAM_1 > %t.param.txt -// RUN: FileCheck %s -check-prefix=COMMON < %t.param.txt -// RUN: FileCheck %s -check-prefix=FIND_FUNC_PARAM_1 < %t.param.txt -// RUN: FileCheck %s -check-prefix=NO_SELF < %t.param.txt +// RUN: %FileCheck %s -check-prefix=COMMON < %t.param.txt +// RUN: %FileCheck %s -check-prefix=FIND_FUNC_PARAM_1 < %t.param.txt +// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.param.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_FUNC_PARAM_2 > %t.param.txt -// RUN: FileCheck %s -check-prefix=COMMON < %t.param.txt -// RUN: FileCheck %s -check-prefix=FIND_FUNC_PARAM_2 < %t.param.txt -// RUN: FileCheck %s -check-prefix=NO_SELF < %t.param.txt +// RUN: %FileCheck %s -check-prefix=COMMON < %t.param.txt +// RUN: %FileCheck %s -check-prefix=FIND_FUNC_PARAM_2 < %t.param.txt +// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.param.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_FUNC_PARAM_3 | FileCheck %s -check-prefix=FIND_FUNC_PARAM_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_FUNC_PARAM_4 | FileCheck %s -check-prefix=FIND_FUNC_PARAM_4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_FUNC_PARAM_5 | FileCheck %s -check-prefix=FIND_FUNC_PARAM_5 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_FUNC_PARAM_6 | FileCheck %s -check-prefix=FIND_FUNC_PARAM_6 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_FUNC_PARAM_7 | FileCheck %s -check-prefix=FIND_FUNC_PARAM_7 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_FUNC_PARAM_3 | %FileCheck %s -check-prefix=FIND_FUNC_PARAM_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_FUNC_PARAM_4 | %FileCheck %s -check-prefix=FIND_FUNC_PARAM_4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_FUNC_PARAM_5 | %FileCheck %s -check-prefix=FIND_FUNC_PARAM_5 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_FUNC_PARAM_6 | %FileCheck %s -check-prefix=FIND_FUNC_PARAM_6 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_FUNC_PARAM_7 | %FileCheck %s -check-prefix=FIND_FUNC_PARAM_7 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_FUNC_PARAM_SELECTOR_1 > %t.param.txt -// RUN: FileCheck %s -check-prefix=COMMON < %t.param.txt -// RUN: FileCheck %s -check-prefix=FIND_FUNC_PARAM_SELECTOR_1 < %t.param.txt -// RUN: FileCheck %s -check-prefix=NO_SELF < %t.param.txt +// RUN: %FileCheck %s -check-prefix=COMMON < %t.param.txt +// RUN: %FileCheck %s -check-prefix=FIND_FUNC_PARAM_SELECTOR_1 < %t.param.txt +// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.param.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_CONSTRUCTOR_PARAM_1 | FileCheck %s -check-prefix=FIND_CONSTRUCTOR_PARAM_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_CONSTRUCTOR_PARAM_2 | FileCheck %s -check-prefix=FIND_CONSTRUCTOR_PARAM_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_CONSTRUCTOR_PARAM_3 | FileCheck %s -check-prefix=FIND_CONSTRUCTOR_PARAM_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_CONSTRUCTOR_PARAM_4 | FileCheck %s -check-prefix=FIND_CONSTRUCTOR_PARAM_4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_CONSTRUCTOR_PARAM_5 | FileCheck %s -check-prefix=FIND_CONSTRUCTOR_PARAM_5 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_CONSTRUCTOR_PARAM_1 | %FileCheck %s -check-prefix=FIND_CONSTRUCTOR_PARAM_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_CONSTRUCTOR_PARAM_2 | %FileCheck %s -check-prefix=FIND_CONSTRUCTOR_PARAM_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_CONSTRUCTOR_PARAM_3 | %FileCheck %s -check-prefix=FIND_CONSTRUCTOR_PARAM_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_CONSTRUCTOR_PARAM_4 | %FileCheck %s -check-prefix=FIND_CONSTRUCTOR_PARAM_4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_CONSTRUCTOR_PARAM_5 | %FileCheck %s -check-prefix=FIND_CONSTRUCTOR_PARAM_5 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_CONSTRUCTOR_PARAM_SELECTOR_1 | FileCheck %s -check-prefix=FIND_CONSTRUCTOR_PARAM_SELECTOR_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_CONSTRUCTOR_PARAM_SELECTOR_1 | %FileCheck %s -check-prefix=FIND_CONSTRUCTOR_PARAM_SELECTOR_1 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_DESTRUCTOR_PARAM_1 > %t.param.txt -// RUN: FileCheck %s -check-prefix=FIND_DESTRUCTOR_PARAM_1 < %t.param.txt +// RUN: %FileCheck %s -check-prefix=FIND_DESTRUCTOR_PARAM_1 < %t.param.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FIND_DESTRUCTOR_PARAM_2 > %t.param.txt -// RUN: FileCheck %s -check-prefix=FIND_DESTRUCTOR_PARAM_2 < %t.param.txt +// RUN: %FileCheck %s -check-prefix=FIND_DESTRUCTOR_PARAM_2 < %t.param.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NO_PLACEHOLDER_NAMES_1 | FileCheck %s -check-prefix=NO_PLACEHOLDER_NAMES_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NO_PLACEHOLDER_NAMES_1 | %FileCheck %s -check-prefix=NO_PLACEHOLDER_NAMES_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_INVALID_1 | FileCheck %s -check-prefix=COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_INVALID_2 | FileCheck %s -check-prefix=COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_INVALID_3 | FileCheck %s -check-prefix=COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_INVALID_5 | FileCheck %s -check-prefix=COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_INVALID_6 | FileCheck %s -check-prefix=COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_INVALID_7 | FileCheck %s -check-prefix=COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_INVALID_8 | FileCheck %s -check-prefix=COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_INVALID_1 | %FileCheck %s -check-prefix=COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_INVALID_2 | %FileCheck %s -check-prefix=COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_INVALID_3 | %FileCheck %s -check-prefix=COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_INVALID_5 | %FileCheck %s -check-prefix=COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_INVALID_6 | %FileCheck %s -check-prefix=COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_INVALID_7 | %FileCheck %s -check-prefix=COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_INVALID_8 | %FileCheck %s -check-prefix=COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_TYPEALIAS_1 | FileCheck %s -check-prefix=MY_ALIAS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_TYPEALIAS_2 | FileCheck %s -check-prefix=MY_ALIAS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_TYPEALIAS_1 | %FileCheck %s -check-prefix=MY_ALIAS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_TYPEALIAS_2 | %FileCheck %s -check-prefix=MY_ALIAS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FOR_EACH_1 | FileCheck %s -check-prefix=IN_FOR_EACH_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FOR_EACH_2 | FileCheck %s -check-prefix=IN_FOR_EACH_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FOR_EACH_3 | FileCheck %s -check-prefix=IN_FOR_EACH_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FOR_EACH_4 | FileCheck %s -check-prefix=IN_FOR_EACH_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FOR_EACH_1 | %FileCheck %s -check-prefix=IN_FOR_EACH_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FOR_EACH_2 | %FileCheck %s -check-prefix=IN_FOR_EACH_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FOR_EACH_3 | %FileCheck %s -check-prefix=IN_FOR_EACH_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FOR_EACH_4 | %FileCheck %s -check-prefix=IN_FOR_EACH_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEPRECATED_1 | FileCheck %s -check-prefix=DEPRECATED_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEPRECATED_1 | %FileCheck %s -check-prefix=DEPRECATED_1 // // Test code completion at the beginning of expr-postfix. diff --git a/test/IDE/complete_expr_tuple.swift b/test/IDE/complete_expr_tuple.swift index 4f0bb75f88727..b2bfb9f7b9fc5 100644 --- a/test/IDE/complete_expr_tuple.swift +++ b/test/IDE/complete_expr_tuple.swift @@ -1,23 +1,23 @@ // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TUPLE_NO_DOT_1 > %t.tuple.txt -// RUN: FileCheck %s -check-prefix=TUPLE_NO_DOT_1 < %t.tuple.txt +// RUN: %FileCheck %s -check-prefix=TUPLE_NO_DOT_1 < %t.tuple.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TUPLE_NO_DOT_2 > %t.tuple.txt -// RUN: FileCheck %s -check-prefix=TUPLE_NO_DOT_2 < %t.tuple.txt +// RUN: %FileCheck %s -check-prefix=TUPLE_NO_DOT_2 < %t.tuple.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TUPLE_NO_DOT_3 > %t.tuple.txt -// RUN: FileCheck %s -check-prefix=TUPLE_NO_DOT_3 < %t.tuple.txt +// RUN: %FileCheck %s -check-prefix=TUPLE_NO_DOT_3 < %t.tuple.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TUPLE_DOT_1 > %t.tuple.txt -// RUN: FileCheck %s -check-prefix=TUPLE_DOT_1 < %t.tuple.txt +// RUN: %FileCheck %s -check-prefix=TUPLE_DOT_1 < %t.tuple.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TUPLE_DOT_2 > %t.tuple.txt -// RUN: FileCheck %s -check-prefix=TUPLE_DOT_2 < %t.tuple.txt +// RUN: %FileCheck %s -check-prefix=TUPLE_DOT_2 < %t.tuple.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TUPLE_DOT_3 > %t.tuple.txt -// RUN: FileCheck %s -check-prefix=TUPLE_DOT_3 < %t.tuple.txt +// RUN: %FileCheck %s -check-prefix=TUPLE_DOT_3 < %t.tuple.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TUPLE_NESTED_1 > %t.tuple.txt -// RUN: FileCheck %s -check-prefix=TUPLE_NESTED_1 < %t.tuple.txt +// RUN: %FileCheck %s -check-prefix=TUPLE_NESTED_1 < %t.tuple.txt //===--- //===--- Test code completion for expressions that have tuple type. diff --git a/test/IDE/complete_from_clang_framework.swift b/test/IDE/complete_from_clang_framework.swift index 95f51f01a6308..308ea48ccd9a8 100644 --- a/test/IDE/complete_from_clang_framework.swift +++ b/test/IDE/complete_from_clang_framework.swift @@ -1,32 +1,32 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=SWIFT_COMPLETIONS | FileCheck %s -check-prefix=SWIFT_COMPLETIONS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=SWIFT_COMPLETIONS | %FileCheck %s -check-prefix=SWIFT_COMPLETIONS // RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=FW_UNQUAL_1 > %t.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_FOO < %t.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_FOO_SUB < %t.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_FOO_HELPER < %t.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_FOO_HELPER_SUB < %t.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_BAR < %t.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_BOTH_FOO_BAR < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_FOO < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_FOO_SUB < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_FOO_HELPER < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_FOO_HELPER_SUB < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_BAR < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_BOTH_FOO_BAR < %t.compl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_QUAL_FOO_1 > %t.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_FOO < %t.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_FOO_SUB < %t.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_QUAL_FOO_NEGATIVE < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_FOO < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_FOO_SUB < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_QUAL_FOO_NEGATIVE < %t.compl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_QUAL_BAR_1 > %t.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_QUAL_BAR_1 < %t.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_BAR < %t.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_QUAL_BAR_NEGATIVE < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_QUAL_BAR_1 < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_BAR < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_QUAL_BAR_NEGATIVE < %t.compl.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_QUAL_FOO_2 | FileCheck %s -check-prefix=CLANG_QUAL_FOO_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_QUAL_FOO_2 | %FileCheck %s -check-prefix=CLANG_QUAL_FOO_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=FUNCTION_CALL_1 | FileCheck %s -check-prefix=FUNCTION_CALL_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=FUNCTION_CALL_2 | FileCheck %s -check-prefix=FUNCTION_CALL_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=FUNCTION_CALL_1 | %FileCheck %s -check-prefix=FUNCTION_CALL_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=FUNCTION_CALL_2 | %FileCheck %s -check-prefix=FUNCTION_CALL_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_STRUCT_MEMBERS_1 | FileCheck %s -check-prefix=CLANG_STRUCT_MEMBERS_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_CLASS_MEMBERS_1 | FileCheck %s -check-prefix=CLANG_CLASS_MEMBERS_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_CLASS_MEMBERS_2 | FileCheck %s -check-prefix=CLANG_CLASS_MEMBERS_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_INSTANCE_MEMBERS_1 | FileCheck %s -check-prefix=CLANG_INSTANCE_MEMBERS_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_STRUCT_MEMBERS_1 | %FileCheck %s -check-prefix=CLANG_STRUCT_MEMBERS_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_CLASS_MEMBERS_1 | %FileCheck %s -check-prefix=CLANG_CLASS_MEMBERS_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_CLASS_MEMBERS_2 | %FileCheck %s -check-prefix=CLANG_CLASS_MEMBERS_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_INSTANCE_MEMBERS_1 | %FileCheck %s -check-prefix=CLANG_INSTANCE_MEMBERS_1 // XFAIL: linux diff --git a/test/IDE/complete_from_clang_importer_framework.swift b/test/IDE/complete_from_clang_importer_framework.swift index 0953eeda9c7b3..3979d7bb09379 100644 --- a/test/IDE/complete_from_clang_importer_framework.swift +++ b/test/IDE/complete_from_clang_importer_framework.swift @@ -1,11 +1,11 @@ // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=CLANG_UNQUAL_1 > %t.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_CTYPES < %t.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_MACROS < %t.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_DARWIN < %t.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_DARWIN_NEG < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_CTYPES < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_MACROS < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_DARWIN < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_DARWIN_NEG < %t.compl.txt // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=CLANG_MEMBER1 > %t.compl.txt -// RUN: FileCheck %s -check-prefix=CLANG_MEMBERS1 < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=CLANG_MEMBERS1 < %t.compl.txt import macros import ctypes diff --git a/test/IDE/complete_from_constraint_extensions.swift b/test/IDE/complete_from_constraint_extensions.swift index b2942d47c0326..1b91f54ae1fbf 100644 --- a/test/IDE/complete_from_constraint_extensions.swift +++ b/test/IDE/complete_from_constraint_extensions.swift @@ -1,6 +1,6 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONSTRAINT1 | FileCheck %s -check-prefix=CONSTRAINT1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONSTRAINT2 | FileCheck %s -check-prefix=CONSTRAINT2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONSTRAINT3 | FileCheck %s -check-prefix=CONSTRAINT3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONSTRAINT1 | %FileCheck %s -check-prefix=CONSTRAINT1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONSTRAINT2 | %FileCheck %s -check-prefix=CONSTRAINT2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONSTRAINT3 | %FileCheck %s -check-prefix=CONSTRAINT3 public protocol P1 {} public protocol P2 {} diff --git a/test/IDE/complete_from_foundation_overlay.swift b/test/IDE/complete_from_foundation_overlay.swift index 26ee5b9ede958..efa967d6fc9eb 100644 --- a/test/IDE/complete_from_foundation_overlay.swift +++ b/test/IDE/complete_from_foundation_overlay.swift @@ -1,12 +1,12 @@ import Foundation // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PLAIN_TOP_LEVEL_1 > %t.toplevel.txt -// RUN: FileCheck %s -check-prefix=PLAIN_TOP_LEVEL < %t.toplevel.txt -// RUN: FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.toplevel.txt +// RUN: %FileCheck %s -check-prefix=PLAIN_TOP_LEVEL < %t.toplevel.txt +// RUN: %FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.toplevel.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PRIVATE_NOMINAL_MEMBERS_1 > %t.members.txt -// RUN: FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_1 < %t.members.txt -// RUN: FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members.txt +// RUN: %FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_1 < %t.members.txt +// RUN: %FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members.txt // REQUIRES: objc_interop diff --git a/test/IDE/complete_from_reexport.swift b/test/IDE/complete_from_reexport.swift index 3336d7f5dbcd1..90f2b74d0fcb4 100644 --- a/test/IDE/complete_from_reexport.swift +++ b/test/IDE/complete_from_reexport.swift @@ -5,8 +5,8 @@ // RUN: %target-swift-frontend -emit-module -module-name FooSwiftModuleOverlay %S/Inputs/foo_swift_module_overlay.swift -I %t -o %t // // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_1 -I %t > %t.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_1 < %t.txt -// RUN: FileCheck %s -check-prefix=NO_DUPLICATES < %t.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_1 < %t.txt +// RUN: %FileCheck %s -check-prefix=NO_DUPLICATES < %t.txt // TOP_LEVEL_1: Begin completions // TOP_LEVEL_1-DAG: Decl[FreeFunction]/OtherModule[FooSwiftModuleOverlay]: overlayedFoo()[#Void#]{{; name=.+$}} diff --git a/test/IDE/complete_from_stdlib.swift b/test/IDE/complete_from_stdlib.swift index f444c06e9c2e0..e79e39d3cbc33 100644 --- a/test/IDE/complete_from_stdlib.swift +++ b/test/IDE/complete_from_stdlib.swift @@ -1,70 +1,70 @@ // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PLAIN_TOP_LEVEL_1 > %t.toplevel.txt -// RUN: FileCheck %s -check-prefix=PLAIN_TOP_LEVEL < %t.toplevel.txt -// RUN: FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.toplevel.txt +// RUN: %FileCheck %s -check-prefix=PLAIN_TOP_LEVEL < %t.toplevel.txt +// RUN: %FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.toplevel.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PRIVATE_NOMINAL_MEMBERS_1 > %t.members1.txt -// RUN: FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_1 < %t.members1.txt -// RUN: FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members1.txt +// RUN: %FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_1 < %t.members1.txt +// RUN: %FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members1.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PRIVATE_NOMINAL_MEMBERS_2B > %t.members2a.txt -// RUN: FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_2 < %t.members2a.txt -// RUN: FileCheck %s -check-prefix=NEGATIVE_PRIVATE_NOMINAL_MEMBERS_2 < %t.members2a.txt +// RUN: %FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_2 < %t.members2a.txt +// RUN: %FileCheck %s -check-prefix=NEGATIVE_PRIVATE_NOMINAL_MEMBERS_2 < %t.members2a.txt // FIXME: filter? -// RUN-disabled: FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members2a.txt +// RUN-disabled: %FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members2a.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PRIVATE_NOMINAL_MEMBERS_2B > %t.members2b.txt -// RUN: FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_2 < %t.members2b.txt -// RUN: FileCheck %s -check-prefix=NEGATIVE_PRIVATE_NOMINAL_MEMBERS_2 < %t.members2b.txt +// RUN: %FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_2 < %t.members2b.txt +// RUN: %FileCheck %s -check-prefix=NEGATIVE_PRIVATE_NOMINAL_MEMBERS_2 < %t.members2b.txt // FIXME: filter? -// RUN-disabled: FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members2b.txt +// RUN-disabled: %FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members2b.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PRIVATE_NOMINAL_MEMBERS_3 > %t.members3.txt -// RUN: FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_3 < %t.members3.txt -// RUN: FileCheck %s -check-prefix=NEGATIVE_PRIVATE_NOMINAL_MEMBERS_3 < %t.members3.txt +// RUN: %FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_3 < %t.members3.txt +// RUN: %FileCheck %s -check-prefix=NEGATIVE_PRIVATE_NOMINAL_MEMBERS_3 < %t.members3.txt // FIXME: filter? -// RUN-disabled: FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members3.txt +// RUN-disabled: %FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members3.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PRIVATE_NOMINAL_MEMBERS_4 > %t.members4.txt -// RUN: FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_4 < %t.members4.txt -// RUN: FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members4.txt +// RUN: %FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_4 < %t.members4.txt +// RUN: %FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members4.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PRIVATE_NOMINAL_MEMBERS_5 > %t.members5.txt -// RUN: FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_5 < %t.members5.txt -// RUN: FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members5.txt +// RUN: %FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_5 < %t.members5.txt +// RUN: %FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members5.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PRIVATE_NOMINAL_MEMBERS_6 > %t.members6.txt -// RUN: FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_6 < %t.members6.txt -// RUN: FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members6.txt +// RUN: %FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_6 < %t.members6.txt +// RUN: %FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members6.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PRIVATE_NOMINAL_MEMBERS_7 > %t.members7.txt -// RUN: FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_7 < %t.members7.txt -// RUN: FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members7.txt +// RUN: %FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_7 < %t.members7.txt +// RUN: %FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members7.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PRIVATE_NOMINAL_MEMBERS_8 > %t.members8.txt -// RUN: FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_8 < %t.members8.txt -// RUN: FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members8.txt +// RUN: %FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_8 < %t.members8.txt +// RUN: %FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members8.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PRIVATE_NOMINAL_MEMBERS_9 > %t.members9.txt -// RUN: FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_9 < %t.members9.txt -// RUN: FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members9.txt +// RUN: %FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_9 < %t.members9.txt +// RUN: %FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members9.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PRIVATE_NOMINAL_MEMBERS_10 > %t.members10.txt -// RUN: FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_10 < %t.members10.txt -// RUN: FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members10.txt +// RUN: %FileCheck %s -check-prefix=PRIVATE_NOMINAL_MEMBERS_10 < %t.members10.txt +// RUN: %FileCheck %s -check-prefix=NO_STDLIB_PRIVATE < %t.members10.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RETURNS_ANY_SEQUENCE | FileCheck %s -check-prefix=RETURNS_ANY_SEQUENCE +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RETURNS_ANY_SEQUENCE | %FileCheck %s -check-prefix=RETURNS_ANY_SEQUENCE -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=POSTFIX_INT_1 | FileCheck %s -check-prefix=POSTFIX_RVALUE_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=POSTFIX_INT_2 | FileCheck %s -check-prefix=POSTFIX_LVALUE_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=POSTFIX_OPTIONAL_1 | FileCheck %s -check-prefix=POSTFIX_OPTIONAL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=POSTFIX_INT_1 | %FileCheck %s -check-prefix=POSTFIX_RVALUE_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=POSTFIX_INT_2 | %FileCheck %s -check-prefix=POSTFIX_LVALUE_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=POSTFIX_OPTIONAL_1 | %FileCheck %s -check-prefix=POSTFIX_OPTIONAL // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INFIX_INT_1 > %t -// RUN: FileCheck %s -check-prefix=INFIX_INT < %t -// RUN: FileCheck %s -check-prefix=NEGATIVE_INFIX_INT < %t +// RUN: %FileCheck %s -check-prefix=INFIX_INT < %t +// RUN: %FileCheck %s -check-prefix=NEGATIVE_INFIX_INT < %t -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INFIX_INT_2 | FileCheck %s -check-prefix=INFIX_LVALUE_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INFIX_STRING_1 | FileCheck %s -check-prefix=INFIX_STRING -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INFIX_EXT_STRING_1 | FileCheck %s -check-prefix=INFIX_EXT_STRING +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INFIX_INT_2 | %FileCheck %s -check-prefix=INFIX_LVALUE_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INFIX_STRING_1 | %FileCheck %s -check-prefix=INFIX_STRING +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INFIX_EXT_STRING_1 | %FileCheck %s -check-prefix=INFIX_EXT_STRING // NO_STDLIB_PRIVATE: Begin completions // NO_STDLIB_PRIVATE: End completions diff --git a/test/IDE/complete_from_swift_module.swift b/test/IDE/complete_from_swift_module.swift index 4c99c35fdc372..10eef607c243a 100644 --- a/test/IDE/complete_from_swift_module.swift +++ b/test/IDE/complete_from_swift_module.swift @@ -6,35 +6,35 @@ // Note: this test checks both module import case and file import case. // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -code-completion-token=MODULE_QUALIFIED_1 > %t.compl.txt -// RUN: FileCheck %s -check-prefix=MODULE_QUALIFIED_1 < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=MODULE_QUALIFIED_1 < %t.compl.txt // // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %S/Inputs -enable-source-import -code-completion-token=MODULE_QUALIFIED_1 > %t.compl.txt -// RUN: FileCheck %s -check-prefix=MODULE_QUALIFIED_1 < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=MODULE_QUALIFIED_1 < %t.compl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -code-completion-token=MODULE_QUALIFIED_2 > %t.compl.txt -// RUN: FileCheck %s -check-prefix=MODULE_QUALIFIED_2 < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=MODULE_QUALIFIED_2 < %t.compl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -code-completion-token=MODULE_QUALIFIED_3 > %t.compl.txt -// RUN: FileCheck %s -check-prefix=MODULE_QUALIFIED_3 < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=MODULE_QUALIFIED_3 < %t.compl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -code-completion-token=MODULE_QUALIFIED_4 > %t.compl.txt -// RUN: FileCheck %s -check-prefix=MODULE_QUALIFIED_4 < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=MODULE_QUALIFIED_4 < %t.compl.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -code-completion-token=MODULE_QUALIFIED_5 | FileCheck %s -check-prefix=ERROR_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -code-completion-token=MODULE_QUALIFIED_5 | %FileCheck %s -check-prefix=ERROR_COMMON // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -code-completion-token=POSTFIX_OPERATOR_1 > %t.compl.txt -// RUN: FileCheck %s -check-prefix=POSTFIX_OPERATOR_1 < %t.compl.txt -// RUN: FileCheck %s -check-prefix=NEGATIVE_POSTFIX_OPERATOR_1 < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=POSTFIX_OPERATOR_1 < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=NEGATIVE_POSTFIX_OPERATOR_1 < %t.compl.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -code-completion-token=TOP_LEVEL_1 > %t.compl.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_1 < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_1 < %t.compl.txt // rdar://15305873 Code completion: implement proper shadowing of declarations represented by cached results -// FIXME: FileCheck %s -check-prefix=TOP_LEVEL_1_NEGATIVE < %t.compl.txt +// FIXME: %FileCheck %s -check-prefix=TOP_LEVEL_1_NEGATIVE < %t.compl.txt // // RUN: %target-swift-ide-test -code-completion -source-filename %s -I %S/Inputs -enable-source-import -code-completion-token=TOP_LEVEL_1 > %t.compl.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_1 < %t.compl.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_1 < %t.compl.txt // rdar://15305873 Code completion: implement proper shadowing of declarations represented by cached results -// FIXME: FileCheck %s -check-prefix=TOP_LEVEL_1_NEGATIVE < %t.compl.txt +// FIXME: %FileCheck %s -check-prefix=TOP_LEVEL_1_NEGATIVE < %t.compl.txt // ERROR_COMMON: found code completion token // ERROR_COMMON-NOT: Begin completions diff --git a/test/IDE/complete_func_body_typechecking.swift b/test/IDE/complete_func_body_typechecking.swift index 283728a0476a5..7c4d1d1d17a6d 100644 --- a/test/IDE/complete_func_body_typechecking.swift +++ b/test/IDE/complete_func_body_typechecking.swift @@ -1,29 +1,29 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_1 | FileCheck %s -check-prefix=FOO_STRUCT_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_2 | FileCheck %s -check-prefix=FOO_STRUCT_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_3 | FileCheck %s -check-prefix=ERROR_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_4 | FileCheck %s -check-prefix=FOO_STRUCT_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_5 | FileCheck %s -check-prefix=FOO_STRUCT_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_6 | FileCheck %s -check-prefix=FOO_STRUCT_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_7 | FileCheck %s -check-prefix=ERROR_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_1 | %FileCheck %s -check-prefix=FOO_STRUCT_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_2 | %FileCheck %s -check-prefix=FOO_STRUCT_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_3 | %FileCheck %s -check-prefix=ERROR_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_4 | %FileCheck %s -check-prefix=FOO_STRUCT_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_5 | %FileCheck %s -check-prefix=FOO_STRUCT_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_6 | %FileCheck %s -check-prefix=FOO_STRUCT_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_7 | %FileCheck %s -check-prefix=ERROR_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_IN_CONSTRUCTOR_1 | FileCheck %s -check-prefix=FOO_STRUCT_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_IN_CONSTRUCTOR_2 | FileCheck %s -check-prefix=FOO_STRUCT_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_IN_CONSTRUCTOR_1 | %FileCheck %s -check-prefix=FOO_STRUCT_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_IN_CONSTRUCTOR_2 | %FileCheck %s -check-prefix=FOO_STRUCT_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_IN_DESTRUCTOR_1 | FileCheck %s -check-prefix=FOO_STRUCT_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_IN_DESTRUCTOR_1 | %FileCheck %s -check-prefix=FOO_STRUCT_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_IF_1 | FileCheck %s -check-prefix=LOCALS_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_IF_2 | FileCheck %s -check-prefix=LOCALS_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_IF_3 | FileCheck %s -check-prefix=LOCALS_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_IF_4 | FileCheck %s -check-prefix=LOCALS_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_IF_1 | %FileCheck %s -check-prefix=LOCALS_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_IF_2 | %FileCheck %s -check-prefix=LOCALS_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_IF_3 | %FileCheck %s -check-prefix=LOCALS_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_IF_4 | %FileCheck %s -check-prefix=LOCALS_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_IF_IN_CONSTRUCTOR_1 | FileCheck %s -check-prefix=LOCALS_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_IF_IN_DESTRUCTOR_1 | FileCheck %s -check-prefix=LOCALS_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_IF_IN_CONSTRUCTOR_1 | %FileCheck %s -check-prefix=LOCALS_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_VAR_IF_IN_DESTRUCTOR_1 | %FileCheck %s -check-prefix=LOCALS_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_1 | FileCheck %s -check-prefix=LOCALS_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_2 | FileCheck %s -check-prefix=LOCALS_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_1 | %FileCheck %s -check-prefix=LOCALS_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_2 | %FileCheck %s -check-prefix=LOCALS_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_IN_CONSTRUCTOR_1 | FileCheck %s -check-prefix=LOCALS_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_IN_DESTRUCTOR_1 | FileCheck %s -check-prefix=LOCALS_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_IN_CONSTRUCTOR_1 | %FileCheck %s -check-prefix=LOCALS_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_IN_DESTRUCTOR_1 | %FileCheck %s -check-prefix=LOCALS_COMMON struct FooStruct { var instanceVar = 0 diff --git a/test/IDE/complete_func_no_closing_brace.swift b/test/IDE/complete_func_no_closing_brace.swift index b6b5ea4b79736..e50e2aec85b08 100644 --- a/test/IDE/complete_func_no_closing_brace.swift +++ b/test/IDE/complete_func_no_closing_brace.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | FileCheck %s -check-prefix=A +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | %FileCheck %s -check-prefix=A // Make sure we don't crash on a function without a closing brace before EOF. // Don't add any tests at the end of the file! diff --git a/test/IDE/complete_func_no_closing_brace_at_eof_1.swift b/test/IDE/complete_func_no_closing_brace_at_eof_1.swift index e7619dbf1b24b..2da557e13673b 100644 --- a/test/IDE/complete_func_no_closing_brace_at_eof_1.swift +++ b/test/IDE/complete_func_no_closing_brace_at_eof_1.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | FileCheck %s -check-prefix=A +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | %FileCheck %s -check-prefix=A // rdar://14592634 // Make sure we can code complete at EOF inside a function that does not have a diff --git a/test/IDE/complete_func_no_closing_brace_at_eof_2.swift b/test/IDE/complete_func_no_closing_brace_at_eof_2.swift index 4354cf65b1203..2d980ab1a2db1 100644 --- a/test/IDE/complete_func_no_closing_brace_at_eof_2.swift +++ b/test/IDE/complete_func_no_closing_brace_at_eof_2.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | FileCheck %s -check-prefix=A +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | %FileCheck %s -check-prefix=A // rdar://14585132 // Make sure we can resolve function parameters if function body is missing the diff --git a/test/IDE/complete_func_no_closing_brace_at_eof_3.swift b/test/IDE/complete_func_no_closing_brace_at_eof_3.swift index 3c79c6644b821..2d313290a42a2 100644 --- a/test/IDE/complete_func_no_closing_brace_at_eof_3.swift +++ b/test/IDE/complete_func_no_closing_brace_at_eof_3.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | FileCheck %s -check-prefix=A +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=A | %FileCheck %s -check-prefix=A // Make sure we partially type check the function body even if function body is // missing the right brace. diff --git a/test/IDE/complete_generic_optional.swift b/test/IDE/complete_generic_optional.swift index 0f3003553e846..588760c9b7e8b 100644 --- a/test/IDE/complete_generic_optional.swift +++ b/test/IDE/complete_generic_optional.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_OPTIONAL_1 | FileCheck %s -check-prefix=FOO_OPTIONAL_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_OPTIONAL_1 | %FileCheck %s -check-prefix=FOO_OPTIONAL_1 struct Bar { } diff --git a/test/IDE/complete_generic_param.swift b/test/IDE/complete_generic_param.swift index e162a5ddecf36..d37bff857d9ae 100644 --- a/test/IDE/complete_generic_param.swift +++ b/test/IDE/complete_generic_param.swift @@ -1,9 +1,9 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INHERIT1 | FileCheck %s -check-prefix=INHERIT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INHERIT2 | FileCheck %s -check-prefix=INHERIT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INHERIT3 | FileCheck %s -check-prefix=INHERIT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INHERIT4 | FileCheck %s -check-prefix=INHERIT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INHERIT5 | FileCheck %s -check-prefix=INHERIT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INHERIT6 | FileCheck %s -check-prefix=INHERIT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INHERIT1 | %FileCheck %s -check-prefix=INHERIT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INHERIT2 | %FileCheck %s -check-prefix=INHERIT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INHERIT3 | %FileCheck %s -check-prefix=INHERIT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INHERIT4 | %FileCheck %s -check-prefix=INHERIT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INHERIT5 | %FileCheck %s -check-prefix=INHERIT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INHERIT6 | %FileCheck %s -check-prefix=INHERIT class C1{} protocol P1{} diff --git a/test/IDE/complete_import.swift b/test/IDE/complete_import.swift index 9cf95a66570fa..3d717b8c3501c 100644 --- a/test/IDE/complete_import.swift +++ b/test/IDE/complete_import.swift @@ -1,11 +1,11 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT1 | FileCheck %s -check-prefix=CLANG_IMPORT1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT2 | FileCheck %s -check-prefix=CLANG_IMPORT2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT3 | FileCheck %s -check-prefix=CLANG_IMPORT3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT4 | FileCheck %s -check-prefix=CLANG_IMPORT4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT5 | FileCheck %s -check-prefix=CLANG_IMPORT5 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT6 | FileCheck %s -check-prefix=CLANG_IMPORT6 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT7 | FileCheck %s -check-prefix=CLANG_IMPORT7 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT8 | FileCheck %s -check-prefix=CLANG_IMPORT8 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT1 | %FileCheck %s -check-prefix=CLANG_IMPORT1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT2 | %FileCheck %s -check-prefix=CLANG_IMPORT2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT3 | %FileCheck %s -check-prefix=CLANG_IMPORT3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT4 | %FileCheck %s -check-prefix=CLANG_IMPORT4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT5 | %FileCheck %s -check-prefix=CLANG_IMPORT5 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT6 | %FileCheck %s -check-prefix=CLANG_IMPORT6 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT7 | %FileCheck %s -check-prefix=CLANG_IMPORT7 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT8 | %FileCheck %s -check-prefix=CLANG_IMPORT8 // REQUIRES: objc_interop diff --git a/test/IDE/complete_import_multifile1.swift b/test/IDE/complete_import_multifile1.swift index 4f7f26e860cd9..5f4b877471291 100644 --- a/test/IDE/complete_import_multifile1.swift +++ b/test/IDE/complete_import_multifile1.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT1 | FileCheck %s -check-prefix=CLANG_IMPORT1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -second-source-filename %S/Inputs/complete_import_multifile2.swift -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT1 | FileCheck %s -check-prefix=CLANG_IMPORT1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT1 | %FileCheck %s -check-prefix=CLANG_IMPORT1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -second-source-filename %S/Inputs/complete_import_multifile2.swift -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT1 | %FileCheck %s -check-prefix=CLANG_IMPORT1 // REQUIRES: objc_interop import #^CLANG_IMPORT1^# diff --git a/test/IDE/complete_in_accessors.swift b/test/IDE/complete_in_accessors.swift index 1d38f8449c8f8..99ea62a9b7385 100644 --- a/test/IDE/complete_in_accessors.swift +++ b/test/IDE/complete_in_accessors.swift @@ -1,117 +1,117 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_IMPLICIT_GET_1 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_IMPLICIT_GET_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_IMPLICIT_GET_1 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_IMPLICIT_GET_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_GET_1 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_GET_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_GET_1 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_GET_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_SET_1 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_SET_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_SET_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_SET_3 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_SET_4 | FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_SET_4 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_WILLSET_1 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_WILLSET_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_WILLSET_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_WILLSET_3 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_DIDSET_1 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_OLDVALUE < %t.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_DIDSET_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_OLDVALUE < %t.txt +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_DIDSET_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_DIDSET_3 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_OLDVALUE < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_OLDVALUE < %t.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_INIT_1 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_INIT_2 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_INIT_1 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_ACCESSOR_INIT_2 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_IMPLICIT_GET_1 | FileCheck %s -check-prefix=WITH_MEMBER_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_IMPLICIT_GET_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_IMPLICIT_GET_1 | %FileCheck %s -check-prefix=WITH_MEMBER_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_IMPLICIT_GET_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_GET_1 | FileCheck %s -check-prefix=WITH_MEMBER_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_GET_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_GET_1 | %FileCheck %s -check-prefix=WITH_MEMBER_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_GET_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_SET_1 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_MEMBER_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_SET_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %FileCheck %s -check-prefix=WITH_MEMBER_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_SET_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_SET_3 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_MEMBER_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_SET_4 | FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %FileCheck %s -check-prefix=WITH_MEMBER_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_SET_4 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_WILLSET_1 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_MEMBER_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_WILLSET_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %FileCheck %s -check-prefix=WITH_MEMBER_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_WILLSET_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_WILLSET_3 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_MEMBER_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_MEMBER_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_DIDSET_1 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_MEMBER_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_OLDVALUE < %t.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_DIDSET_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %FileCheck %s -check-prefix=WITH_MEMBER_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_OLDVALUE < %t.txt +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_DIDSET_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_DIDSET_3 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_MEMBER_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_OLDVALUE < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_MEMBER_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_OLDVALUE < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_INIT_1 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_MEMBER_DECLS_INIT < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_MEMBER_DECLS_INIT_WRONG < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_MEMBER_DECLS_INIT < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_MEMBER_DECLS_INIT_WRONG < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_ACCESSOR_INIT_2 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_MEMBER_DECLS_INIT < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_MEMBER_DECLS_INIT_WRONG < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_MEMBER_DECLS_INIT < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_MEMBER_DECLS_INIT_WRONG < %t.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_IMPLICIT_GET_1 | FileCheck %s -check-prefix=WITH_LOCAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_IMPLICIT_GET_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_IMPLICIT_GET_1 | %FileCheck %s -check-prefix=WITH_LOCAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_IMPLICIT_GET_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_GET_1 | FileCheck %s -check-prefix=WITH_LOCAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_GET_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_GET_1 | %FileCheck %s -check-prefix=WITH_LOCAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_GET_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_SET_1 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_LOCAL_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_SET_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %FileCheck %s -check-prefix=WITH_LOCAL_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_SET_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_SET_3 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_LOCAL_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_SET_4 | FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %FileCheck %s -check-prefix=WITH_LOCAL_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_SET_4 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_WILLSET_1 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_LOCAL_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_WILLSET_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %FileCheck %s -check-prefix=WITH_LOCAL_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_WILLSET_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_WILLSET_3 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_LOCAL_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_LOCAL_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_NEWVALUE < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_DIDSET_1 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_LOCAL_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_OLDVALUE < %t.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_DIDSET_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %FileCheck %s -check-prefix=WITH_LOCAL_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_OLDVALUE < %t.txt +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_DIDSET_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_DIDSET_3 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_LOCAL_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_OLDVALUE < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_LOCAL_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_OLDVALUE < %t.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_INIT_1 | FileCheck %s -check-prefix=WITH_LOCAL_DECLS1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_INIT_2 | FileCheck %s -check-prefix=WITH_LOCAL_DECLS1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_INIT_1 | %FileCheck %s -check-prefix=WITH_LOCAL_DECLS1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_ACCESSOR_INIT_2 | %FileCheck %s -check-prefix=WITH_LOCAL_DECLS1 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ACCESSOR_IN_MEMBER_FUNC_1 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_DECLS1 < %t.txt -// RUN: FileCheck %s -check-prefix=ACCESSORS_IN_MEMBER_FUNC_1 < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS1 < %t.txt +// RUN: %FileCheck %s -check-prefix=ACCESSORS_IN_MEMBER_FUNC_1 < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ACCESSOR_IN_MEMBER_FUNC_2 > %t.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_DECLS < %t.txt -// RUN: FileCheck %s -check-prefix=ACCESSORS_IN_MEMBER_FUNC_2 < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS < %t.txt +// RUN: %FileCheck %s -check-prefix=ACCESSORS_IN_MEMBER_FUNC_2 < %t.txt //===--- Helper types that are used in this test diff --git a/test/IDE/complete_in_closures.swift b/test/IDE/complete_in_closures.swift index 23dd57e8baf59..3643fab829ed5 100644 --- a/test/IDE/complete_in_closures.swift +++ b/test/IDE/complete_in_closures.swift @@ -1,56 +1,56 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_CLOSURE_PARAM_1 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_CLOSURE_PARAM_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_PARENT_PARAM_1 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_PARENT_PARAM_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_PARENT_PARAM_3 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_PARENT_PARAM_4 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_PARENT_PARAM_5 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_PARENT_PARAM_6 | FileCheck %s -check-prefix=FOO_OBJECT_DOT - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RETURN_1 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_1 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_2 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_3 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_4 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_5 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_6 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_7 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_8 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_9 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_10 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS_AND_LOCAL1 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_1 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_3 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_4 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_5 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_6 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_7 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_8 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_9 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_10 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_11 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_12 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_13 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_14 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_15 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_16 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_17 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_18 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_19 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=STRUCT_INHERITANCE_IN_CLOSURE_0 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_INHERITANCE_IN_CLOSURE_0 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARGUMENT_TYPE_IN_CLOSURE_0 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=STRUCT_INHERITANCE_IN_CLOSURE_1 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_INHERITANCE_IN_CLOSURE_1 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARGUMENT_TYPE_IN_CLOSURE_1 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=STRUCT_INHERITANCE_IN_CLOSURE_2 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_INHERITANCE_IN_CLOSURE_2 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARGUMENT_TYPE_IN_CLOSURE_2 | FileCheck %s -check-prefix=WITH_GLOBAL_DECLS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLOSURE_PARAM_1 | FileCheck %s -check-prefix=CLOSURE_PARAM_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLOSURE_PARAM_2 | FileCheck %s -check-prefix=CLOSURE_PARAM_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_CLOSURE_PARAM_1 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_CLOSURE_PARAM_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_PARENT_PARAM_1 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_PARENT_PARAM_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_PARENT_PARAM_3 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_PARENT_PARAM_4 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_PARENT_PARAM_5 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_PARENT_PARAM_6 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RETURN_1 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_1 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_2 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_3 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_4 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_5 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_6 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_7 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_8 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_9 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DELAYED_10 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS_AND_LOCAL1 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_1 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_3 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_4 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_5 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_6 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_7 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_8 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_9 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_10 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_11 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_12 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_13 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_14 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_15 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_16 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_17 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_18 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TRAILING_CLOSURE_19 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=STRUCT_INHERITANCE_IN_CLOSURE_0 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_INHERITANCE_IN_CLOSURE_0 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARGUMENT_TYPE_IN_CLOSURE_0 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=STRUCT_INHERITANCE_IN_CLOSURE_1 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_INHERITANCE_IN_CLOSURE_1 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARGUMENT_TYPE_IN_CLOSURE_1 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=STRUCT_INHERITANCE_IN_CLOSURE_2 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_INHERITANCE_IN_CLOSURE_2 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARGUMENT_TYPE_IN_CLOSURE_2 | %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLOSURE_PARAM_1 | %FileCheck %s -check-prefix=CLOSURE_PARAM_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLOSURE_PARAM_2 | %FileCheck %s -check-prefix=CLOSURE_PARAM_2 // ERROR_COMMON: found code completion token // ERROR_COMMON-NOT: Begin completions diff --git a/test/IDE/complete_in_enum_decl.swift b/test/IDE/complete_in_enum_decl.swift index 8ec8cef9fa225..1390911a522eb 100644 --- a/test/IDE/complete_in_enum_decl.swift +++ b/test/IDE/complete_in_enum_decl.swift @@ -1,9 +1,9 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_CASE_1 | FileCheck %s -check-prefix=NO_RESULTS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_CASE_2 | FileCheck %s -check-prefix=NO_RESULTS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_CASE_3 | FileCheck %s -check-prefix=NO_RESULTS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_CASE_4 | FileCheck %s -check-prefix=NO_RESULTS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_CASE_5 | FileCheck %s -check-prefix=NO_RESULTS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_CASE_6 | FileCheck %s -check-prefix=NO_RESULTS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_CASE_1 | %FileCheck %s -check-prefix=NO_RESULTS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_CASE_2 | %FileCheck %s -check-prefix=NO_RESULTS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_CASE_3 | %FileCheck %s -check-prefix=NO_RESULTS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_CASE_4 | %FileCheck %s -check-prefix=NO_RESULTS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_CASE_5 | %FileCheck %s -check-prefix=NO_RESULTS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_CASE_6 | %FileCheck %s -check-prefix=NO_RESULTS // NO_RESULTS: found code completion token // NO_RESULTS-NOT: Begin completions diff --git a/test/IDE/complete_init.swift b/test/IDE/complete_init.swift index f529eb7064e54..0b788b3feb1ab 100644 --- a/test/IDE/complete_init.swift +++ b/test/IDE/complete_init.swift @@ -2,18 +2,18 @@ // RUN: %target-swift-frontend -parse -verify %t_no_errors.swift // RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-complete-inits-in-postfix-expr -code-completion-token=TOP_LEVEL_0 > %t -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_0 < %t -// RUN: FileCheck %s -check-prefix=NEGATIVE_TOP_LEVEL_0 < %t +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_0 < %t +// RUN: %FileCheck %s -check-prefix=NEGATIVE_TOP_LEVEL_0 < %t // RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-complete-inits-in-postfix-expr -code-completion-token=TOP_LEVEL_1 > %t.generic -// RUN: FileCheck %s -check-prefix=TOP_LEVEL_0 < %t.generic -// RUN: FileCheck %s -check-prefix=GENERIC_PARAM_0 < %t.generic -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-complete-inits-in-postfix-expr -code-completion-token=K_QUALIFIED_0 | FileCheck %s -check-prefix=K_QUALIFIED_0 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-complete-inits-in-postfix-expr -code-completion-token=L_QUALIFIED_0 | FileCheck %s -check-prefix=L_QUALIFIED_0 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-complete-inits-in-postfix-expr -code-completion-token=L_QUALIFIED_0 | FileCheck %s -check-prefix=NEGATIVE_L_QUALIFIED_0 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-complete-inits-in-postfix-expr -code-completion-token=INSIDE_L_0 | FileCheck %s -check-prefix=INSIDE_L_0 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-complete-inits-in-postfix-expr -code-completion-token=INSIDE_M_0 | FileCheck %s -check-prefix=INSIDE_M_0 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=ALIAS_CONSTRUCTOR_0 | FileCheck %s -check-prefix=ALIAS_CONSTRUCTOR_0 +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_0 < %t.generic +// RUN: %FileCheck %s -check-prefix=GENERIC_PARAM_0 < %t.generic +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-complete-inits-in-postfix-expr -code-completion-token=K_QUALIFIED_0 | %FileCheck %s -check-prefix=K_QUALIFIED_0 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-complete-inits-in-postfix-expr -code-completion-token=L_QUALIFIED_0 | %FileCheck %s -check-prefix=L_QUALIFIED_0 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-complete-inits-in-postfix-expr -code-completion-token=L_QUALIFIED_0 | %FileCheck %s -check-prefix=NEGATIVE_L_QUALIFIED_0 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-complete-inits-in-postfix-expr -code-completion-token=INSIDE_L_0 | %FileCheck %s -check-prefix=INSIDE_L_0 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-complete-inits-in-postfix-expr -code-completion-token=INSIDE_M_0 | %FileCheck %s -check-prefix=INSIDE_M_0 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=ALIAS_CONSTRUCTOR_0 | %FileCheck %s -check-prefix=ALIAS_CONSTRUCTOR_0 struct A { // implicit init() diff --git a/test/IDE/complete_init_inherited.swift b/test/IDE/complete_init_inherited.swift index e65b1d913ae68..f661695465d78 100644 --- a/test/IDE/complete_init_inherited.swift +++ b/test/IDE/complete_init_inherited.swift @@ -1,7 +1,7 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_A | FileCheck %s -check-prefix=TEST_A -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_B | FileCheck %s -check-prefix=TEST_B -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_C | FileCheck %s -check-prefix=TEST_C -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_D | FileCheck %s -check-prefix=TEST_D +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_A | %FileCheck %s -check-prefix=TEST_A +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_B | %FileCheck %s -check-prefix=TEST_B +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_C | %FileCheck %s -check-prefix=TEST_C +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_D | %FileCheck %s -check-prefix=TEST_D class A { init(int i: Int) {} diff --git a/test/IDE/complete_keywords.swift b/test/IDE/complete_keywords.swift index 5531262ba687b..deae5c61d6936 100644 --- a/test/IDE/complete_keywords.swift +++ b/test/IDE/complete_keywords.swift @@ -1,82 +1,82 @@ // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_1 > %t.top1 -// RUN: FileCheck %s -check-prefix=KW_DECL_STMT < %t.top1 -// RUN: FileCheck %s -check-prefix=KW_NO_RETURN < %t.top1 +// RUN: %FileCheck %s -check-prefix=KW_DECL_STMT < %t.top1 +// RUN: %FileCheck %s -check-prefix=KW_NO_RETURN < %t.top1 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_2 > %t.top2 -// RUN: FileCheck %s -check-prefix=KW_DECL_STMT < %t.top2 -// RUN: FileCheck %s -check-prefix=KW_NO_RETURN < %t.top2 +// RUN: %FileCheck %s -check-prefix=KW_DECL_STMT < %t.top2 +// RUN: %FileCheck %s -check-prefix=KW_NO_RETURN < %t.top2 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNC_BODY_1 > %t.func1 -// RUN: FileCheck %s -check-prefix=KW_DECL_STMT < %t.func1 -// RUN: FileCheck %s -check-prefix=KW_RETURN < %t.func1 +// RUN: %FileCheck %s -check-prefix=KW_DECL_STMT < %t.func1 +// RUN: %FileCheck %s -check-prefix=KW_RETURN < %t.func1 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNC_BODY_2 > %t.func2 -// RUN: FileCheck %s -check-prefix=KW_DECL_STMT < %t.func2 -// RUN: FileCheck %s -check-prefix=KW_RETURN < %t.func2 +// RUN: %FileCheck %s -check-prefix=KW_DECL_STMT < %t.func2 +// RUN: %FileCheck %s -check-prefix=KW_RETURN < %t.func2 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNC_BODY_3 > %t.func3 -// RUN: FileCheck %s -check-prefix=KW_DECL_STMT < %t.func3 -// RUN: FileCheck %s -check-prefix=KW_RETURN < %t.func3 +// RUN: %FileCheck %s -check-prefix=KW_DECL_STMT < %t.func3 +// RUN: %FileCheck %s -check-prefix=KW_RETURN < %t.func3 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNC_BODY_4 > %t.func4 -// RUN: FileCheck %s -check-prefix=KW_DECL_STMT < %t.func4 -// RUN: FileCheck %s -check-prefix=KW_RETURN < %t.func4 +// RUN: %FileCheck %s -check-prefix=KW_DECL_STMT < %t.func4 +// RUN: %FileCheck %s -check-prefix=KW_RETURN < %t.func4 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNC_BODY_5 > %t.func5 -// RUN: FileCheck %s -check-prefix=KW_DECL_STMT < %t.func5 -// RUN: FileCheck %s -check-prefix=KW_RETURN < %t.func5 +// RUN: %FileCheck %s -check-prefix=KW_DECL_STMT < %t.func5 +// RUN: %FileCheck %s -check-prefix=KW_RETURN < %t.func5 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_CLOSURE_1 > %t.clos1 -// RUN: FileCheck %s -check-prefix=KW_DECL_STMT < %t.clos1 -// RUN: FileCheck %s -check-prefix=KW_RETURN < %t.clos1 +// RUN: %FileCheck %s -check-prefix=KW_DECL_STMT < %t.clos1 +// RUN: %FileCheck %s -check-prefix=KW_RETURN < %t.clos1 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_CLOSURE_2 > %t.clos2 -// RUN: FileCheck %s -check-prefix=KW_DECL_STMT < %t.clos2 -// RUN: FileCheck %s -check-prefix=KW_RETURN < %t.clos2 +// RUN: %FileCheck %s -check-prefix=KW_DECL_STMT < %t.clos2 +// RUN: %FileCheck %s -check-prefix=KW_RETURN < %t.clos2 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_CLOSURE_3 > %t.clos3 -// RUN: FileCheck %s -check-prefix=KW_DECL_STMT < %t.clos3 -// RUN: FileCheck %s -check-prefix=KW_RETURN < %t.clos3 +// RUN: %FileCheck %s -check-prefix=KW_DECL_STMT < %t.clos3 +// RUN: %FileCheck %s -check-prefix=KW_RETURN < %t.clos3 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_CLOSURE_4 > %t.clos4 -// RUN: FileCheck %s -check-prefix=KW_DECL_STMT < %t.clos4 -// RUN: FileCheck %s -check-prefix=KW_RETURN < %t.clos4 +// RUN: %FileCheck %s -check-prefix=KW_DECL_STMT < %t.clos4 +// RUN: %FileCheck %s -check-prefix=KW_RETURN < %t.clos4 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_SUBSCRIPT_1 > %t.subs -// RUN: FileCheck %s -check-prefix=KW_DECL_STMT < %t.subs -// RUN: FileCheck %s -check-prefix=KW_RETURN < %t.subs +// RUN: %FileCheck %s -check-prefix=KW_DECL_STMT < %t.subs +// RUN: %FileCheck %s -check-prefix=KW_RETURN < %t.subs // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_INIT_1 > %t.init -// RUN: FileCheck %s -check-prefix=KW_DECL_STMT < %t.init -// RUN: FileCheck %s -check-prefix=KW_RETURN < %t.init - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_1 | FileCheck %s -check-prefix=KW_DECL -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_2 | FileCheck %s -check-prefix=KW_DECL -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_3 | FileCheck %s -check-prefix=KW_DECL -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_4 | FileCheck %s -check-prefix=KW_DECL -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_5 | FileCheck %s -check-prefix=KW_DECL -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_6 | FileCheck %s -check-prefix=KW_DECL -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_7 | FileCheck %s -check-prefix=KW_DECL -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_8 | FileCheck %s -check-prefix=KW_DECL -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_9 | FileCheck %s -check-prefix=KW_DECL -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_10 | FileCheck %s -check-prefix=KW_DECL - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SUPER_KEYWORD0 | FileCheck %s -check-prefix=SUPER_KEYWORD0 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SUPER_KEYWORD1 | FileCheck %s -check-prefix=SUPER_KEYWORD1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SUPER_KEYWORD2 | FileCheck %s -check-prefix=SUPER_KEYWORD2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SUPER_KEYWORD3 | FileCheck %s -check-prefix=SUPER_KEYWORD3 +// RUN: %FileCheck %s -check-prefix=KW_DECL_STMT < %t.init +// RUN: %FileCheck %s -check-prefix=KW_RETURN < %t.init + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_1 | %FileCheck %s -check-prefix=KW_DECL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_2 | %FileCheck %s -check-prefix=KW_DECL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_3 | %FileCheck %s -check-prefix=KW_DECL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_4 | %FileCheck %s -check-prefix=KW_DECL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_5 | %FileCheck %s -check-prefix=KW_DECL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_6 | %FileCheck %s -check-prefix=KW_DECL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_7 | %FileCheck %s -check-prefix=KW_DECL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_8 | %FileCheck %s -check-prefix=KW_DECL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_9 | %FileCheck %s -check-prefix=KW_DECL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_NOMINAL_DECL_10 | %FileCheck %s -check-prefix=KW_DECL + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SUPER_KEYWORD0 | %FileCheck %s -check-prefix=SUPER_KEYWORD0 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SUPER_KEYWORD1 | %FileCheck %s -check-prefix=SUPER_KEYWORD1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SUPER_KEYWORD2 | %FileCheck %s -check-prefix=SUPER_KEYWORD2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SUPER_KEYWORD3 | %FileCheck %s -check-prefix=SUPER_KEYWORD3 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_1 > %t.expr1 -// RUN: FileCheck %s -check-prefix=KW_EXPR < %t.expr1 -// RUN: FileCheck %s -check-prefix=KW_EXPR_NEG < %t.expr1 +// RUN: %FileCheck %s -check-prefix=KW_EXPR < %t.expr1 +// RUN: %FileCheck %s -check-prefix=KW_EXPR_NEG < %t.expr1 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_2 > %t.expr2 -// RUN: FileCheck %s -check-prefix=KW_EXPR < %t.expr2 -// RUN: FileCheck %s -check-prefix=KW_EXPR_NEG < %t.expr2 +// RUN: %FileCheck %s -check-prefix=KW_EXPR < %t.expr2 +// RUN: %FileCheck %s -check-prefix=KW_EXPR_NEG < %t.expr2 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_3 > %t.expr3 -// RUN: FileCheck %s -check-prefix=KW_EXPR < %t.expr3 -// RUN: FileCheck %s -check-prefix=KW_EXPR_NEG < %t.expr3 +// RUN: %FileCheck %s -check-prefix=KW_EXPR < %t.expr3 +// RUN: %FileCheck %s -check-prefix=KW_EXPR_NEG < %t.expr3 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_4 > %t.expr4 -// RUN: FileCheck %s -check-prefix=KW_EXPR < %t.expr4 -// RUN: FileCheck %s -check-prefix=KW_EXPR_NEG < %t.expr4 +// RUN: %FileCheck %s -check-prefix=KW_EXPR < %t.expr4 +// RUN: %FileCheck %s -check-prefix=KW_EXPR_NEG < %t.expr4 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_5 > %t.expr5 -// RUN: FileCheck %s -check-prefix=KW_EXPR < %t.expr5 -// RUN: FileCheck %s -check-prefix=KW_EXPR_NEG < %t.expr5 +// RUN: %FileCheck %s -check-prefix=KW_EXPR < %t.expr5 +// RUN: %FileCheck %s -check-prefix=KW_EXPR_NEG < %t.expr5 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_6 > %t.expr6 -// RUN: FileCheck %s -check-prefix=KW_EXPR < %t.expr6 -// RUN: FileCheck %s -check-prefix=KW_EXPR_NEG < %t.expr6 +// RUN: %FileCheck %s -check-prefix=KW_EXPR < %t.expr6 +// RUN: %FileCheck %s -check-prefix=KW_EXPR_NEG < %t.expr6 // KW_RETURN: Keyword[return]/None: return{{; name=.+$}} // KW_NO_RETURN-NOT: Keyword[return] diff --git a/test/IDE/complete_lazy_initialized_var.swift b/test/IDE/complete_lazy_initialized_var.swift index c708b17cd8894..b287a40d0f690 100644 --- a/test/IDE/complete_lazy_initialized_var.swift +++ b/test/IDE/complete_lazy_initialized_var.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LAZY_IN_CLASS_1 | FileCheck %s -check-prefix=LAZYVAR1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LAZY_IN_CLASS_1 | %FileCheck %s -check-prefix=LAZYVAR1 class FooClass1 { lazy var lazyVar1 = 0 } diff --git a/test/IDE/complete_literal.swift b/test/IDE/complete_literal.swift index bffeafbf05e11..c31b7543d1106 100644 --- a/test/IDE/complete_literal.swift +++ b/test/IDE/complete_literal.swift @@ -1,10 +1,10 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LITERAL1 | FileCheck %s -check-prefix=LITERAL1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LITERAL2 | FileCheck %s -check-prefix=LITERAL2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LITERAL3 | FileCheck %s -check-prefix=LITERAL3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LITERAL4 | FileCheck %s -check-prefix=LITERAL4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LITERAL5 | FileCheck %s -check-prefix=LITERAL5 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LITERAL6 | FileCheck %s -check-prefix=LITERAL6 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LITERAL7 | FileCheck %s -check-prefix=LITERAL7 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LITERAL1 | %FileCheck %s -check-prefix=LITERAL1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LITERAL2 | %FileCheck %s -check-prefix=LITERAL2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LITERAL3 | %FileCheck %s -check-prefix=LITERAL3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LITERAL4 | %FileCheck %s -check-prefix=LITERAL4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LITERAL5 | %FileCheck %s -check-prefix=LITERAL5 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LITERAL6 | %FileCheck %s -check-prefix=LITERAL6 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LITERAL7 | %FileCheck %s -check-prefix=LITERAL7 { 1.#^LITERAL1^# diff --git a/test/IDE/complete_loop.swift b/test/IDE/complete_loop.swift index 1f55600388e4d..8642f8280cfbe 100644 --- a/test/IDE/complete_loop.swift +++ b/test/IDE/complete_loop.swift @@ -1,10 +1,10 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOOP_1 | FileCheck %s -check-prefix=LOOP_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOOP_1 | %FileCheck %s -check-prefix=LOOP_1 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOOP_2 > %t.loop2.txt -// RUN: FileCheck %s -check-prefix=LOOP_2 < %t.loop2.txt -// RUN: FileCheck %s -check-prefix=LOOP_2_NEGATIVE < %t.loop2.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOOP_3 | FileCheck %s -check-prefix=LOOP_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOOP_4 | FileCheck %s -check-prefix=LOOP_4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOOP_5 | FileCheck %s -check-prefix=LOOP_5 +// RUN: %FileCheck %s -check-prefix=LOOP_2 < %t.loop2.txt +// RUN: %FileCheck %s -check-prefix=LOOP_2_NEGATIVE < %t.loop2.txt +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOOP_3 | %FileCheck %s -check-prefix=LOOP_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOOP_4 | %FileCheck %s -check-prefix=LOOP_4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOOP_5 | %FileCheck %s -check-prefix=LOOP_5 class Gen { func IntGen() -> Int { return 0 } diff --git a/test/IDE/complete_member_decls_from_parent_decl_context.swift b/test/IDE/complete_member_decls_from_parent_decl_context.swift index 4c92771f73f3d..7d93383a685ad 100644 --- a/test/IDE/complete_member_decls_from_parent_decl_context.swift +++ b/test/IDE/complete_member_decls_from_parent_decl_context.swift @@ -1,38 +1,38 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_CLASS_INSTANCE_METHOD_1 | FileCheck %s -check-prefix=IN_CLASS_INSTANCE_METHOD_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_CLASS_STATIC_METHOD_1 | FileCheck %s -check-prefix=IN_CLASS_STATIC_METHOD_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_CLASS_STATIC_METHOD_1 | FileCheck %s -check-prefix=IN_CLASS_STATIC_METHOD_1_NEGATIVE -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_CLASS_CONSTRUCTOR_1 | FileCheck %s -check-prefix=IN_CLASS_CONSTRUCTOR_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_CLASS_DESTRUCTOR_1 | FileCheck %s -check-prefix=IN_CLASS_DESTRUCTOR_1 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_STRUCT_INSTANCE_METHOD_1 | FileCheck %s -check-prefix=IN_STRUCT_INSTANCE_METHOD_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_STRUCT_STATIC_METHOD_1 | FileCheck %s -check-prefix=IN_STRUCT_STATIC_METHOD_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_STRUCT_STATIC_METHOD_1 | FileCheck %s -check-prefix=IN_STRUCT_STATIC_METHOD_1_NEGATIVE -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_STRUCT_CONSTRUCTOR_1 | FileCheck %s -check-prefix=IN_STRUCT_CONSTRUCTOR_1 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_A_1 | FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_A_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_A_2 | FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_A_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_A_3 | FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_A_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_A_4 | FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_A_4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_A_5 | FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_A_5 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_B_1 | FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_B_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_B_2 | FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_B_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_B_3 | FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_B_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_B_4 | FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_B_4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_B_5 | FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_B_5 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_C_1 | FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_C_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_C_2 | FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_C_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_C_3 | FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_C_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_C_4 | FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_C_4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_C_5 | FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_C_5 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_D_1 | FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_D_1 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_E_1 | FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_E_1 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SR627_SUBCLASS | FileCheck %s -check-prefix=SR627_SUBCLASS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SR627_SUB_SUBCLASS | FileCheck %s -check-prefix=SR627_SUB_SUBCLASS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_CLASS_INSTANCE_METHOD_1 | %FileCheck %s -check-prefix=IN_CLASS_INSTANCE_METHOD_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_CLASS_STATIC_METHOD_1 | %FileCheck %s -check-prefix=IN_CLASS_STATIC_METHOD_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_CLASS_STATIC_METHOD_1 | %FileCheck %s -check-prefix=IN_CLASS_STATIC_METHOD_1_NEGATIVE +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_CLASS_CONSTRUCTOR_1 | %FileCheck %s -check-prefix=IN_CLASS_CONSTRUCTOR_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_CLASS_DESTRUCTOR_1 | %FileCheck %s -check-prefix=IN_CLASS_DESTRUCTOR_1 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_STRUCT_INSTANCE_METHOD_1 | %FileCheck %s -check-prefix=IN_STRUCT_INSTANCE_METHOD_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_STRUCT_STATIC_METHOD_1 | %FileCheck %s -check-prefix=IN_STRUCT_STATIC_METHOD_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_STRUCT_STATIC_METHOD_1 | %FileCheck %s -check-prefix=IN_STRUCT_STATIC_METHOD_1_NEGATIVE +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_STRUCT_CONSTRUCTOR_1 | %FileCheck %s -check-prefix=IN_STRUCT_CONSTRUCTOR_1 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_A_1 | %FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_A_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_A_2 | %FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_A_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_A_3 | %FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_A_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_A_4 | %FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_A_4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_A_5 | %FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_A_5 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_B_1 | %FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_B_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_B_2 | %FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_B_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_B_3 | %FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_B_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_B_4 | %FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_B_4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_B_5 | %FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_B_5 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_C_1 | %FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_C_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_C_2 | %FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_C_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_C_3 | %FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_C_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_C_4 | %FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_C_4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_C_5 | %FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_C_5 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_D_1 | %FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_D_1 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL_DECL_E_1 | %FileCheck %s -check-prefix=NESTED_NOMINAL_DECL_E_1 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SR627_SUBCLASS | %FileCheck %s -check-prefix=SR627_SUBCLASS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SR627_SUB_SUBCLASS | %FileCheck %s -check-prefix=SR627_SUB_SUBCLASS //===--- //===--- Test that we can code complete in methods, and correctly distinguish diff --git a/test/IDE/complete_members_optional.swift b/test/IDE/complete_members_optional.swift index 39a33bac4b5fc..db2afd789356f 100644 --- a/test/IDE/complete_members_optional.swift +++ b/test/IDE/complete_members_optional.swift @@ -1,8 +1,8 @@ // RUN: sed -n -e '1,/NO_ERRORS_UP_TO_HERE$/ p' %s > %t_no_errors.swift // RUN: %target-swift-frontend -parse -verify -disable-objc-attr-requires-foundation-module %t_no_errors.swift -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OPTIONAL_MEMBERS_1 | FileCheck %s -check-prefix=OPTIONAL_MEMBERS_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OPTIONAL_MEMBERS_2 | FileCheck %s -check-prefix=OPTIONAL_MEMBERS_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OPTIONAL_MEMBERS_1 | %FileCheck %s -check-prefix=OPTIONAL_MEMBERS_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OPTIONAL_MEMBERS_2 | %FileCheck %s -check-prefix=OPTIONAL_MEMBERS_2 @objc protocol HasOptionalMembers1 { diff --git a/test/IDE/complete_multiple_files.swift b/test/IDE/complete_multiple_files.swift index 3bc97ccbfa61b..c3f9410c57ae2 100644 --- a/test/IDE/complete_multiple_files.swift +++ b/test/IDE/complete_multiple_files.swift @@ -1,10 +1,10 @@ // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=T1 \ -// RUN: %S/Inputs/multiple-files-1.swift %S/Inputs/multiple-files-2.swift | FileCheck %s -check-prefix=T1 +// RUN: %S/Inputs/multiple-files-1.swift %S/Inputs/multiple-files-2.swift | %FileCheck %s -check-prefix=T1 // // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_1 \ -// RUN: %S/Inputs/multiple-files-1.swift %S/Inputs/multiple-files-2.swift | FileCheck %s -check-prefix=TOP_LEVEL_1 +// RUN: %S/Inputs/multiple-files-1.swift %S/Inputs/multiple-files-2.swift | %FileCheck %s -check-prefix=TOP_LEVEL_1 // -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MODULE_SCOPED %S/Inputs/multiple-files-1.swift %S/Inputs/multiple-files-2.swift | FileCheck %s -check-prefix=MODULE_SCOPED +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MODULE_SCOPED %S/Inputs/multiple-files-1.swift %S/Inputs/multiple-files-2.swift | %FileCheck %s -check-prefix=MODULE_SCOPED func testObjectExpr() { fooObject.#^T1^# diff --git a/test/IDE/complete_name_lookup.swift b/test/IDE/complete_name_lookup.swift index 9169242e34ea8..3319439022e6e 100644 --- a/test/IDE/complete_name_lookup.swift +++ b/test/IDE/complete_name_lookup.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_OBJECT_DOT_1 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BAR_OBJECT_DOT_1 | FileCheck %s -check-prefix=BAR_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_OBJECT_DOT_1 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BAR_OBJECT_DOT_1 | %FileCheck %s -check-prefix=BAR_OBJECT_DOT protocol FooBaseProtocol { var instanceProperty: Int { get } diff --git a/test/IDE/complete_not_recommended.swift b/test/IDE/complete_not_recommended.swift index a51d880d9b824..e90b7e4e19bcb 100644 --- a/test/IDE/complete_not_recommended.swift +++ b/test/IDE/complete_not_recommended.swift @@ -1,10 +1,10 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER | FileCheck %s -check-prefix=CHECK1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER | %FileCheck %s -check-prefix=CHECK1 // CHECK1: Begin completions, 2 items // CHECK1: Decl[InstanceMethod]/CurrNominal: foo({#self: A#})[#() -> Void#] // CHECK1: Decl[Constructor]/CurrNominal: init()[#A#]; name=init(){{$}} // CHECK1: End completions -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OVERRIDE_1 | FileCheck %s -check-prefix=OVERRIDE_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OVERRIDE_1 | %FileCheck %s -check-prefix=OVERRIDE_1 class A { func foo() {} diff --git a/test/IDE/complete_operators.swift b/test/IDE/complete_operators.swift index 988a4b2378ae5..d16da90348624 100644 --- a/test/IDE/complete_operators.swift +++ b/test/IDE/complete_operators.swift @@ -1,61 +1,61 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_1 | FileCheck %s -check-prefix=POSTFIX_1 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_1 | %FileCheck %s -check-prefix=POSTFIX_1 // RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_2 > %t -// RUN: FileCheck %s -check-prefix=POSTFIX_2 < %t -// RUN: FileCheck %s -check-prefix=NEGATIVE_POSTFIX_2 < %t - -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_3 | FileCheck %s -check-prefix=POSTFIX_3 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_4 | FileCheck %s -check-prefix=POSTFIX_4 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_5 | FileCheck %s -check-prefix=POSTFIX_5 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_6 | FileCheck %s -check-prefix=POSTFIX_6 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_7 | FileCheck %s -check-prefix=POSTFIX_7 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_8 | FileCheck %s -check-prefix=POSTFIX_8 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_9 | FileCheck %s -check-prefix=POSTFIX_9 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_10 | FileCheck %s -check-prefix=POSTFIX_10 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=S_POSTFIX_SPACE | FileCheck %s -check-prefix=S_POSTFIX_SPACE +// RUN: %FileCheck %s -check-prefix=POSTFIX_2 < %t +// RUN: %FileCheck %s -check-prefix=NEGATIVE_POSTFIX_2 < %t + +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_3 | %FileCheck %s -check-prefix=POSTFIX_3 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_4 | %FileCheck %s -check-prefix=POSTFIX_4 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_5 | %FileCheck %s -check-prefix=POSTFIX_5 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_6 | %FileCheck %s -check-prefix=POSTFIX_6 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_7 | %FileCheck %s -check-prefix=POSTFIX_7 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_8 | %FileCheck %s -check-prefix=POSTFIX_8 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_9 | %FileCheck %s -check-prefix=POSTFIX_9 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=POSTFIX_10 | %FileCheck %s -check-prefix=POSTFIX_10 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=S_POSTFIX_SPACE | %FileCheck %s -check-prefix=S_POSTFIX_SPACE // RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_1 > %t -// RUN: FileCheck %s -check-prefix=S2_INFIX < %t -// RUN: FileCheck %s -check-prefix=NEGATIVE_S2_INFIX < %t +// RUN: %FileCheck %s -check-prefix=S2_INFIX < %t +// RUN: %FileCheck %s -check-prefix=NEGATIVE_S2_INFIX < %t // RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_2 > %t -// RUN: FileCheck %s -check-prefix=S2_INFIX_LVALUE < %t -// RUN: FileCheck %s -check-prefix=NEGATIVE_S2_INFIX_LVALUE < %t +// RUN: %FileCheck %s -check-prefix=S2_INFIX_LVALUE < %t +// RUN: %FileCheck %s -check-prefix=NEGATIVE_S2_INFIX_LVALUE < %t -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_3 | FileCheck %s -check-prefix=S2_INFIX_LVALUE -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_4 | FileCheck %s -check-prefix=S2_INFIX -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_5 | FileCheck %s -check-prefix=S2_INFIX -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_6 | FileCheck %s -check-prefix=S2_INFIX +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_3 | %FileCheck %s -check-prefix=S2_INFIX_LVALUE +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_4 | %FileCheck %s -check-prefix=S2_INFIX +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_5 | %FileCheck %s -check-prefix=S2_INFIX +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_6 | %FileCheck %s -check-prefix=S2_INFIX // RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_7 > %t -// RUN: FileCheck %s -check-prefix=S2_INFIX_OPTIONAL < %t -// RUN: FileCheck %s -check-prefix=NEGATIVE_S2_INFIX_OPTIONAL < %t - -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_8 | FileCheck %s -check-prefix=S3_INFIX_OPTIONAL -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_9 | FileCheck %s -check-prefix=FOOABLE_INFIX -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_10 | FileCheck %s -check-prefix=FOOABLE_INFIX -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_11 | FileCheck %s -check-prefix=NO_OPERATORS -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_12 | FileCheck %s -check-prefix=NO_OPERATORS -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_13 | FileCheck %s -check-prefix=NO_OPERATORS -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_14 | FileCheck %s -check-prefix=NO_OPERATORS -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_15 | FileCheck %s -check-prefix=NO_OPERATORS -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_16 | FileCheck %s -check-prefix=NO_OPERATORS -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_17 | FileCheck %s -check-prefix=NO_OPERATORS -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_18 | FileCheck %s -check-prefix=NO_OPERATORS -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_19 | FileCheck %s -check-prefix=EMPTYCLASS_INFIX -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_20 | FileCheck %s -check-prefix=NO_OPERATORS -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_21 | FileCheck %s -check-prefix=NO_OPERATORS -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_22 | FileCheck %s -check-prefix=NO_OPERATORS -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=S2_INFIX_SPACE | FileCheck %s -check-prefix=S2_INFIX_SPACE -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=EXT_INFIX_1 | FileCheck %s -check-prefix=S2_INFIX +// RUN: %FileCheck %s -check-prefix=S2_INFIX_OPTIONAL < %t +// RUN: %FileCheck %s -check-prefix=NEGATIVE_S2_INFIX_OPTIONAL < %t + +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_8 | %FileCheck %s -check-prefix=S3_INFIX_OPTIONAL +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_9 | %FileCheck %s -check-prefix=FOOABLE_INFIX +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_10 | %FileCheck %s -check-prefix=FOOABLE_INFIX +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_11 | %FileCheck %s -check-prefix=NO_OPERATORS +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_12 | %FileCheck %s -check-prefix=NO_OPERATORS +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_13 | %FileCheck %s -check-prefix=NO_OPERATORS +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_14 | %FileCheck %s -check-prefix=NO_OPERATORS +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_15 | %FileCheck %s -check-prefix=NO_OPERATORS +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_16 | %FileCheck %s -check-prefix=NO_OPERATORS +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_17 | %FileCheck %s -check-prefix=NO_OPERATORS +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_18 | %FileCheck %s -check-prefix=NO_OPERATORS +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_19 | %FileCheck %s -check-prefix=EMPTYCLASS_INFIX +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_20 | %FileCheck %s -check-prefix=NO_OPERATORS +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_21 | %FileCheck %s -check-prefix=NO_OPERATORS +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INFIX_22 | %FileCheck %s -check-prefix=NO_OPERATORS +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=S2_INFIX_SPACE | %FileCheck %s -check-prefix=S2_INFIX_SPACE +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=EXT_INFIX_1 | %FileCheck %s -check-prefix=S2_INFIX // RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=EXT_INFIX_2 > %t.ext_infix_2 -// RUN: FileCheck %s -check-prefix=S4_EXT_INFIX < %t.ext_infix_2 -// RUN: FileCheck %s -check-prefix=S4_EXT_INFIX_NEG < %t.ext_infix_2 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=EXT_INFIX_3 | FileCheck %s -check-prefix=S4_EXT_INFIX_SIMPLE -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=EXT_INFIX_4 | FileCheck %s -check-prefix=S4_EXT_INFIX_SIMPLE -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=ASSIGN_TUPLE_1| FileCheck %s -check-prefix=ASSIGN_TUPLE_1 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=ASSIGN_TUPLE_2| FileCheck %s -check-prefix=ASSIGN_TUPLE_2 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=ASSIGN_TUPLE_3| FileCheck %s -check-prefix=ASSIGN_TUPLE_1 +// RUN: %FileCheck %s -check-prefix=S4_EXT_INFIX < %t.ext_infix_2 +// RUN: %FileCheck %s -check-prefix=S4_EXT_INFIX_NEG < %t.ext_infix_2 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=EXT_INFIX_3 | %FileCheck %s -check-prefix=S4_EXT_INFIX_SIMPLE +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=EXT_INFIX_4 | %FileCheck %s -check-prefix=S4_EXT_INFIX_SIMPLE +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=ASSIGN_TUPLE_1| %FileCheck %s -check-prefix=ASSIGN_TUPLE_1 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=ASSIGN_TUPLE_2| %FileCheck %s -check-prefix=ASSIGN_TUPLE_2 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=ASSIGN_TUPLE_3| %FileCheck %s -check-prefix=ASSIGN_TUPLE_1 struct S {} postfix operator ++ {} diff --git a/test/IDE/complete_overridden_decls.swift b/test/IDE/complete_overridden_decls.swift index ff408b413ee79..8cba89a91dde2 100644 --- a/test/IDE/complete_overridden_decls.swift +++ b/test/IDE/complete_overridden_decls.swift @@ -2,13 +2,13 @@ // RUN: %target-swift-frontend -parse -verify %t_no_errors.swift // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OVER_BASE_1 > %t.over.txt -// RUN: FileCheck %s -check-prefix=OVER_BASE_1 < %t.over.txt +// RUN: %FileCheck %s -check-prefix=OVER_BASE_1 < %t.over.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OVER_DERIVED_1 > %t.over.txt -// RUN: FileCheck %s -check-prefix=OVER_DERIVED_1 < %t.over.txt +// RUN: %FileCheck %s -check-prefix=OVER_DERIVED_1 < %t.over.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OVER_MORE_DERIVED_1 > %t.over.txt -// RUN: FileCheck %s -check-prefix=OVER_MORE_DERIVED_1 < %t.over.txt +// RUN: %FileCheck %s -check-prefix=OVER_MORE_DERIVED_1 < %t.over.txt //===--- //===--- Check that we don't show overridden decls (only show the overriding decl). diff --git a/test/IDE/complete_override.swift b/test/IDE/complete_override.swift index b67bfdb027468..12b1bdff5217e 100644 --- a/test/IDE/complete_override.swift +++ b/test/IDE/complete_override.swift @@ -2,109 +2,109 @@ // RUN: %target-swift-frontend -parse -verify -disable-objc-attr-requires-foundation-module %t_no_errors.swift // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_PA -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=CLASS_PA < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_PA < %t.txt +// RUN: %FileCheck %s -check-prefix=CLASS_PA < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_PA < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_PA_EXT_1 -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=CLASS_PA < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_PA < %t.txt +// RUN: %FileCheck %s -check-prefix=CLASS_PA < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_PA < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_PA_EXT_2 -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=CLASS_PA < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_PA < %t.txt +// RUN: %FileCheck %s -check-prefix=CLASS_PA < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_PA < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_PB -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=CLASS_PB < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_PB < %t.txt +// RUN: %FileCheck %s -check-prefix=CLASS_PB < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_PB < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_PA_PB -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=CLASS_PA_PB < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_PA < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_PB < %t.txt +// RUN: %FileCheck %s -check-prefix=CLASS_PA_PB < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_PA < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_PB < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_BA -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=CLASS_BA < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_BA < %t.txt +// RUN: %FileCheck %s -check-prefix=CLASS_BA < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_BA < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_BA_PA -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=CLASS_BA_PA < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_BA < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_PA < %t.txt +// RUN: %FileCheck %s -check-prefix=CLASS_BA_PA < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_BA < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_PA < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_BA_PA_EXT1 -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=CLASS_BA_PA < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_BA < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_PA < %t.txt +// RUN: %FileCheck %s -check-prefix=CLASS_BA_PA < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_BA < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_PA < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_BA_PA_EXT2 -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=CLASS_BA_PA < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_BA < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_PA < %t.txt +// RUN: %FileCheck %s -check-prefix=CLASS_BA_PA < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_BA < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_PA < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_BA_PB -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=CLASS_BA_PB < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_BA < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_PB < %t.txt +// RUN: %FileCheck %s -check-prefix=CLASS_BA_PB < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_BA < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_PB < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_BB -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=CLASS_BB < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_BB < %t.txt +// RUN: %FileCheck %s -check-prefix=CLASS_BB < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_BB < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_BE -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=CLASS_BE < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_BE < %t.txt +// RUN: %FileCheck %s -check-prefix=CLASS_BE < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_BE < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_BE_PA -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=CLASS_BE_PA < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_BE < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_PA < %t.txt +// RUN: %FileCheck %s -check-prefix=CLASS_BE_PA < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_BE < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_PA < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_BE_PA_PE -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=CLASS_BE_PA_PE < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_BE < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_PA < %t.txt +// RUN: %FileCheck %s -check-prefix=CLASS_BE_PA_PE < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_BE < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_PA < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_BE_PA_PE_EXT1 -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=CLASS_BE_PA_PE < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_BE < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_PA < %t.txt +// RUN: %FileCheck %s -check-prefix=CLASS_BE_PA_PE < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_BE < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_PA < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_BE_PA_PE_EXT2 -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=CLASS_BE_PA_PE < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_BE < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_PA < %t.txt +// RUN: %FileCheck %s -check-prefix=CLASS_BE_PA_PE < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_BE < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_PA < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLASS_PEI_PE -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=CLASS_PEI_PE < %t.txt -// RUN: FileCheck %s -check-prefix=WITH_PEI < %t.txt +// RUN: %FileCheck %s -check-prefix=CLASS_PEI_PE < %t.txt +// RUN: %FileCheck %s -check-prefix=WITH_PEI < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_NOMINAL -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=NESTED_NOMINAL < %t.txt +// RUN: %FileCheck %s -check-prefix=NESTED_NOMINAL < %t.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_CLOSURE_1 -code-completion-keywords=false | FileCheck %s -check-prefix=NESTED_CLOSURE_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_CLOSURE_2 -code-completion-keywords=false | FileCheck %s -check-prefix=NESTED_CLOSURE_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_CLOSURE_1 -code-completion-keywords=false | %FileCheck %s -check-prefix=NESTED_CLOSURE_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_CLOSURE_2 -code-completion-keywords=false | %FileCheck %s -check-prefix=NESTED_CLOSURE_2 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OMIT_KEYWORD1 -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=OMIT_KEYWORD1< %t.txt +// RUN: %FileCheck %s -check-prefix=OMIT_KEYWORD1< %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OMIT_KEYWORD2 -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=OMIT_KEYWORD2< %t.txt +// RUN: %FileCheck %s -check-prefix=OMIT_KEYWORD2< %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OMIT_KEYWORD3 -code-completion-keywords=false > %t.txt -// RUN: FileCheck %s -check-prefix=OMIT_KEYWORD3< %t.txt +// RUN: %FileCheck %s -check-prefix=OMIT_KEYWORD3< %t.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OMIT_KEYWORD4 -code-completion-keywords=false | FileCheck %s -check-prefix=OMIT_KEYWORD4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OMIT_KEYWORD5 -code-completion-keywords=false | FileCheck %s -check-prefix=OMIT_KEYWORD1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OMIT_KEYWORD6 -code-completion-keywords=false | FileCheck %s -check-prefix=OMIT_KEYWORD2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OMIT_KEYWORD7 -code-completion-keywords=false | FileCheck %s -check-prefix=OMIT_KEYWORD3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OMIT_KEYWORD8 -code-completion-keywords=false | FileCheck %s -check-prefix=OMIT_KEYWORD4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OMIT_KEYWORD9 -code-completion-keywords=false | FileCheck %s -check-prefix=OMIT_KEYWORD4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OMIT_KEYWORD10 -code-completion-keywords=false | FileCheck %s -check-prefix=WITH_PA_NO_PROTOFUNCA +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OMIT_KEYWORD4 -code-completion-keywords=false | %FileCheck %s -check-prefix=OMIT_KEYWORD4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OMIT_KEYWORD5 -code-completion-keywords=false | %FileCheck %s -check-prefix=OMIT_KEYWORD1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OMIT_KEYWORD6 -code-completion-keywords=false | %FileCheck %s -check-prefix=OMIT_KEYWORD2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OMIT_KEYWORD7 -code-completion-keywords=false | %FileCheck %s -check-prefix=OMIT_KEYWORD3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OMIT_KEYWORD8 -code-completion-keywords=false | %FileCheck %s -check-prefix=OMIT_KEYWORD4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OMIT_KEYWORD9 -code-completion-keywords=false | %FileCheck %s -check-prefix=OMIT_KEYWORD4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OMIT_KEYWORD10 -code-completion-keywords=false | %FileCheck %s -check-prefix=WITH_PA_NO_PROTOFUNCA -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=HAS_THROWING -code-completion-keywords=false | FileCheck %s -check-prefix=HAS_THROWING -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSOC_TYPE1 -code-completion-keywords=false | FileCheck %s -check-prefix=ASSOC_TYPE1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=HAS_THROWING -code-completion-keywords=false | %FileCheck %s -check-prefix=HAS_THROWING +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ASSOC_TYPE1 -code-completion-keywords=false | %FileCheck %s -check-prefix=ASSOC_TYPE1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEPRECATED_1 -code-completion-keywords=false | FileCheck %s -check-prefix=DEPRECATED_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEPRECATED_1 -code-completion-keywords=false | %FileCheck %s -check-prefix=DEPRECATED_1 @objc class TagPA {} diff --git a/test/IDE/complete_override_access_control.swift b/test/IDE/complete_override_access_control.swift index 166d7d9e71835..6de1c38737a17 100644 --- a/test/IDE/complete_override_access_control.swift +++ b/test/IDE/complete_override_access_control.swift @@ -1,21 +1,21 @@ // RUN: sed -n -e '1,/NO_ERRORS_UP_TO_HERE$/ p' %s > %t_no_errors.swift // RUN: %target-swift-frontend -parse -verify -disable-objc-attr-requires-foundation-module %t_no_errors.swift // -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_PRIVATE_ABC -code-completion-keywords=false | FileCheck %s -check-prefix=TEST_PRIVATE_ABC -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_INTERNAL_ABC -code-completion-keywords=false | FileCheck %s -check-prefix=TEST_INTERNAL_ABC -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_PUBLIC_ABC -code-completion-keywords=false | FileCheck %s -check-prefix=TEST_PUBLIC_ABC +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_PRIVATE_ABC -code-completion-keywords=false | %FileCheck %s -check-prefix=TEST_PRIVATE_ABC +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_INTERNAL_ABC -code-completion-keywords=false | %FileCheck %s -check-prefix=TEST_INTERNAL_ABC +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_PUBLIC_ABC -code-completion-keywords=false | %FileCheck %s -check-prefix=TEST_PUBLIC_ABC // -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_PRIVATE_DE -code-completion-keywords=false | FileCheck %s -check-prefix=TEST_PRIVATE_DE -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_INTERNAL_DE -code-completion-keywords=false | FileCheck %s -check-prefix=TEST_INTERNAL_DE -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_PUBLIC_DE -code-completion-keywords=false | FileCheck %s -check-prefix=TEST_PUBLIC_DE +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_PRIVATE_DE -code-completion-keywords=false | %FileCheck %s -check-prefix=TEST_PRIVATE_DE +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_INTERNAL_DE -code-completion-keywords=false | %FileCheck %s -check-prefix=TEST_INTERNAL_DE +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_PUBLIC_DE -code-completion-keywords=false | %FileCheck %s -check-prefix=TEST_PUBLIC_DE // -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_PRIVATE_ED -code-completion-keywords=false | FileCheck %s -check-prefix=TEST_PRIVATE_ED -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_INTERNAL_ED -code-completion-keywords=false | FileCheck %s -check-prefix=TEST_INTERNAL_ED -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_PUBLIC_ED -code-completion-keywords=false | FileCheck %s -check-prefix=TEST_PUBLIC_ED +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_PRIVATE_ED -code-completion-keywords=false | %FileCheck %s -check-prefix=TEST_PRIVATE_ED +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_INTERNAL_ED -code-completion-keywords=false | %FileCheck %s -check-prefix=TEST_INTERNAL_ED +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_PUBLIC_ED -code-completion-keywords=false | %FileCheck %s -check-prefix=TEST_PUBLIC_ED // -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_PRIVATE_EF -code-completion-keywords=false | FileCheck %s -check-prefix=TEST_PRIVATE_EF -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_INTERNAL_EF -code-completion-keywords=false | FileCheck %s -check-prefix=TEST_INTERNAL_EF -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_PUBLIC_EF -code-completion-keywords=false | FileCheck %s -check-prefix=TEST_PUBLIC_EF +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_PRIVATE_EF -code-completion-keywords=false | %FileCheck %s -check-prefix=TEST_PRIVATE_EF +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_INTERNAL_EF -code-completion-keywords=false | %FileCheck %s -check-prefix=TEST_INTERNAL_EF +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TEST_PUBLIC_EF -code-completion-keywords=false | %FileCheck %s -check-prefix=TEST_PUBLIC_EF @objc private class TagPA {} diff --git a/test/IDE/complete_override_objc.swift b/test/IDE/complete_override_objc.swift index 168de4d8d5b74..012ebf251afa0 100644 --- a/test/IDE/complete_override_objc.swift +++ b/test/IDE/complete_override_objc.swift @@ -1,6 +1,6 @@ // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PA -code-completion-keywords=false -F %S/Inputs/mock-sdk > %t.txt -// RUN: FileCheck %s -check-prefix=CHECK1 < %t.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROPERTY -code-completion-keywords=false -F %S/Inputs/mock-sdk | FileCheck %s -check-prefix=PROPERTY +// RUN: %FileCheck %s -check-prefix=CHECK1 < %t.txt +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROPERTY -code-completion-keywords=false -F %S/Inputs/mock-sdk | %FileCheck %s -check-prefix=PROPERTY // REQUIRES: objc_interop diff --git a/test/IDE/complete_pattern.swift b/test/IDE/complete_pattern.swift index 671723509d5a5..3b3446bcfff6a 100644 --- a/test/IDE/complete_pattern.swift +++ b/test/IDE/complete_pattern.swift @@ -1,29 +1,29 @@ // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PATTERN_IS_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PATTERN_IS_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PATTERN_IS_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PATTERN_IS_GENERIC_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt -// RUN: FileCheck %s -check-prefix=PATTERN_IS_GENERIC_1 < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=PATTERN_IS_GENERIC_1 < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PATTERN_IS_GENERIC_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt -// RUN: FileCheck %s -check-prefix=PATTERN_IS_GENERIC_2 < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=PATTERN_IS_GENERIC_2 < %t.types.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AFTER_PATTERN_IS | FileCheck %s -check-prefix=AFTER_PATTERN_IS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AFTER_PATTERN_IS | %FileCheck %s -check-prefix=AFTER_PATTERN_IS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MULTI_PATTERN_1 | FileCheck %s -check-prefix=MULTI_PATTERN_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MULTI_PATTERN_2 | FileCheck %s -check-prefix=MULTI_PATTERN_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MULTI_PATTERN_3 | FileCheck %s -check-prefix=MULTI_PATTERN_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MULTI_PATTERN_4 | FileCheck %s -check-prefix=MULTI_PATTERN_4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MULTI_PATTERN_1 | %FileCheck %s -check-prefix=MULTI_PATTERN_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MULTI_PATTERN_2 | %FileCheck %s -check-prefix=MULTI_PATTERN_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MULTI_PATTERN_3 | %FileCheck %s -check-prefix=MULTI_PATTERN_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MULTI_PATTERN_4 | %FileCheck %s -check-prefix=MULTI_PATTERN_4 //===--- Helper types that are used in this test diff --git a/test/IDE/complete_pound_keypath.swift b/test/IDE/complete_pound_keypath.swift index bdda3736b38d3..78f2a911a4b0b 100644 --- a/test/IDE/complete_pound_keypath.swift +++ b/test/IDE/complete_pound_keypath.swift @@ -1,10 +1,10 @@ -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=AFTER_POUND | FileCheck -check-prefix=CHECK-AFTER_POUND %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=AFTER_POUND | %FileCheck -check-prefix=CHECK-AFTER_POUND %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=KEYPATH_ARG | FileCheck -check-prefix=CHECK-KEYPATH_ARG %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=KEYPATH_ARG | %FileCheck -check-prefix=CHECK-KEYPATH_ARG %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=IN_KEYPATH_1 | FileCheck -check-prefix=CHECK-IN_KEYPATH %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=IN_KEYPATH_1 | %FileCheck -check-prefix=CHECK-IN_KEYPATH %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=IN_KEYPATH_2 | FileCheck -check-prefix=CHECK-IN_KEYPATH %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=IN_KEYPATH_2 | %FileCheck -check-prefix=CHECK-IN_KEYPATH %s // REQUIRES: objc_interop diff --git a/test/IDE/complete_pound_selector.swift b/test/IDE/complete_pound_selector.swift index e5ac3fe2aee14..bbe27701d8ca2 100644 --- a/test/IDE/complete_pound_selector.swift +++ b/test/IDE/complete_pound_selector.swift @@ -1,22 +1,22 @@ -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=AFTER_POUND | FileCheck -check-prefix=CHECK-AFTER_POUND %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=AFTER_POUND | %FileCheck -check-prefix=CHECK-AFTER_POUND %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=SELECTOR_BASIC | FileCheck -check-prefix=CHECK-SELECTOR_BASIC %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=SELECTOR_BASIC | %FileCheck -check-prefix=CHECK-SELECTOR_BASIC %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=SELECTOR_ARG1 | FileCheck -check-prefix=CHECK-SELECTOR_ARG %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=SELECTOR_ARG1 | %FileCheck -check-prefix=CHECK-SELECTOR_ARG %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=SELECTOR_ARG2 | FileCheck -check-prefix=CHECK-SELECTOR_ARG %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=SELECTOR_ARG2 | %FileCheck -check-prefix=CHECK-SELECTOR_ARG %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=IN_SELECTOR1 | FileCheck -check-prefix=CHECK-IN_SELECTOR %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=IN_SELECTOR1 | %FileCheck -check-prefix=CHECK-IN_SELECTOR %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=IN_SELECTOR2 | FileCheck -check-prefix=CHECK-IN_SELECTOR %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=IN_SELECTOR2 | %FileCheck -check-prefix=CHECK-IN_SELECTOR %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=IN_SELECTOR3 | FileCheck -check-prefix=CHECK-IN_SELECTOR %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=IN_SELECTOR3 | %FileCheck -check-prefix=CHECK-IN_SELECTOR %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=IN_SELECTOR4 | FileCheck -check-prefix=CHECK-IN_SELECTOR %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=IN_SELECTOR4 | %FileCheck -check-prefix=CHECK-IN_SELECTOR %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=IN_SELECTOR5 | FileCheck -check-prefix=CHECK-IN_SUPER_SELECTOR %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=IN_SELECTOR5 | %FileCheck -check-prefix=CHECK-IN_SUPER_SELECTOR %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=IN_SELECTOR6 | FileCheck -check-prefix=CHECK-IN_SUPER_SELECTOR %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=IN_SELECTOR6 | %FileCheck -check-prefix=CHECK-IN_SUPER_SELECTOR %s // REQUIRES: objc_interop diff --git a/test/IDE/complete_pound_statement.swift b/test/IDE/complete_pound_statement.swift index 0f3007eae6bb7..ce4dfa2a32b03 100644 --- a/test/IDE/complete_pound_statement.swift +++ b/test/IDE/complete_pound_statement.swift @@ -1,10 +1,10 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PLATFORM1 | FileCheck %s -check-prefix=PLATFORM1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PLATFORM2 | FileCheck %s -check-prefix=PLATFORM1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PLATFORM3 | FileCheck %s -check-prefix=PLATFORM1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PLATFORM4 | FileCheck %s -check-prefix=PLATFORM1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AVAIL1 | FileCheck %s -check-prefix=AVAILABLE -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AVAIL2 | FileCheck %s -check-prefix=AVAILABLE -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AVAIL3 | FileCheck %s -check-prefix=AVAILABLE1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PLATFORM1 | %FileCheck %s -check-prefix=PLATFORM1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PLATFORM2 | %FileCheck %s -check-prefix=PLATFORM1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PLATFORM3 | %FileCheck %s -check-prefix=PLATFORM1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PLATFORM4 | %FileCheck %s -check-prefix=PLATFORM1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AVAIL1 | %FileCheck %s -check-prefix=AVAILABLE +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AVAIL2 | %FileCheck %s -check-prefix=AVAILABLE +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AVAIL3 | %FileCheck %s -check-prefix=AVAILABLE1 { if #available(#^PLATFORM1^# diff --git a/test/IDE/complete_repeat.swift b/test/IDE/complete_repeat.swift index 8355a5df003c0..2403e85252283 100644 --- a/test/IDE/complete_repeat.swift +++ b/test/IDE/complete_repeat.swift @@ -1,9 +1,9 @@ -// RUN: %swift-ide-test -code-completion -code-completion-token=REPEAT_1 -source-filename=%s | FileCheck %s -check-prefix=REPEAT_1 -// RUN: %swift-ide-test -code-completion -code-completion-token=REPEAT_2 -source-filename=%s | FileCheck %s -check-prefix=REPEAT_2 -// RUN: %swift-ide-test -code-completion -code-completion-token=REPEAT_3 -source-filename=%s | FileCheck %s -check-prefix=REPEAT_3 -// RUN: %swift-ide-test -code-completion -code-completion-token=REPEAT_4 -source-filename=%s | FileCheck %s -check-prefix=REPEAT_4 -// RUN: %swift-ide-test -code-completion -code-completion-token=REPEAT_5 -source-filename=%s | FileCheck %s -check-prefix=REPEAT_5 -// RUN: %swift-ide-test -code-completion -code-completion-token=REPEAT_COND_1 -source-filename=%s | FileCheck %s -check-prefix=REPEAT_COND_1 +// RUN: %swift-ide-test -code-completion -code-completion-token=REPEAT_1 -source-filename=%s | %FileCheck %s -check-prefix=REPEAT_1 +// RUN: %swift-ide-test -code-completion -code-completion-token=REPEAT_2 -source-filename=%s | %FileCheck %s -check-prefix=REPEAT_2 +// RUN: %swift-ide-test -code-completion -code-completion-token=REPEAT_3 -source-filename=%s | %FileCheck %s -check-prefix=REPEAT_3 +// RUN: %swift-ide-test -code-completion -code-completion-token=REPEAT_4 -source-filename=%s | %FileCheck %s -check-prefix=REPEAT_4 +// RUN: %swift-ide-test -code-completion -code-completion-token=REPEAT_5 -source-filename=%s | %FileCheck %s -check-prefix=REPEAT_5 +// RUN: %swift-ide-test -code-completion -code-completion-token=REPEAT_COND_1 -source-filename=%s | %FileCheck %s -check-prefix=REPEAT_COND_1 repeat { let local1 = 1 diff --git a/test/IDE/complete_repl_empty_file.swift b/test/IDE/complete_repl_empty_file.swift index 97848d1da861c..ec3639914bb89 100644 --- a/test/IDE/complete_repl_empty_file.swift +++ b/test/IDE/complete_repl_empty_file.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -repl-code-completion -source-filename %s | FileCheck %s +// RUN: %target-swift-ide-test -repl-code-completion -source-filename %s | %FileCheck %s // CHECK: Begin completions // CHECK-DAG: {{^}}true: Bool{{$}} diff --git a/test/IDE/complete_repl_identifier_prefix_1.swift b/test/IDE/complete_repl_identifier_prefix_1.swift index 435c3dea50d4d..6d2bb2527bdd9 100644 --- a/test/IDE/complete_repl_identifier_prefix_1.swift +++ b/test/IDE/complete_repl_identifier_prefix_1.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -repl-code-completion -source-filename %s | FileCheck %s +// RUN: %target-swift-ide-test -repl-code-completion -source-filename %s | %FileCheck %s // CHECK: Begin completions // CHECK-NEXT: {{^}}true: Bool{{$}} diff --git a/test/IDE/complete_repl_in_func_1.swift b/test/IDE/complete_repl_in_func_1.swift index f6ec38f20d0f8..97da5d799d4db 100644 --- a/test/IDE/complete_repl_in_func_1.swift +++ b/test/IDE/complete_repl_in_func_1.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -repl-code-completion -source-filename %s | FileCheck %s +// RUN: %target-swift-ide-test -repl-code-completion -source-filename %s | %FileCheck %s // Make sure we partially type check the function body even if function body is // missing the right brace. diff --git a/test/IDE/complete_return.swift b/test/IDE/complete_return.swift index f324802617300..82520862a952e 100644 --- a/test/IDE/complete_return.swift +++ b/test/IDE/complete_return.swift @@ -1,12 +1,12 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RETURN_VOID_1 | FileCheck %s -check-prefix=RETURN_VOID_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RETURN_INT_1 | FileCheck %s -check-prefix=RETURN_INT_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RETURN_INT_2 | FileCheck %s -check-prefix=RETURN_INT_2 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TRY_RETURN_INT | FileCheck %s -check-prefix=RETURN_INT_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TRY_RETURN_VOID | FileCheck %s -check-prefix=RETURN_VOID_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RETURN_TR1 | FileCheck %s -check-prefix=RETURN_TR1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RETURN_TR2 | FileCheck %s -check-prefix=RETURN_TR2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RETURN_TR3 | FileCheck %s -check-prefix=RETURN_TR3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RETURN_VOID_1 | %FileCheck %s -check-prefix=RETURN_VOID_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RETURN_INT_1 | %FileCheck %s -check-prefix=RETURN_INT_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RETURN_INT_2 | %FileCheck %s -check-prefix=RETURN_INT_2 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TRY_RETURN_INT | %FileCheck %s -check-prefix=RETURN_INT_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TRY_RETURN_VOID | %FileCheck %s -check-prefix=RETURN_VOID_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RETURN_TR1 | %FileCheck %s -check-prefix=RETURN_TR1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RETURN_TR2 | %FileCheck %s -check-prefix=RETURN_TR2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RETURN_TR3 | %FileCheck %s -check-prefix=RETURN_TR3 struct FooStruct { var instanceVar : Int diff --git a/test/IDE/complete_stdlib_builtin.swift b/test/IDE/complete_stdlib_builtin.swift index 4afa0858237b1..7bcf8e89c41fb 100644 --- a/test/IDE/complete_stdlib_builtin.swift +++ b/test/IDE/complete_stdlib_builtin.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BUILTIN_1 | FileCheck %s -check-prefix=NO_CRASH -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BUILTIN_2 | FileCheck %s -check-prefix=NO_CRASH +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BUILTIN_1 | %FileCheck %s -check-prefix=NO_CRASH +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BUILTIN_2 | %FileCheck %s -check-prefix=NO_CRASH // NO_CRASH-NOT: Begin completions diff --git a/test/IDE/complete_stdlib_optional.swift b/test/IDE/complete_stdlib_optional.swift index 03084b26d3219..06cdc44c42249 100644 --- a/test/IDE/complete_stdlib_optional.swift +++ b/test/IDE/complete_stdlib_optional.swift @@ -1,59 +1,59 @@ // RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_NO_DOT_1 > %t.opt.txt -// RUN: FileCheck %s -check-prefix=OPT_NO_DOT_FOOSTRUCT < %t.opt.txt +// RUN: %FileCheck %s -check-prefix=OPT_NO_DOT_FOOSTRUCT < %t.opt.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_NO_DOT_2 > %t.opt.txt -// RUN: FileCheck %s -check-prefix=OPT_NO_DOT_FOOSTRUCT < %t.opt.txt +// RUN: %FileCheck %s -check-prefix=OPT_NO_DOT_FOOSTRUCT < %t.opt.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_DOT_1 > %t.opt.txt -// RUN: FileCheck %s -check-prefix=OPT_DOT_FOOSTRUCT < %t.opt.txt +// RUN: %FileCheck %s -check-prefix=OPT_DOT_FOOSTRUCT < %t.opt.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_DOT_1_SPACES > %t.opt.txt -// RUN: FileCheck %s -check-prefix=OPT_DOT_FOOSTRUCT_SPACES < %t.opt.txt +// RUN: %FileCheck %s -check-prefix=OPT_DOT_FOOSTRUCT_SPACES < %t.opt.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_DOT_2 > %t.opt.txt -// RUN: FileCheck %s -check-prefix=OPT_DOT_FOOSTRUCT < %t.opt.txt +// RUN: %FileCheck %s -check-prefix=OPT_DOT_FOOSTRUCT < %t.opt.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=UN_OPT_NO_DOT_1 > %t.opt.txt -// RUN: FileCheck %s -check-prefix=UN_OPT_NO_DOT_FOOSTRUCT < %t.opt.txt +// RUN: %FileCheck %s -check-prefix=UN_OPT_NO_DOT_FOOSTRUCT < %t.opt.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=UN_OPT_NO_DOT_2 > %t.opt.txt -// RUN: FileCheck %s -check-prefix=UN_OPT_NO_DOT_FOOSTRUCT < %t.opt.txt +// RUN: %FileCheck %s -check-prefix=UN_OPT_NO_DOT_FOOSTRUCT < %t.opt.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=UN_OPT_NO_DOT_3 > %t.opt.txt -// RUN: FileCheck %s -check-prefix=UN_OPT_NO_DOT_INT < %t.opt.txt +// RUN: %FileCheck %s -check-prefix=UN_OPT_NO_DOT_INT < %t.opt.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=UN_OPT_DOT_1 > %t.opt.txt -// RUN: FileCheck %s -check-prefix=UN_OPT_DOT_FOOSTRUCT < %t.opt.txt +// RUN: %FileCheck %s -check-prefix=UN_OPT_DOT_FOOSTRUCT < %t.opt.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=UN_OPT_DOT_2 > %t.opt.txt -// RUN: FileCheck %s -check-prefix=UN_OPT_DOT_FOOSTRUCT < %t.opt.txt +// RUN: %FileCheck %s -check-prefix=UN_OPT_DOT_FOOSTRUCT < %t.opt.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=UN_OPT_DOT_3 > %t.opt.txt -// RUN: FileCheck %s -check-prefix=UN_OPT_DOT_INT < %t.opt.txt +// RUN: %FileCheck %s -check-prefix=UN_OPT_DOT_INT < %t.opt.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_DL_NO_DOT_1 > %t.opt.txt -// RUN: FileCheck %s -check-prefix=OBJCCLASS_MEMBERS_NO_DOT < %t.opt.txt +// RUN: %FileCheck %s -check-prefix=OBJCCLASS_MEMBERS_NO_DOT < %t.opt.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_DL_NO_DOT_2 > %t.opt.txt -// RUN: FileCheck %s -check-prefix=OBJCCLASS_MEMBERS_NO_DOT < %t.opt.txt +// RUN: %FileCheck %s -check-prefix=OBJCCLASS_MEMBERS_NO_DOT < %t.opt.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_DL_DOT_1 > %t.opt.txt -// RUN: FileCheck %s -check-prefix=OBJCCLASS_MEMBERS_DOT < %t.opt.txt +// RUN: %FileCheck %s -check-prefix=OBJCCLASS_MEMBERS_DOT < %t.opt.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_DL_DOT_2 > %t.opt.txt -// RUN: FileCheck %s -check-prefix=OBJCCLASS_MEMBERS_DOT < %t.opt.txt +// RUN: %FileCheck %s -check-prefix=OBJCCLASS_MEMBERS_DOT < %t.opt.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_DL_FORCE_RETURN_OPTIONAL_1 > %t.opt.txt -// RUN: FileCheck %s -check-prefix=OPT_NO_DOT_OBJCCLASS < %t.opt.txt +// RUN: %FileCheck %s -check-prefix=OPT_NO_DOT_OBJCCLASS < %t.opt.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_CAST_AS_RESULT_1 > %t.opt.txt -// RUN: FileCheck %s -check-prefix=OPT_NO_DOT_OBJCCLASS < %t.opt.txt +// RUN: %FileCheck %s -check-prefix=OPT_NO_DOT_OBJCCLASS < %t.opt.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_TUPLE_1 | FileCheck %s -check-prefix=OPT_TUPLE_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_TUPLE_2 | FileCheck %s -check-prefix=OPT_TUPLE_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_TUPLE_3 | FileCheck %s -check-prefix=OPT_TUPLE_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_TUPLE_4 | FileCheck %s -check-prefix=OPT_TUPLE_4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_TUPLE_5 | FileCheck %s -check-prefix=OPT_TUPLE_5 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_TUPLE_1 | %FileCheck %s -check-prefix=OPT_TUPLE_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_TUPLE_2 | %FileCheck %s -check-prefix=OPT_TUPLE_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_TUPLE_3 | %FileCheck %s -check-prefix=OPT_TUPLE_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_TUPLE_4 | %FileCheck %s -check-prefix=OPT_TUPLE_4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -disable-objc-attr-requires-foundation-module -code-completion-token=OPT_TUPLE_5 | %FileCheck %s -check-prefix=OPT_TUPLE_5 //===--- //===--- Test code completion for stdlib Optional type. diff --git a/test/IDE/complete_stmt_controlling_expr.swift b/test/IDE/complete_stmt_controlling_expr.swift index 31aaf932f4137..2308d393efaef 100644 --- a/test/IDE/complete_stmt_controlling_expr.swift +++ b/test/IDE/complete_stmt_controlling_expr.swift @@ -1,136 +1,136 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_1 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_2 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_3 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_4 | FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_1 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_2 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_3 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_4 | %FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_ELSE_IF_1 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_ELSE_IF_2 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_ELSE_IF_3 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_ELSE_IF_4 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_ELSE_IF_5 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_ELSE_IF_6 | FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_ELSE_IF_1 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_ELSE_IF_2 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_ELSE_IF_3 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_ELSE_IF_4 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_ELSE_IF_5 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_IF_ELSE_IF_6 | %FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_WHILE_1 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_WHILE_2 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_WHILE_3 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_WHILE_4 | FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_WHILE_1 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_WHILE_2 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_WHILE_3 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_WHILE_4 | %FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_DO_WHILE_1 | FileCheck %s -check-prefix=COND-WITH-RELATION -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_DO_WHILE_2 | FileCheck %s -check-prefix=COND-WITH-RELATION1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_DO_WHILE_1 | %FileCheck %s -check-prefix=COND-WITH-RELATION +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COND_DO_WHILE_2 | %FileCheck %s -check-prefix=COND-WITH-RELATION1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_INIT_1 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_INIT_2 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_INIT_3 | FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_INIT_1 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_INIT_2 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_INIT_3 | %FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_COND_1 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_COND_2 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_COND_3 | FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_COND_1 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_COND_2 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_COND_3 | %FileCheck %s -check-prefix=COND_COMMON // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_COND_I_1 > %t.cond.txt -// RUN: FileCheck %s -check-prefix=COND_COMMON < %t.cond.txt -// RUN: FileCheck %s -check-prefix=WITH_I_INT_EXPR_SPECIFIC < %t.cond.txt +// RUN: %FileCheck %s -check-prefix=COND_COMMON < %t.cond.txt +// RUN: %FileCheck %s -check-prefix=WITH_I_INT_EXPR_SPECIFIC < %t.cond.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_COND_I_2 > %t.cond.txt -// RUN: FileCheck %s -check-prefix=COND_COMMON < %t.cond.txt -// RUN: FileCheck %s -check-prefix=WITH_I_ERROR_EXPR_SPECIFIC < %t.cond.txt +// RUN: %FileCheck %s -check-prefix=COND_COMMON < %t.cond.txt +// RUN: %FileCheck %s -check-prefix=WITH_I_ERROR_EXPR_SPECIFIC < %t.cond.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_COND_I_E_1 > %t.cond.txt -// RUN: FileCheck %s -check-prefix=COND_COMMON < %t.cond.txt -// RUN: FileCheck %s -check-prefix=WITH_I_E_EXPR_SPECIFIC < %t.cond.txt +// RUN: %FileCheck %s -check-prefix=COND_COMMON < %t.cond.txt +// RUN: %FileCheck %s -check-prefix=WITH_I_E_EXPR_SPECIFIC < %t.cond.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_INCR_1 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_INCR_2 | FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_INCR_1 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_INCR_2 | %FileCheck %s -check-prefix=COND_COMMON // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_INCR_I_1 > %t.incr.txt -// RUN: FileCheck %s -check-prefix=COND_COMMON < %t.incr.txt -// RUN: FileCheck %s -check-prefix=WITH_I_INT_EXPR_SPECIFIC < %t.incr.txt +// RUN: %FileCheck %s -check-prefix=COND_COMMON < %t.incr.txt +// RUN: %FileCheck %s -check-prefix=WITH_I_INT_EXPR_SPECIFIC < %t.incr.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_INCR_I_2 > %t.incr.txt -// RUN: FileCheck %s -check-prefix=COND_COMMON < %t.incr.txt -// RUN: FileCheck %s -check-prefix=WITH_I_INT_EXPR_SPECIFIC < %t.incr.txt +// RUN: %FileCheck %s -check-prefix=COND_COMMON < %t.incr.txt +// RUN: %FileCheck %s -check-prefix=WITH_I_INT_EXPR_SPECIFIC < %t.incr.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_INCR_I_3 > %t.incr.txt -// RUN: FileCheck %s -check-prefix=COND_COMMON < %t.incr.txt -// RUN: FileCheck %s -check-prefix=WITH_I_INT_EXPR_SPECIFIC < %t.incr.txt +// RUN: %FileCheck %s -check-prefix=COND_COMMON < %t.incr.txt +// RUN: %FileCheck %s -check-prefix=WITH_I_INT_EXPR_SPECIFIC < %t.incr.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_INCR_I_4 > %t.incr.txt -// RUN: FileCheck %s -check-prefix=COND_COMMON < %t.incr.txt -// RUN: FileCheck %s -check-prefix=WITH_I_ERROR_EXPR_SPECIFIC < %t.incr.txt +// RUN: %FileCheck %s -check-prefix=COND_COMMON < %t.incr.txt +// RUN: %FileCheck %s -check-prefix=WITH_I_ERROR_EXPR_SPECIFIC < %t.incr.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_INCR_I_E_1 > %t.incr.txt -// RUN: FileCheck %s -check-prefix=COND_COMMON < %t.incr.txt -// RUN: FileCheck %s -check-prefix=WITH_I_E_EXPR_SPECIFIC < %t.incr.txt +// RUN: %FileCheck %s -check-prefix=COND_COMMON < %t.incr.txt +// RUN: %FileCheck %s -check-prefix=WITH_I_E_EXPR_SPECIFIC < %t.incr.txt // FIXME: should have 'i' in these results. // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_BODY_I_1 > %t.body.txt -// RUN: FileCheck %s -check-prefix=COND_COMMON < %t.body.txt -// FIXME: FileCheck %s -check-prefix=WITH_I_INT_EXPR_SPECIFIC < %t.body.txt +// RUN: %FileCheck %s -check-prefix=COND_COMMON < %t.body.txt +// FIXME: %FileCheck %s -check-prefix=WITH_I_INT_EXPR_SPECIFIC < %t.body.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_BODY_I_2 > %t.body.txt -// RUN: FileCheck %s -check-prefix=COND_COMMON < %t.body.txt -// RUN: FileCheck %s -check-prefix=WITH_I_INT_EXPR_SPECIFIC < %t.body.txt +// RUN: %FileCheck %s -check-prefix=COND_COMMON < %t.body.txt +// RUN: %FileCheck %s -check-prefix=WITH_I_INT_EXPR_SPECIFIC < %t.body.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_BODY_I_3 > %t.body.txt -// RUN: FileCheck %s -check-prefix=COND_COMMON < %t.body.txt -// RUN: FileCheck %s -check-prefix=WITH_I_ERROR_EXPR_SPECIFIC < %t.body.txt +// RUN: %FileCheck %s -check-prefix=COND_COMMON < %t.body.txt +// RUN: %FileCheck %s -check-prefix=WITH_I_ERROR_EXPR_SPECIFIC < %t.body.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_BODY_I_4 > %t.body.txt -// RUN: FileCheck %s -check-prefix=COND_COMMON < %t.body.txt -// RUN: FileCheck %s -check-prefix=WITH_I_INT_LOCAL < %t.body.txt +// RUN: %FileCheck %s -check-prefix=COND_COMMON < %t.body.txt +// RUN: %FileCheck %s -check-prefix=WITH_I_INT_LOCAL < %t.body.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_BODY_I_5 > %t.body.txt -// RUN: FileCheck %s -check-prefix=COND_COMMON < %t.body.txt -// RUN: FileCheck %s -check-prefix=WITH_I_INT_LOCAL < %t.body.txt +// RUN: %FileCheck %s -check-prefix=COND_COMMON < %t.body.txt +// RUN: %FileCheck %s -check-prefix=WITH_I_INT_LOCAL < %t.body.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=C_STYLE_FOR_BODY_I_6 > %t.body.txt -// RUN: FileCheck %s -check-prefix=COND_COMMON < %t.body.txt -// RUN: FileCheck %s -check-prefix=WITH_I_INT_LOCAL < %t.body.txt +// RUN: %FileCheck %s -check-prefix=COND_COMMON < %t.body.txt +// RUN: %FileCheck %s -check-prefix=WITH_I_INT_LOCAL < %t.body.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOR_EACH_EXPR_1 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOR_EACH_EXPR_2 | FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOR_EACH_EXPR_1 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOR_EACH_EXPR_2 | %FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SWITCH_EXPR_1 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SWITCH_EXPR_2 | FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SWITCH_EXPR_1 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SWITCH_EXPR_2 | %FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SWITCH_CASE_WHERE_EXPR_1 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SWITCH_CASE_WHERE_EXPR_2 | FileCheck %s -check-prefix=COND_COMMON -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SWITCH_CASE_WHERE_EXPR_3 | FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SWITCH_CASE_WHERE_EXPR_1 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SWITCH_CASE_WHERE_EXPR_2 | %FileCheck %s -check-prefix=COND_COMMON +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SWITCH_CASE_WHERE_EXPR_3 | %FileCheck %s -check-prefix=COND_COMMON // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SWITCH_CASE_WHERE_EXPR_I_1 > %t.where.txt -// RUN: FileCheck %s -check-prefix=COND_COMMON < %t.where.txt -// RUN: FileCheck %s -check-prefix=WITH_I_INT_LOCAL < %t.where.txt +// RUN: %FileCheck %s -check-prefix=COND_COMMON < %t.where.txt +// RUN: %FileCheck %s -check-prefix=WITH_I_INT_LOCAL < %t.where.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SWITCH_CASE_WHERE_EXPR_I_2 > %t.where.txt -// RUN: FileCheck %s -check-prefix=COND_COMMON < %t.where.txt -// RUN: FileCheck %s -check-prefix=WITH_I_INT_LOCAL < %t.where.txt +// RUN: %FileCheck %s -check-prefix=COND_COMMON < %t.where.txt +// RUN: %FileCheck %s -check-prefix=WITH_I_INT_LOCAL < %t.where.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SWITCH_CASE_WHERE_EXPR_I_J_1 > %t.where.txt -// RUN: FileCheck %s -check-prefix=COND_COMMON < %t.where.txt -// RUN: FileCheck %s -check-prefix=WITH_I_INT_LOCAL < %t.where.txt -// RUN: FileCheck %s -check-prefix=WITH_J_INT < %t.where.txt - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_IF_1 | FileCheck %s -check-prefix=UNRESOLVED_B -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_IF_2 | FileCheck %s -check-prefix=UNRESOLVED_B -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_IF_3 | FileCheck %s -check-prefix=UNRESOLVED_B -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_IF_4 | FileCheck %s -check-prefix=UNRESOLVED_B -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_WHILE_1 | FileCheck %s -check-prefix=UNRESOLVED_B -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_WHILE_2 | FileCheck %s -check-prefix=UNRESOLVED_B -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_WHILE_3 | FileCheck %s -check-prefix=UNRESOLVED_B -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_WHILE_4 | FileCheck %s -check-prefix=UNRESOLVED_B -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_GUARD_1 | FileCheck %s -check-prefix=UNRESOLVED_B -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_GUARD_2 | FileCheck %s -check-prefix=UNRESOLVED_B -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_GUARD_3 | FileCheck %s -check-prefix=UNRESOLVED_B -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_GUARD_4 | FileCheck %s -check-prefix=UNRESOLVED_B -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_GUARD_5 | FileCheck %s -check-prefix=UNRESOLVED_B -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_GUARD_6 | FileCheck %s -check-prefix=UNRESOLVED_B -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_GUARD_7 | FileCheck %s -check-prefix=UNRESOLVED_B +// RUN: %FileCheck %s -check-prefix=COND_COMMON < %t.where.txt +// RUN: %FileCheck %s -check-prefix=WITH_I_INT_LOCAL < %t.where.txt +// RUN: %FileCheck %s -check-prefix=WITH_J_INT < %t.where.txt + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_IF_1 | %FileCheck %s -check-prefix=UNRESOLVED_B +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_IF_2 | %FileCheck %s -check-prefix=UNRESOLVED_B +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_IF_3 | %FileCheck %s -check-prefix=UNRESOLVED_B +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_IF_4 | %FileCheck %s -check-prefix=UNRESOLVED_B +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_WHILE_1 | %FileCheck %s -check-prefix=UNRESOLVED_B +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_WHILE_2 | %FileCheck %s -check-prefix=UNRESOLVED_B +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_WHILE_3 | %FileCheck %s -check-prefix=UNRESOLVED_B +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_WHILE_4 | %FileCheck %s -check-prefix=UNRESOLVED_B +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_GUARD_1 | %FileCheck %s -check-prefix=UNRESOLVED_B +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_GUARD_2 | %FileCheck %s -check-prefix=UNRESOLVED_B +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_GUARD_3 | %FileCheck %s -check-prefix=UNRESOLVED_B +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_GUARD_4 | %FileCheck %s -check-prefix=UNRESOLVED_B +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_GUARD_5 | %FileCheck %s -check-prefix=UNRESOLVED_B +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_GUARD_6 | %FileCheck %s -check-prefix=UNRESOLVED_B +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_GUARD_7 | %FileCheck %s -check-prefix=UNRESOLVED_B struct FooStruct { diff --git a/test/IDE/complete_testable.swift b/test/IDE/complete_testable.swift index a28db911bbb67..9d19bc71b110c 100644 --- a/test/IDE/complete_testable.swift +++ b/test/IDE/complete_testable.swift @@ -2,20 +2,20 @@ // RUN: %target-swift-frontend -emit-module -enable-testing -o %t %S/Inputs/complete_testable_helper.swift // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL -I %t > %t.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL -check-prefix=TOP_LEVEL-ALL < %t.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL-NEG -check-prefix=TOP_LEVEL-ALL-NEG < %t.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL -check-prefix=TOP_LEVEL-ALL < %t.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL-NEG -check-prefix=TOP_LEVEL-ALL-NEG < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL -I %t -D TESTABLE > %t.testable.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL-TESTABLE -check-prefix=TOP_LEVEL-ALL < %t.testable.txt -// RUN: FileCheck %s -check-prefix=TOP_LEVEL-TESTABLE-NEG -check-prefix=TOP_LEVEL-ALL-NEG < %t.testable.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL-TESTABLE -check-prefix=TOP_LEVEL-ALL < %t.testable.txt +// RUN: %FileCheck %s -check-prefix=TOP_LEVEL-TESTABLE-NEG -check-prefix=TOP_LEVEL-ALL-NEG < %t.testable.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER -I %t > %t.txt -// RUN: FileCheck %s -check-prefix=MEMBER -check-prefix=MEMBER-ALL < %t.txt -// RUN: FileCheck %s -check-prefix=MEMBER-NEG -check-prefix=MEMBER-ALL-NEG < %t.txt +// RUN: %FileCheck %s -check-prefix=MEMBER -check-prefix=MEMBER-ALL < %t.txt +// RUN: %FileCheck %s -check-prefix=MEMBER-NEG -check-prefix=MEMBER-ALL-NEG < %t.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER -I %t -D TESTABLE > %t.testable.txt -// RUN: FileCheck %s -check-prefix=MEMBER-TESTABLE -check-prefix=MEMBER-ALL < %t.testable.txt -// RUN: FileCheck %s -check-prefix=MEMBER-TESTABLE-NEG -check-prefix=MEMBER-ALL-NEG < %t.testable.txt +// RUN: %FileCheck %s -check-prefix=MEMBER-TESTABLE -check-prefix=MEMBER-ALL < %t.testable.txt +// RUN: %FileCheck %s -check-prefix=MEMBER-TESTABLE-NEG -check-prefix=MEMBER-ALL-NEG < %t.testable.txt #if TESTABLE @testable import complete_testable_helper diff --git a/test/IDE/complete_trailing_closure.swift b/test/IDE/complete_trailing_closure.swift index 821b64f7d06e0..3d45a7c412f09 100644 --- a/test/IDE/complete_trailing_closure.swift +++ b/test/IDE/complete_trailing_closure.swift @@ -1,29 +1,29 @@ // RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=GLOBAL_1 > %t -// RUN: FileCheck %s -check-prefix=GLOBAL_1 < %t -// RUN: FileCheck %s -check-prefix=NONTRIVIAL < %t +// RUN: %FileCheck %s -check-prefix=GLOBAL_1 < %t +// RUN: %FileCheck %s -check-prefix=NONTRIVIAL < %t // RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=METHOD_1 > %t -// RUN: FileCheck %s -check-prefix=METHOD_1 < %t -// RUN: FileCheck %s -check-prefix=NONTRIVIAL < %t +// RUN: %FileCheck %s -check-prefix=METHOD_1 < %t +// RUN: %FileCheck %s -check-prefix=NONTRIVIAL < %t // RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=METHOD_2 > %t -// RUN: FileCheck %s -check-prefix=GLOBAL_1 < %t -// RUN: FileCheck %s -check-prefix=METHOD_1 < %t -// RUN: FileCheck %s -check-prefix=NONTRIVIAL < %t +// RUN: %FileCheck %s -check-prefix=GLOBAL_1 < %t +// RUN: %FileCheck %s -check-prefix=METHOD_1 < %t +// RUN: %FileCheck %s -check-prefix=NONTRIVIAL < %t // RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=METHOD_3 > %t -// RUN: FileCheck %s -check-prefix=METHOD_1 < %t -// RUN: FileCheck %s -check-prefix=NONTRIVIAL < %t +// RUN: %FileCheck %s -check-prefix=METHOD_1 < %t +// RUN: %FileCheck %s -check-prefix=NONTRIVIAL < %t // RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=STATIC_METHOD_1 > %t -// RUN: FileCheck %s -check-prefix=STATIC_METHOD_1 < %t +// RUN: %FileCheck %s -check-prefix=STATIC_METHOD_1 < %t // RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=METHOD_4 > %t -// RUN: FileCheck %s -check-prefix=METHOD_4 < %t -// RUN: FileCheck %s -check-prefix=NONTRIVIAL < %t +// RUN: %FileCheck %s -check-prefix=METHOD_4 < %t +// RUN: %FileCheck %s -check-prefix=NONTRIVIAL < %t // RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=CLASS_METHOD_1 > %t -// RUN: FileCheck %s -check-prefix=CLASS_METHOD_1 < %t +// RUN: %FileCheck %s -check-prefix=CLASS_METHOD_1 < %t // NONTRIVIAL-NOT: nonTrivial{{.*}} {|} diff --git a/test/IDE/complete_type.swift b/test/IDE/complete_type.swift index 9ff3d32688124..b5c0a44e7847a 100644 --- a/test/IDE/complete_type.swift +++ b/test/IDE/complete_type.swift @@ -1,382 +1,382 @@ // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PROTOCOL_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_PROTOCOL < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_PROTOCOL < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_GENERIC_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_FUNC_PARAM_GENERIC_1 < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_FUNC_PARAM_GENERIC_1 < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_GENERIC_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_FUNC_PARAM_GENERIC_2 < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_FUNC_PARAM_GENERIC_2 < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_GENERIC_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_FUNC_PARAM_GENERIC_3 < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_FUNC_PARAM_GENERIC_3 < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_GENERIC_4 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_FUNC_PARAM_GENERIC_4 < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_FUNC_PARAM_GENERIC_4 < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_GENERIC_5 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_FUNC_PARAM_GENERIC_5 < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_FUNC_PARAM_GENERIC_5 < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_1 < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_1 < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_2 < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_2 < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_3 < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_3 < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_LOCAL_VAR_IN_FREE_FUNC_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_LOCAL_VAR_IN_FREE_FUNC_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_LOCAL_VAR_IN_FREE_FUNC_2 < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_LOCAL_VAR_IN_FREE_FUNC_2 < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_LOCAL_VAR_IN_CONSTRUCTOR_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_LOCAL_VAR_IN_MEMBER_FUNC_1 < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_LOCAL_VAR_IN_MEMBER_FUNC_1 < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_LOCAL_VAR_IN_DESTRUCTOR_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_LOCAL_VAR_IN_MEMBER_FUNC_1 < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_LOCAL_VAR_IN_MEMBER_FUNC_1 < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_LOCAL_VAR_IN_INSTANCE_FUNC_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_LOCAL_VAR_IN_MEMBER_FUNC_1 < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_LOCAL_VAR_IN_MEMBER_FUNC_1 < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_GLOBAL_VAR_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_TYPEALIAS_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_TYPEALIAS_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_TYPEALIAS_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_ASSOC_TYPE_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_ASSOC_TYPE_INHERITANCE_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_EXTENSION_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_EXTENSION_INHERITANCE_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_EXTENSION_INHERITANCE_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_EXTENSION_INHERITANCE_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_STRUCT_INHERITANCE_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_STRUCT_INHERITANCE_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_STRUCT_INHERITANCE_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_STRUCT_INHERITANCE_4 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_STRUCT_INHERITANCE_5 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_STRUCT_INHERITANCE_6 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_STRUCT_INHERITANCE_7 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_STRUCT_INHERITANCE_8 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CLASS_INHERITANCE_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CLASS_INHERITANCE_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_ENUM_INHERITANCE_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_ENUM_INHERITANCE_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PROTOCOL_INHERITANCE_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PROTOCOL_INHERITANCE_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_TUPLE_TYPE_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_TUPLE_TYPE_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_TUPLE_TYPE_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_TUPLE_TYPE_4 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_TUPLE_TYPE_5 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_TUPLE_TYPE_6 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNCTION_TYPE_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNCTION_TYPE_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNCTION_TYPE_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNCTION_TYPE_4 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNCTION_TYPE_5 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNCTION_TYPE_6 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PROTOCOL_COMPOSITION_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PROTOCOL_COMPOSITION_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PROTOCOL_COMPOSITION_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_NESTED_TYPES_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_NESTED_TYPES_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_NESTED_TYPES_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_NESTED_TYPES_4 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_INSTANCE_VAR_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_INSTANCE_VAR_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_INSTANCE_VAR_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_INSTANCE_VAR_4 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_LOCAL_VAR_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_LOCAL_VAR_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_LOCAL_VAR_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_LOCAL_VAR_4 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_BASE_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_BASE_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_BASE_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_BASE_4 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_BASE_NO_DOT_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_BASE_1_NO_DOT_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_NO_DOT_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_BASE_NO_DOT_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_BASE_1_NO_DOT_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_NO_DOT_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_BASE_NO_DOT_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_BASE_1_NO_DOT_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_NO_DOT_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_DERIVED_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_DERIVED_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_DERIVED_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_GENERIC_1 > %t.types.txt -// FIXME: FileCheck %s -check-prefix=TYPE_IDENTIFIER_GENERIC_1 < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// FIXME: %FileCheck %s -check-prefix=TYPE_IDENTIFIER_GENERIC_1 < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_GENERIC_2 > %t.types.txt -// FIXME: FileCheck %s -check-prefix=TYPE_IDENTIFIER_GENERIC_2 < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// FIXME: %FileCheck %s -check-prefix=TYPE_IDENTIFIER_GENERIC_2 < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_GENERIC_3 | FileCheck %s -check-prefix=TYPE_IDENTIFIER_GENERIC_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_GENERIC_3 | %FileCheck %s -check-prefix=TYPE_IDENTIFIER_GENERIC_3 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_IRRELEVANT_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IDENTIFIER_IRRELEVANT_1 < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IDENTIFIER_IRRELEVANT_1 < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_AS_CAST_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_TYPEALIAS_1 | FileCheck %s -check-prefix=GENERIC_TYPEALIAS_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_TYPEALIAS_1 | %FileCheck %s -check-prefix=GENERIC_TYPEALIAS_1 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_TYPEALIAS_2 > %t.gentypealias.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.gentypealias.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.gentypealias.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.gentypealias.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.gentypealias.txt //===--- Helper types that are used in this test diff --git a/test/IDE/complete_type_any.swift b/test/IDE/complete_type_any.swift index 5a3b05e336381..0473b3ed93477 100644 --- a/test/IDE/complete_type_any.swift +++ b/test/IDE/complete_type_any.swift @@ -1,17 +1,17 @@ // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ANY_IN_FUNC_PARAM > %t.types.txt -// RUN: FileCheck %s -check-prefix=ANY_IN_FUNC_PARAM < %t.types.txt +// RUN: %FileCheck %s -check-prefix=ANY_IN_FUNC_PARAM < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ANY_IN_VAR_TYPE > %t.types.txt -// RUN: FileCheck %s -check-prefix=ANY_IN_VAR_TYPE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=ANY_IN_VAR_TYPE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ANY_METATYPE_VARIABLE > %t.types.txt -// RUN: FileCheck %s -check-prefix=ANY_METATYPE_VARIABLE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=ANY_METATYPE_VARIABLE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ANY_METATYPE_MEMBER > %t.types.txt -// RUN: FileCheck %s -check-prefix=ANY_METATYPE_MEMBER < %t.types.txt +// RUN: %FileCheck %s -check-prefix=ANY_METATYPE_MEMBER < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ANY_IN_TYPEALIAS > %t.types.txt -// RUN: FileCheck %s -check-prefix=ANY_IN_TYPEALIAS < %t.types.txt +// RUN: %FileCheck %s -check-prefix=ANY_IN_TYPEALIAS < %t.types.txt func testAnyInParamList(a: #^ANY_IN_FUNC_PARAM^# diff --git a/test/IDE/complete_type_in_func_param.swift b/test/IDE/complete_type_in_func_param.swift index 2adb55879eaf7..516098c14a5be 100644 --- a/test/IDE/complete_type_in_func_param.swift +++ b/test/IDE/complete_type_in_func_param.swift @@ -1,154 +1,154 @@ // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_4 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_5 > %t.types.txt -// FIXME: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// FIXME: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// FIXME: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// FIXME: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_6 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_7 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_8 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_9 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CONSTRUCTOR_PARAM_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CONSTRUCTOR_PARAM_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CONSTRUCTOR_PARAM_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CONSTRUCTOR_PARAM_4 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CONSTRUCTOR_PARAM_5 > %t.types.txt -// FIXME: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// FIXME: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// FIXME: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// FIXME: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CONSTRUCTOR_PARAM_6 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CONSTRUCTOR_PARAM_7 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CONSTRUCTOR_PARAM_8 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CONSTRUCTOR_PARAM_9 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_RESULT_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_RESULT_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_RESULT_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_RESULT_4 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_RESULT_5 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_RESULT_6 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_RESULT_7 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_RESULT_8 > %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PARAM_FORWARD_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_PARAM_FORWARD < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_PARAM_FORWARD < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PARAM_FORWARD_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_PARAM_FORWARD < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_PARAM_FORWARD < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PARAM_FORWARD_3 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_PARAM_FORWARD < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_PARAM_FORWARD < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PARAM_FORWARD_4 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_PARAM_FORWARD < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_PARAM_FORWARD < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PARAM_FORWARD_5 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_PARAM_FORWARD < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_PARAM_FORWARD < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PARAM_FORWARD_6 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_PARAM_FORWARD < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_PARAM_FORWARD < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PARAM_FORWARD_7 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_PARAM_FORWARD < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_PARAM_FORWARD < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PARAM_FORWARD_8 > %t.types.txt -// RUN: FileCheck %s -check-prefix=TYPE_IN_PARAM_FORWARD < %t.types.txt -// RUN: FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt -// RUN: FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt +// RUN: %FileCheck %s -check-prefix=TYPE_IN_PARAM_FORWARD < %t.types.txt +// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt +// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_NO_NAME_1 > %t.types.txt -// RUN: FileCheck %s -check-prefix=NO_COMPLETION < %t.types.txt +// RUN: %FileCheck %s -check-prefix=NO_COMPLETION < %t.types.txt // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_NO_NAME_2 > %t.types.txt -// RUN: FileCheck %s -check-prefix=NO_COMPLETION < %t.types.txt +// RUN: %FileCheck %s -check-prefix=NO_COMPLETION < %t.types.txt //===--- Helper types that are used in this test diff --git a/test/IDE/complete_unicode.swift b/test/IDE/complete_unicode.swift index 8f179243ebd8c..c5228d555dd26 100644 --- a/test/IDE/complete_unicode.swift +++ b/test/IDE/complete_unicode.swift @@ -1,5 +1,5 @@ // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNICODE_1 > %t.unicode.txt -// RUN: FileCheck %s -check-prefix=UNICODE_1 < %t.unicode.txt +// RUN: %FileCheck %s -check-prefix=UNICODE_1 < %t.unicode.txt struct Unicode1 { func Идентификаторы_с_кириллицей_допустимы() {} diff --git a/test/IDE/complete_unresolved_members.swift b/test/IDE/complete_unresolved_members.swift index c23993eca78d9..e9811c70c161a 100644 --- a/test/IDE/complete_unresolved_members.swift +++ b/test/IDE/complete_unresolved_members.swift @@ -1,54 +1,54 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_1 | FileCheck %s -check-prefix=UNRESOLVED_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_2 | FileCheck %s -check-prefix=UNRESOLVED_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_3 | FileCheck %s -check-prefix=UNRESOLVED_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_4 | FileCheck %s -check-prefix=UNRESOLVED_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_5 | FileCheck %s -check-prefix=UNRESOLVED_1 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_6 | FileCheck %s -check-prefix=UNRESOLVED_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_7 | FileCheck %s -check-prefix=UNRESOLVED_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_10 | FileCheck %s -check-prefix=UNRESOLVED_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_11 | FileCheck %s -check-prefix=UNRESOLVED_2 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_8 | FileCheck %s -check-prefix=UNRESOLVED_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_9 | FileCheck %s -check-prefix=UNRESOLVED_3 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_12 | FileCheck %s -check-prefix=UNRESOLVED_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_13 | FileCheck %s -check-prefix=UNRESOLVED_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_14 | FileCheck %s -check-prefix=UNRESOLVED_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_15 | FileCheck %s -check-prefix=UNRESOLVED_1 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_16 | FileCheck %s -check-prefix=UNRESOLVED_4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_17 | FileCheck %s -check-prefix=UNRESOLVED_4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_18 | FileCheck %s -check-prefix=UNRESOLVED_1 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_19 | FileCheck %s -check-prefix=UNRESOLVED_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_20 | FileCheck %s -check-prefix=UNRESOLVED_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_21 | FileCheck %s -check-prefix=UNRESOLVED_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_22 | FileCheck %s -check-prefix=UNRESOLVED_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_23 | FileCheck %s -check-prefix=UNRESOLVED_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_24 | FileCheck %s -check-prefix=UNRESOLVED_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_25 | FileCheck %s -check-prefix=UNRESOLVED_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_26 | FileCheck %s -check-prefix=UNRESOLVED_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_27 | FileCheck %s -check-prefix=UNRESOLVED_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_1 | %FileCheck %s -check-prefix=UNRESOLVED_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_2 | %FileCheck %s -check-prefix=UNRESOLVED_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_3 | %FileCheck %s -check-prefix=UNRESOLVED_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_4 | %FileCheck %s -check-prefix=UNRESOLVED_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_5 | %FileCheck %s -check-prefix=UNRESOLVED_1 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_6 | %FileCheck %s -check-prefix=UNRESOLVED_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_7 | %FileCheck %s -check-prefix=UNRESOLVED_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_10 | %FileCheck %s -check-prefix=UNRESOLVED_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_11 | %FileCheck %s -check-prefix=UNRESOLVED_2 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_8 | %FileCheck %s -check-prefix=UNRESOLVED_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_9 | %FileCheck %s -check-prefix=UNRESOLVED_3 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_12 | %FileCheck %s -check-prefix=UNRESOLVED_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_13 | %FileCheck %s -check-prefix=UNRESOLVED_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_14 | %FileCheck %s -check-prefix=UNRESOLVED_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_15 | %FileCheck %s -check-prefix=UNRESOLVED_1 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_16 | %FileCheck %s -check-prefix=UNRESOLVED_4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_17 | %FileCheck %s -check-prefix=UNRESOLVED_4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_18 | %FileCheck %s -check-prefix=UNRESOLVED_1 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_19 | %FileCheck %s -check-prefix=UNRESOLVED_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_20 | %FileCheck %s -check-prefix=UNRESOLVED_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_21 | %FileCheck %s -check-prefix=UNRESOLVED_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_22 | %FileCheck %s -check-prefix=UNRESOLVED_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_23 | %FileCheck %s -check-prefix=UNRESOLVED_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_24 | %FileCheck %s -check-prefix=UNRESOLVED_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_25 | %FileCheck %s -check-prefix=UNRESOLVED_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_26 | %FileCheck %s -check-prefix=UNRESOLVED_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_27 | %FileCheck %s -check-prefix=UNRESOLVED_3 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_27_NOCRASH > /dev/null -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_28 | FileCheck %s -check-prefix=UNRESOLVED_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_29 | FileCheck %s -check-prefix=UNRESOLVED_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_30 | FileCheck %s -check-prefix=UNRESOLVED_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_28 | %FileCheck %s -check-prefix=UNRESOLVED_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_29 | %FileCheck %s -check-prefix=UNRESOLVED_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNRESOLVED_30 | %FileCheck %s -check-prefix=UNRESOLVED_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_AVAIL_1 | FileCheck %s -check-prefix=ENUM_AVAIL_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OPTIONS_AVAIL_1 | FileCheck %s -check-prefix=OPTIONS_AVAIL_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ENUM_AVAIL_1 | %FileCheck %s -check-prefix=ENUM_AVAIL_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OPTIONS_AVAIL_1 | %FileCheck %s -check-prefix=OPTIONS_AVAIL_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=WITH_LITERAL_1 | FileCheck %s -check-prefix=WITH_LITERAL_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=WITH_LITERAL_2 | FileCheck %s -check-prefix=WITH_LITERAL_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=WITH_LITERAL_3 | FileCheck %s -check-prefix=WITH_LITERAL_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=WITH_LITERAL_1 | %FileCheck %s -check-prefix=WITH_LITERAL_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=WITH_LITERAL_2 | %FileCheck %s -check-prefix=WITH_LITERAL_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=WITH_LITERAL_3 | %FileCheck %s -check-prefix=WITH_LITERAL_1 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INVALID_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OTHER_FILE_1 %S/Inputs/EnumFromOtherFile.swift | FileCheck %s -check-prefix=OTHER_FILE_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OTHER_FILE_1 %S/Inputs/EnumFromOtherFile.swift | %FileCheck %s -check-prefix=OTHER_FILE_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NON_OPT_SET_1 | FileCheck %s -check-prefix=NON_OPT_SET_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NON_OPT_SET_2 | FileCheck %s -check-prefix=NON_OPT_SET_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NON_OPT_SET_3 | FileCheck %s -check-prefix=NON_OPT_SET_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NON_OPT_SET_1 | %FileCheck %s -check-prefix=NON_OPT_SET_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NON_OPT_SET_2 | %FileCheck %s -check-prefix=NON_OPT_SET_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NON_OPT_SET_3 | %FileCheck %s -check-prefix=NON_OPT_SET_1 enum SomeEnum1 { case South diff --git a/test/IDE/complete_unwrapping_if_while.swift b/test/IDE/complete_unwrapping_if_while.swift index 96712878612de..a84507298d851 100644 --- a/test/IDE/complete_unwrapping_if_while.swift +++ b/test/IDE/complete_unwrapping_if_while.swift @@ -1,22 +1,22 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_IF_1 | FileCheck %s -check-prefix=UNWRAPPED_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_IF_2 | FileCheck %s -check-prefix=UNWRAPPED_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_IF_3 | FileCheck %s -check-prefix=UNWRAPPED_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_IF_4 | FileCheck %s -check-prefix=UNWRAPPED_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_IF_1 | %FileCheck %s -check-prefix=UNWRAPPED_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_IF_2 | %FileCheck %s -check-prefix=UNWRAPPED_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_IF_3 | %FileCheck %s -check-prefix=UNWRAPPED_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_IF_4 | %FileCheck %s -check-prefix=UNWRAPPED_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_WHILE_1 | FileCheck %s -check-prefix=UNWRAPPED_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_WHILE_2 | FileCheck %s -check-prefix=UNWRAPPED_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_WHILE_3 | FileCheck %s -check-prefix=UNWRAPPED_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_WHILE_4 | FileCheck %s -check-prefix=UNWRAPPED_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_WHILE_1 | %FileCheck %s -check-prefix=UNWRAPPED_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_WHILE_2 | %FileCheck %s -check-prefix=UNWRAPPED_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_WHILE_3 | %FileCheck %s -check-prefix=UNWRAPPED_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_WHILE_4 | %FileCheck %s -check-prefix=UNWRAPPED_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNCTION_IF_1 | FileCheck %s -check-prefix=UNWRAPPED_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNCTION_IF_2 | FileCheck %s -check-prefix=UNWRAPPED_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNCTION_IF_3 | FileCheck %s -check-prefix=UNWRAPPED_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNCTION_IF_4 | FileCheck %s -check-prefix=UNWRAPPED_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNCTION_IF_1 | %FileCheck %s -check-prefix=UNWRAPPED_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNCTION_IF_2 | %FileCheck %s -check-prefix=UNWRAPPED_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNCTION_IF_3 | %FileCheck %s -check-prefix=UNWRAPPED_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNCTION_IF_4 | %FileCheck %s -check-prefix=UNWRAPPED_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNCTION_WHILE_1 | FileCheck %s -check-prefix=UNWRAPPED_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNCTION_WHILE_2 | FileCheck %s -check-prefix=UNWRAPPED_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNCTION_WHILE_3 | FileCheck %s -check-prefix=UNWRAPPED_INT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNCTION_WHILE_4 | FileCheck %s -check-prefix=UNWRAPPED_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNCTION_WHILE_1 | %FileCheck %s -check-prefix=UNWRAPPED_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNCTION_WHILE_2 | %FileCheck %s -check-prefix=UNWRAPPED_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNCTION_WHILE_3 | %FileCheck %s -check-prefix=UNWRAPPED_INT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_FUNCTION_WHILE_4 | %FileCheck %s -check-prefix=UNWRAPPED_INT // UNWRAPPED_INT: Begin completions // UNWRAPPED_INT-DAG: Decl[LocalVar]/Local: unwrapped[#Int#]{{; name=.+$}} diff --git a/test/IDE/complete_value_expr.swift b/test/IDE/complete_value_expr.swift index c7ad1f8778b11..602603c026733 100644 --- a/test/IDE/complete_value_expr.swift +++ b/test/IDE/complete_value_expr.swift @@ -1,166 +1,166 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_OBJECT_DOT_1 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_OBJECT_DOT_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_OBJECT_DOT_3 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_OBJECT_DOT_4 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_OBJECT_DOT_5 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_OBJECT_NO_DOT_1 | FileCheck %s -check-prefix=FOO_OBJECT_NO_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_OBJECT_NO_DOT_2 | FileCheck %s -check-prefix=FOO_OBJECT_NO_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_STRUCT_DOT_1 | FileCheck %s -check-prefix=FOO_STRUCT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_STRUCT_NO_DOT_1 | FileCheck %s -check-prefix=FOO_STRUCT_NO_DOT - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICITLY_CURRIED_FUNC_0 | FileCheck %s -check-prefix=IMPLICITLY_CURRIED_FUNC_0 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICITLY_CURRIED_FUNC_1 | FileCheck %s -check-prefix=IMPLICITLY_CURRIED_FUNC_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICITLY_CURRIED_FUNC_2 | FileCheck %s -check-prefix=IMPLICITLY_CURRIED_FUNC_2 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICITLY_CURRIED_VARARG_FUNC_0 | FileCheck %s -check-prefix=IMPLICITLY_CURRIED_VARARG_FUNC_0 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICITLY_CURRIED_VARARG_FUNC_1 | FileCheck %s -check-prefix=IMPLICITLY_CURRIED_VARARG_FUNC_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICITLY_CURRIED_VARARG_FUNC_2 | FileCheck %s -check-prefix=IMPLICITLY_CURRIED_VARARG_FUNC_2 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICITLY_CURRIED_OVERLOADED_FUNC_1 | FileCheck %s -check-prefix=IMPLICITLY_CURRIED_OVERLOADED_FUNC_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICITLY_CURRIED_OVERLOADED_FUNC_2 | FileCheck %s -check-prefix=IMPLICITLY_CURRIED_OVERLOADED_FUNC_2 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_SWITCH_CASE_1 | FileCheck %s -check-prefix=IN_SWITCH_CASE -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_SWITCH_CASE_2 | FileCheck %s -check-prefix=IN_SWITCH_CASE -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_SWITCH_CASE_3 | FileCheck %s -check-prefix=IN_SWITCH_CASE -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_SWITCH_CASE_4 | FileCheck %s -check-prefix=IN_SWITCH_CASE - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=VF1 | FileCheck %s -check-prefix=VF1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=VF2 | FileCheck %s -check-prefix=VF2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BASE_MEMBERS | FileCheck %s -check-prefix=BASE_MEMBERS -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BASE_MEMBERS_STATIC | FileCheck %s -check-prefix=BASE_MEMBERS_STATIC - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTO_MEMBERS_NO_DOT_1 | FileCheck %s -check-prefix=PROTO_MEMBERS_NO_DOT_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTO_MEMBERS_NO_DOT_2 | FileCheck %s -check-prefix=PROTO_MEMBERS_NO_DOT_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTO_MEMBERS_NO_DOT_3 | FileCheck %s -check-prefix=PROTO_MEMBERS_NO_DOT_3 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTO_MEMBERS_1 | FileCheck %s -check-prefix=PROTO_MEMBERS_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTO_MEMBERS_2 | FileCheck %s -check-prefix=PROTO_MEMBERS_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTO_MEMBERS_3 | FileCheck %s -check-prefix=PROTO_MEMBERS_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTO_MEMBERS_4 | FileCheck %s -check-prefix=PROTO_MEMBERS_4 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_0 | FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_0 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_1 | FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_2 | FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_3 | FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_4 | FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_5 | FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_5 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_6 | FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_6 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_7 | FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_7 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_8 | FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_8 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_9 | FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_9 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_10 | FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_10 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_11 | FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_11 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_12 | FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_12 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_VARARG_FUNCTION_CALL_1 | FileCheck %s -check-prefix=INSIDE_VARARG_FUNCTION_CALL_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_VARARG_FUNCTION_CALL_2 | FileCheck %s -check-prefix=INSIDE_VARARG_FUNCTION_CALL_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_VARARG_FUNCTION_CALL_3 | FileCheck %s -check-prefix=INSIDE_VARARG_FUNCTION_CALL_3 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_OVERLOADED_FUNCTION_CALL_1 | FileCheck %s -check-prefix=INSIDE_OVERLOADED_FUNCTION_CALL_1 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_ON_CLASS_INSTANCE_1 | FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_ON_CLASS_INSTANCE_1 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_FUNC_PARAM_1 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_FUNC_PARAM_2 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_FUNC_PARAM_3 | FileCheck %s -check-prefix=RESOLVE_FUNC_PARAM_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_FUNC_PARAM_4 | FileCheck %s -check-prefix=RESOLVE_FUNC_PARAM_4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_FUNC_PARAM_5 | FileCheck %s -check-prefix=RESOLVE_FUNC_PARAM_5 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_FUNC_PARAM_6 | FileCheck %s -check-prefix=RESOLVE_FUNC_PARAM_6 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_CONSTRUCTOR_PARAM_1 | FileCheck %s -check-prefix=FOO_OBJECT_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_CONSTRUCTOR_PARAM_2 | FileCheck %s -check-prefix=RESOLVE_CONSTRUCTOR_PARAM_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_CONSTRUCTOR_PARAM_3 | FileCheck %s -check-prefix=RESOLVE_CONSTRUCTOR_PARAM_3 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FUNC_PAREN_PATTERN_1 | FileCheck %s -check-prefix=FUNC_PAREN_PATTERN_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FUNC_PAREN_PATTERN_2 | FileCheck %s -check-prefix=FUNC_PAREN_PATTERN_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FUNC_PAREN_PATTERN_3 | FileCheck %s -check-prefix=FUNC_PAREN_PATTERN_3 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CHAINED_CALLS_1 | FileCheck %s -check-prefix=CHAINED_CALLS_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CHAINED_CALLS_2 | FileCheck %s -check-prefix=CHAINED_CALLS_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_OBJECT_DOT_1 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_OBJECT_DOT_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_OBJECT_DOT_3 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_OBJECT_DOT_4 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_OBJECT_DOT_5 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_OBJECT_NO_DOT_1 | %FileCheck %s -check-prefix=FOO_OBJECT_NO_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_OBJECT_NO_DOT_2 | %FileCheck %s -check-prefix=FOO_OBJECT_NO_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_STRUCT_DOT_1 | %FileCheck %s -check-prefix=FOO_STRUCT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FOO_STRUCT_NO_DOT_1 | %FileCheck %s -check-prefix=FOO_STRUCT_NO_DOT + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICITLY_CURRIED_FUNC_0 | %FileCheck %s -check-prefix=IMPLICITLY_CURRIED_FUNC_0 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICITLY_CURRIED_FUNC_1 | %FileCheck %s -check-prefix=IMPLICITLY_CURRIED_FUNC_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICITLY_CURRIED_FUNC_2 | %FileCheck %s -check-prefix=IMPLICITLY_CURRIED_FUNC_2 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICITLY_CURRIED_VARARG_FUNC_0 | %FileCheck %s -check-prefix=IMPLICITLY_CURRIED_VARARG_FUNC_0 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICITLY_CURRIED_VARARG_FUNC_1 | %FileCheck %s -check-prefix=IMPLICITLY_CURRIED_VARARG_FUNC_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICITLY_CURRIED_VARARG_FUNC_2 | %FileCheck %s -check-prefix=IMPLICITLY_CURRIED_VARARG_FUNC_2 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICITLY_CURRIED_OVERLOADED_FUNC_1 | %FileCheck %s -check-prefix=IMPLICITLY_CURRIED_OVERLOADED_FUNC_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICITLY_CURRIED_OVERLOADED_FUNC_2 | %FileCheck %s -check-prefix=IMPLICITLY_CURRIED_OVERLOADED_FUNC_2 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_SWITCH_CASE_1 | %FileCheck %s -check-prefix=IN_SWITCH_CASE +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_SWITCH_CASE_2 | %FileCheck %s -check-prefix=IN_SWITCH_CASE +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_SWITCH_CASE_3 | %FileCheck %s -check-prefix=IN_SWITCH_CASE +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_SWITCH_CASE_4 | %FileCheck %s -check-prefix=IN_SWITCH_CASE + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=VF1 | %FileCheck %s -check-prefix=VF1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=VF2 | %FileCheck %s -check-prefix=VF2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BASE_MEMBERS | %FileCheck %s -check-prefix=BASE_MEMBERS +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=BASE_MEMBERS_STATIC | %FileCheck %s -check-prefix=BASE_MEMBERS_STATIC + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTO_MEMBERS_NO_DOT_1 | %FileCheck %s -check-prefix=PROTO_MEMBERS_NO_DOT_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTO_MEMBERS_NO_DOT_2 | %FileCheck %s -check-prefix=PROTO_MEMBERS_NO_DOT_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTO_MEMBERS_NO_DOT_3 | %FileCheck %s -check-prefix=PROTO_MEMBERS_NO_DOT_3 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTO_MEMBERS_1 | %FileCheck %s -check-prefix=PROTO_MEMBERS_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTO_MEMBERS_2 | %FileCheck %s -check-prefix=PROTO_MEMBERS_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTO_MEMBERS_3 | %FileCheck %s -check-prefix=PROTO_MEMBERS_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTO_MEMBERS_4 | %FileCheck %s -check-prefix=PROTO_MEMBERS_4 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_0 | %FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_0 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_1 | %FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_2 | %FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_3 | %FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_4 | %FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_5 | %FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_5 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_6 | %FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_6 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_7 | %FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_7 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_8 | %FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_8 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_9 | %FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_9 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_10 | %FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_10 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_11 | %FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_11 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_12 | %FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_12 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_VARARG_FUNCTION_CALL_1 | %FileCheck %s -check-prefix=INSIDE_VARARG_FUNCTION_CALL_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_VARARG_FUNCTION_CALL_2 | %FileCheck %s -check-prefix=INSIDE_VARARG_FUNCTION_CALL_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_VARARG_FUNCTION_CALL_3 | %FileCheck %s -check-prefix=INSIDE_VARARG_FUNCTION_CALL_3 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_OVERLOADED_FUNCTION_CALL_1 | %FileCheck %s -check-prefix=INSIDE_OVERLOADED_FUNCTION_CALL_1 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_FUNCTION_CALL_ON_CLASS_INSTANCE_1 | %FileCheck %s -check-prefix=INSIDE_FUNCTION_CALL_ON_CLASS_INSTANCE_1 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_FUNC_PARAM_1 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_FUNC_PARAM_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_FUNC_PARAM_3 | %FileCheck %s -check-prefix=RESOLVE_FUNC_PARAM_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_FUNC_PARAM_4 | %FileCheck %s -check-prefix=RESOLVE_FUNC_PARAM_4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_FUNC_PARAM_5 | %FileCheck %s -check-prefix=RESOLVE_FUNC_PARAM_5 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_FUNC_PARAM_6 | %FileCheck %s -check-prefix=RESOLVE_FUNC_PARAM_6 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_CONSTRUCTOR_PARAM_1 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_CONSTRUCTOR_PARAM_2 | %FileCheck %s -check-prefix=RESOLVE_CONSTRUCTOR_PARAM_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_CONSTRUCTOR_PARAM_3 | %FileCheck %s -check-prefix=RESOLVE_CONSTRUCTOR_PARAM_3 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FUNC_PAREN_PATTERN_1 | %FileCheck %s -check-prefix=FUNC_PAREN_PATTERN_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FUNC_PAREN_PATTERN_2 | %FileCheck %s -check-prefix=FUNC_PAREN_PATTERN_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FUNC_PAREN_PATTERN_3 | %FileCheck %s -check-prefix=FUNC_PAREN_PATTERN_3 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CHAINED_CALLS_1 | %FileCheck %s -check-prefix=CHAINED_CALLS_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CHAINED_CALLS_2 | %FileCheck %s -check-prefix=CHAINED_CALLS_2 // Disabled because we aren't handling failures well. -// FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CHAINED_CALLS_3 | FileCheck %s -check-prefix=CHAINED_CALLS_3 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_1 | FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_2 | FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_3 | FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_4 | FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_5 | FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_5 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_ERROR_1 | FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_ERROR_1 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_1_STATIC | FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_1_STATIC -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_2_STATIC | FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_2_STATIC -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_3_STATIC | FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_3_STATIC -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_4_STATIC | FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_4_STATIC -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_5_STATIC | FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_5_STATIC - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_UNSOLVED_VARIABLES_1 | FileCheck %s -check-prefix=TC_UNSOLVED_VARIABLES_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_UNSOLVED_VARIABLES_2 | FileCheck %s -check-prefix=TC_UNSOLVED_VARIABLES_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_UNSOLVED_VARIABLES_3 | FileCheck %s -check-prefix=TC_UNSOLVED_VARIABLES_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_UNSOLVED_VARIABLES_4 | FileCheck %s -check-prefix=TC_UNSOLVED_VARIABLES_4 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_MODULES_1 | FileCheck %s -check-prefix=RESOLVE_MODULES_1 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INTERPOLATED_STRING_1 | FileCheck %s -check-prefix=FOO_OBJECT_DOT1 - -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_P1 | FileCheck %s -check-prefix=PROTOCOL_EXT_P1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_P2 | FileCheck %s -check-prefix=PROTOCOL_EXT_P2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_P3 | FileCheck %s -check-prefix=PROTOCOL_EXT_P3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_WILLCONFORMP1 | FileCheck %s -check-prefix=PROTOCOL_EXT_WILLCONFORMP1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_DIDCONFORMP2 | FileCheck %s -check-prefix=PROTOCOL_EXT_DIDCONFORMP2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_DIDCONFORMP3 | FileCheck %s -check-prefix=PROTOCOL_EXT_DIDCONFORMP3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_GENERICP1 | FileCheck %s -check-prefix=PROTOCOL_EXT_GENERICP1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_GENERICP2 | FileCheck %s -check-prefix=PROTOCOL_EXT_GENERICP2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_GENERICP3 | FileCheck %s -check-prefix=PROTOCOL_EXT_GENERICP3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_P4 | FileCheck %s -check-prefix=PROTOCOL_EXT_P4 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_CONCRETE1 | FileCheck %s -check-prefix=PROTOCOL_EXT_P4_P1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_CONCRETE2 | FileCheck %s -check-prefix=PROTOCOL_EXT_P4_P1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_CONSTRAINED_GENERIC_1 | FileCheck %s -check-prefix=PROTOCOL_EXT_P4_P1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_CONSTRAINED_GENERIC_2 | FileCheck %s -check-prefix=PROTOCOL_EXT_P4_P1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_INSIDE_CONCRETE1_1 | FileCheck %s -check-prefix=PROTOCOL_EXT_P4_P1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_INSIDE_CONCRETE1_2 | FileCheck %s -check-prefix=PROTOCOL_EXT_P4_P1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_CONCRETE3 | FileCheck %s -check-prefix=PROTOCOL_EXT_P4_ONLYME -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_CONCRETE3_SUB | FileCheck %s -check-prefix=PROTOCOL_EXT_P4_ONLYME_SUB -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_CONCRETE4 | FileCheck %s -check-prefix=PROTOCOL_EXT_P4_ONLYME -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_CONSTRAINED_GENERIC_3 | FileCheck %s -check-prefix=PROTOCOL_EXT_P4_ONLYME -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_CONSTRAINED_GENERIC_3_SUB | FileCheck %s -check-prefix=PROTOCOL_EXT_P4_ONLYME_SUB -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_INSIDE_CONCRETE2_1 | FileCheck %s -check-prefix=PROTOCOL_EXT_P4_ONLYME -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_INSIDE_CONCRETE2_2 | FileCheck %s -check-prefix=PROTOCOL_EXT_P4_ONLYME -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_TA_1 | FileCheck %s -check-prefix=PROTOCOL_EXT_TA -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_TA_2 | FileCheck %s -check-prefix=PROTOCOL_EXT_TA -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_INIT_1 | FileCheck %s -check-prefix=PROTOCOL_EXT_INIT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_INIT_2 | FileCheck %s -check-prefix=PROTOCOL_EXT_INIT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_P4_DOT_1 | FileCheck %s -check-prefix=PROTOCOL_EXT_P4_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_P4_DOT_2 | FileCheck %s -check-prefix=PROTOCOL_EXT_P4_DOT -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_P4_T_DOT_1 | FileCheck %s -check-prefix=PROTOCOL_EXT_P4_T_DOT_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_UNUSABLE_EXISTENTIAL | FileCheck %s -check-prefix=PROTOCOL_EXT_UNUSABLE_EXISTENTIAL -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_DEDUP_1 | FileCheck %s -check-prefix=PROTOCOL_EXT_DEDUP_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_DEDUP_2 | FileCheck %s -check-prefix=PROTOCOL_EXT_DEDUP_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_DEDUP_3 | FileCheck %s -check-prefix=PROTOCOL_EXT_DEDUP_3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=THROWS1 | FileCheck %s -check-prefix=THROWS1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=THROWS2 | FileCheck %s -check-prefix=THROWS2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_THROWS1 | FileCheck %s -check-prefix=MEMBER_THROWS1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_THROWS2 | FileCheck %s -check-prefix=MEMBER_THROWS2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_THROWS3 | FileCheck %s -check-prefix=MEMBER_THROWS3 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_THROWS1 | FileCheck %s -check-prefix=INIT_THROWS1 +// FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CHAINED_CALLS_3 | %FileCheck %s -check-prefix=CHAINED_CALLS_3 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_1 | %FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_2 | %FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_3 | %FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_4 | %FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_5 | %FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_5 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_ERROR_1 | %FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_ERROR_1 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_1_STATIC | %FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_1_STATIC +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_2_STATIC | %FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_2_STATIC +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_3_STATIC | %FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_3_STATIC +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_4_STATIC | %FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_4_STATIC +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_GENERIC_PARAMS_5_STATIC | %FileCheck %s -check-prefix=RESOLVE_GENERIC_PARAMS_5_STATIC + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_UNSOLVED_VARIABLES_1 | %FileCheck %s -check-prefix=TC_UNSOLVED_VARIABLES_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_UNSOLVED_VARIABLES_2 | %FileCheck %s -check-prefix=TC_UNSOLVED_VARIABLES_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_UNSOLVED_VARIABLES_3 | %FileCheck %s -check-prefix=TC_UNSOLVED_VARIABLES_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TC_UNSOLVED_VARIABLES_4 | %FileCheck %s -check-prefix=TC_UNSOLVED_VARIABLES_4 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RESOLVE_MODULES_1 | %FileCheck %s -check-prefix=RESOLVE_MODULES_1 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INTERPOLATED_STRING_1 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT1 + +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_P1 | %FileCheck %s -check-prefix=PROTOCOL_EXT_P1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_P2 | %FileCheck %s -check-prefix=PROTOCOL_EXT_P2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_P3 | %FileCheck %s -check-prefix=PROTOCOL_EXT_P3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_WILLCONFORMP1 | %FileCheck %s -check-prefix=PROTOCOL_EXT_WILLCONFORMP1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_DIDCONFORMP2 | %FileCheck %s -check-prefix=PROTOCOL_EXT_DIDCONFORMP2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_DIDCONFORMP3 | %FileCheck %s -check-prefix=PROTOCOL_EXT_DIDCONFORMP3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_GENERICP1 | %FileCheck %s -check-prefix=PROTOCOL_EXT_GENERICP1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_GENERICP2 | %FileCheck %s -check-prefix=PROTOCOL_EXT_GENERICP2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_GENERICP3 | %FileCheck %s -check-prefix=PROTOCOL_EXT_GENERICP3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_P4 | %FileCheck %s -check-prefix=PROTOCOL_EXT_P4 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_CONCRETE1 | %FileCheck %s -check-prefix=PROTOCOL_EXT_P4_P1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_CONCRETE2 | %FileCheck %s -check-prefix=PROTOCOL_EXT_P4_P1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_CONSTRAINED_GENERIC_1 | %FileCheck %s -check-prefix=PROTOCOL_EXT_P4_P1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_CONSTRAINED_GENERIC_2 | %FileCheck %s -check-prefix=PROTOCOL_EXT_P4_P1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_INSIDE_CONCRETE1_1 | %FileCheck %s -check-prefix=PROTOCOL_EXT_P4_P1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_INSIDE_CONCRETE1_2 | %FileCheck %s -check-prefix=PROTOCOL_EXT_P4_P1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_CONCRETE3 | %FileCheck %s -check-prefix=PROTOCOL_EXT_P4_ONLYME +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_CONCRETE3_SUB | %FileCheck %s -check-prefix=PROTOCOL_EXT_P4_ONLYME_SUB +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_CONCRETE4 | %FileCheck %s -check-prefix=PROTOCOL_EXT_P4_ONLYME +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_CONSTRAINED_GENERIC_3 | %FileCheck %s -check-prefix=PROTOCOL_EXT_P4_ONLYME +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_CONSTRAINED_GENERIC_3_SUB | %FileCheck %s -check-prefix=PROTOCOL_EXT_P4_ONLYME_SUB +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_INSIDE_CONCRETE2_1 | %FileCheck %s -check-prefix=PROTOCOL_EXT_P4_ONLYME +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_INSIDE_CONCRETE2_2 | %FileCheck %s -check-prefix=PROTOCOL_EXT_P4_ONLYME +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_TA_1 | %FileCheck %s -check-prefix=PROTOCOL_EXT_TA +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_TA_2 | %FileCheck %s -check-prefix=PROTOCOL_EXT_TA +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_INIT_1 | %FileCheck %s -check-prefix=PROTOCOL_EXT_INIT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_INIT_2 | %FileCheck %s -check-prefix=PROTOCOL_EXT_INIT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_P4_DOT_1 | %FileCheck %s -check-prefix=PROTOCOL_EXT_P4_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_P4_DOT_2 | %FileCheck %s -check-prefix=PROTOCOL_EXT_P4_DOT +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_P4_T_DOT_1 | %FileCheck %s -check-prefix=PROTOCOL_EXT_P4_T_DOT_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_UNUSABLE_EXISTENTIAL | %FileCheck %s -check-prefix=PROTOCOL_EXT_UNUSABLE_EXISTENTIAL +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_DEDUP_1 | %FileCheck %s -check-prefix=PROTOCOL_EXT_DEDUP_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_DEDUP_2 | %FileCheck %s -check-prefix=PROTOCOL_EXT_DEDUP_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_DEDUP_3 | %FileCheck %s -check-prefix=PROTOCOL_EXT_DEDUP_3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=THROWS1 | %FileCheck %s -check-prefix=THROWS1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=THROWS2 | %FileCheck %s -check-prefix=THROWS2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_THROWS1 | %FileCheck %s -check-prefix=MEMBER_THROWS1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_THROWS2 | %FileCheck %s -check-prefix=MEMBER_THROWS2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_THROWS3 | %FileCheck %s -check-prefix=MEMBER_THROWS3 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_THROWS1 | %FileCheck %s -check-prefix=INIT_THROWS1 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AUTOCLOSURE1 > %t.autoclosure1 -// RUN: FileCheck %s -check-prefix=AUTOCLOSURE_STRING < %t.autoclosure1 +// RUN: %FileCheck %s -check-prefix=AUTOCLOSURE_STRING < %t.autoclosure1 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AUTOCLOSURE2 > %t.autoclosure2 -// RUN: FileCheck %s -check-prefix=AUTOCLOSURE_STRING < %t.autoclosure2 +// RUN: %FileCheck %s -check-prefix=AUTOCLOSURE_STRING < %t.autoclosure2 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AUTOCLOSURE3 > %t.autoclosure3 -// RUN: FileCheck %s -check-prefix=AUTOCLOSURE_STRING < %t.autoclosure3 +// RUN: %FileCheck %s -check-prefix=AUTOCLOSURE_STRING < %t.autoclosure3 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AUTOCLOSURE4 > %t.autoclosure4 -// RUN: FileCheck %s -check-prefix=AUTOCLOSURE_STRING < %t.autoclosure4 +// RUN: %FileCheck %s -check-prefix=AUTOCLOSURE_STRING < %t.autoclosure4 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AUTOCLOSURE5 > %t.autoclosure5 -// RUN: FileCheck %s -check-prefix=AUTOCLOSURE_STRING < %t.autoclosure5 +// RUN: %FileCheck %s -check-prefix=AUTOCLOSURE_STRING < %t.autoclosure5 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_TYPEALIAS_1 | FileCheck %s -check-prefix=GENERIC_TYPEALIAS_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_TYPEALIAS_2 | FileCheck %s -check-prefix=GENERIC_TYPEALIAS_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_TYPEALIAS_1 | %FileCheck %s -check-prefix=GENERIC_TYPEALIAS_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_TYPEALIAS_2 | %FileCheck %s -check-prefix=GENERIC_TYPEALIAS_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEPRECATED_1 | FileCheck %s -check-prefix=DEPRECATED_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DOT_EXPR_NON_NOMINAL_1 | FileCheck %s -check-prefix=DOT_EXPR_NON_NOMINAL_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DOT_EXPR_NON_NOMINAL_2 | FileCheck %s -check-prefix=DOT_EXPR_NON_NOMINAL_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEPRECATED_1 | %FileCheck %s -check-prefix=DEPRECATED_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DOT_EXPR_NON_NOMINAL_1 | %FileCheck %s -check-prefix=DOT_EXPR_NON_NOMINAL_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DOT_EXPR_NON_NOMINAL_2 | %FileCheck %s -check-prefix=DOT_EXPR_NON_NOMINAL_2 // Test code completion of expressions that produce a value. diff --git a/test/IDE/complete_value_literals.swift b/test/IDE/complete_value_literals.swift index 44c41a15d3d31..4397299a73f20 100644 --- a/test/IDE/complete_value_literals.swift +++ b/test/IDE/complete_value_literals.swift @@ -1,33 +1,33 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=NO_CONTEXT_0 | FileCheck %s -check-prefix=NO_CONTEXT_0 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=NIL_0 | FileCheck %s -check-prefix=NIL_0 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=NIL_1 | FileCheck %s -check-prefix=NIL_1 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=NIL_2 | FileCheck %s -check-prefix=NIL_2 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=BOOL_0 | FileCheck %s -check-prefix=BOOL_0 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=BOOL_1 | FileCheck %s -check-prefix=BOOL_1 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=BOOL_2 | FileCheck %s -check-prefix=BOOL_2 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=BOOL_3 | FileCheck %s -check-prefix=BOOL_3 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=BOOL_4 | FileCheck %s -check-prefix=BOOL_4 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INT_0 | FileCheck %s -check-prefix=INT_0 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INT_1 | FileCheck %s -check-prefix=INT_1 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INT_2 | FileCheck %s -check-prefix=INT_2 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=DOUBLE_0 | FileCheck %s -check-prefix=DOUBLE_0 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=STRING_0 | FileCheck %s -check-prefix=STRING_0 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=STRING_1 | FileCheck %s -check-prefix=STRING_1 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=STRING_2 | FileCheck %s -check-prefix=STRING_2 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=ARRAY_0 | FileCheck %s -check-prefix=ARRAY_0 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=ARRAY_1 | FileCheck %s -check-prefix=ARRAY_1 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=ARRAY_2 | FileCheck %s -check-prefix=ARRAY_2 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=DICT_0 | FileCheck %s -check-prefix=DICT_0 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=DICT_1 | FileCheck %s -check-prefix=DICT_1 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=DICT_2 | FileCheck %s -check-prefix=DICT_2 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=TUPLE_0 | FileCheck %s -check-prefix=TUPLE_0 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=TUPLE_1 | FileCheck %s -check-prefix=TUPLE_1 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=TUPLE_2 | FileCheck %s -check-prefix=TUPLE_2 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=COLOR_0 | FileCheck %s -check-prefix=COLOR_0 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=COLOR_1 | FileCheck %s -check-prefix=COLOR_1 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=COLOR_2 | FileCheck %s -check-prefix=COLOR_2 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=IMAGE_0 | FileCheck %s -check-prefix=IMAGE_0 -// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=IMAGE_1 | FileCheck %s -check-prefix=IMAGE_1 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=NO_CONTEXT_0 | %FileCheck %s -check-prefix=NO_CONTEXT_0 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=NIL_0 | %FileCheck %s -check-prefix=NIL_0 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=NIL_1 | %FileCheck %s -check-prefix=NIL_1 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=NIL_2 | %FileCheck %s -check-prefix=NIL_2 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=BOOL_0 | %FileCheck %s -check-prefix=BOOL_0 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=BOOL_1 | %FileCheck %s -check-prefix=BOOL_1 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=BOOL_2 | %FileCheck %s -check-prefix=BOOL_2 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=BOOL_3 | %FileCheck %s -check-prefix=BOOL_3 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=BOOL_4 | %FileCheck %s -check-prefix=BOOL_4 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INT_0 | %FileCheck %s -check-prefix=INT_0 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INT_1 | %FileCheck %s -check-prefix=INT_1 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=INT_2 | %FileCheck %s -check-prefix=INT_2 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=DOUBLE_0 | %FileCheck %s -check-prefix=DOUBLE_0 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=STRING_0 | %FileCheck %s -check-prefix=STRING_0 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=STRING_1 | %FileCheck %s -check-prefix=STRING_1 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=STRING_2 | %FileCheck %s -check-prefix=STRING_2 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=ARRAY_0 | %FileCheck %s -check-prefix=ARRAY_0 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=ARRAY_1 | %FileCheck %s -check-prefix=ARRAY_1 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=ARRAY_2 | %FileCheck %s -check-prefix=ARRAY_2 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=DICT_0 | %FileCheck %s -check-prefix=DICT_0 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=DICT_1 | %FileCheck %s -check-prefix=DICT_1 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=DICT_2 | %FileCheck %s -check-prefix=DICT_2 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=TUPLE_0 | %FileCheck %s -check-prefix=TUPLE_0 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=TUPLE_1 | %FileCheck %s -check-prefix=TUPLE_1 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=TUPLE_2 | %FileCheck %s -check-prefix=TUPLE_2 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=COLOR_0 | %FileCheck %s -check-prefix=COLOR_0 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=COLOR_1 | %FileCheck %s -check-prefix=COLOR_1 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=COLOR_2 | %FileCheck %s -check-prefix=COLOR_2 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=IMAGE_0 | %FileCheck %s -check-prefix=IMAGE_0 +// RUN: %target-swift-ide-test -code-completion -source-filename=%s -code-completion-token=IMAGE_1 | %FileCheck %s -check-prefix=IMAGE_1 func testAll0() { // Not type context. diff --git a/test/IDE/complete_vararg.swift b/test/IDE/complete_vararg.swift index c8e7f767d59d1..c46ee6fdbfd46 100644 --- a/test/IDE/complete_vararg.swift +++ b/test/IDE/complete_vararg.swift @@ -1,13 +1,13 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_1 | FileCheck %s -check-prefix=TOP_LEVEL_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OBJ_DOT_1 | FileCheck %s -check-prefix=OBJ_DOT_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FREE_FUNC_1 | FileCheck %s -check-prefix=FREE_FUNC_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FREE_FUNC_2 | FileCheck %s -check-prefix=FREE_FUNC_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_1 | FileCheck %s -check-prefix=INIT_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=METHOD_1 | FileCheck %s -check-prefix=METHOD_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=METHOD_2 | FileCheck %s -check-prefix=METHOD_2 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SUBSCRIPT_1 | FileCheck %s -check-prefix=SUBSCRIPT_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_FREE_FUNC_1 | FileCheck %s -check-prefix=GENERIC_FREE_FUNC_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INTERESTING_TYPE_1 | FileCheck %s -check-prefix=INTERESTING_TYPE_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_1 | %FileCheck %s -check-prefix=TOP_LEVEL_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OBJ_DOT_1 | %FileCheck %s -check-prefix=OBJ_DOT_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FREE_FUNC_1 | %FileCheck %s -check-prefix=FREE_FUNC_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=FREE_FUNC_2 | %FileCheck %s -check-prefix=FREE_FUNC_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_1 | %FileCheck %s -check-prefix=INIT_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=METHOD_1 | %FileCheck %s -check-prefix=METHOD_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=METHOD_2 | %FileCheck %s -check-prefix=METHOD_2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SUBSCRIPT_1 | %FileCheck %s -check-prefix=SUBSCRIPT_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_FREE_FUNC_1 | %FileCheck %s -check-prefix=GENERIC_FREE_FUNC_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INTERESTING_TYPE_1 | %FileCheck %s -check-prefix=INTERESTING_TYPE_1 func freeFunc1(x x: Int...) { } func freeFunc2(x x: Int, y y: Int...) { } diff --git a/test/IDE/complete_weak.swift b/test/IDE/complete_weak.swift index e6d4ea0d29f7f..735e9dd549a67 100644 --- a/test/IDE/complete_weak.swift +++ b/test/IDE/complete_weak.swift @@ -1,8 +1,8 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=WEAK_VARS_1 | FileCheck %s -check-prefix=WEAK_VARS_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=WEAK_NO_DOT_1 | FileCheck %s -check-prefix=WEAK_NO_DOT_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=WEAK_DOT_1 | FileCheck %s -check-prefix=WEAK_DOT_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNOWNED_NO_DOT_1 | FileCheck %s -check-prefix=UNOWNED_NO_DOT_1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNOWNED_DOT_1 | FileCheck %s -check-prefix=UNOWNED_DOT_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=WEAK_VARS_1 | %FileCheck %s -check-prefix=WEAK_VARS_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=WEAK_NO_DOT_1 | %FileCheck %s -check-prefix=WEAK_NO_DOT_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=WEAK_DOT_1 | %FileCheck %s -check-prefix=WEAK_DOT_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNOWNED_NO_DOT_1 | %FileCheck %s -check-prefix=UNOWNED_NO_DOT_1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNOWNED_DOT_1 | %FileCheck %s -check-prefix=UNOWNED_DOT_1 class CompleteWeak { func instanceFunc() {} diff --git a/test/IDE/complete_where_clause.swift b/test/IDE/complete_where_clause.swift index 67cd2a43498c7..f6d9abe877d07 100644 --- a/test/IDE/complete_where_clause.swift +++ b/test/IDE/complete_where_clause.swift @@ -1,8 +1,8 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GP1 | FileCheck %s -check-prefix=A1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GP2 | FileCheck %s -check-prefix=A1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GP3 | FileCheck %s -check-prefix=A1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GP4 | FileCheck %s -check-prefix=TYPE1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GP5 | FileCheck %s -check-prefix=TYPE1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GP1 | %FileCheck %s -check-prefix=A1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GP2 | %FileCheck %s -check-prefix=A1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GP3 | %FileCheck %s -check-prefix=A1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GP4 | %FileCheck %s -check-prefix=TYPE1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GP5 | %FileCheck %s -check-prefix=TYPE1 class A1 {} diff --git a/test/IDE/complete_with_closure_param.swift b/test/IDE/complete_with_closure_param.swift index 7799351e36c26..113d354f1fa31 100644 --- a/test/IDE/complete_with_closure_param.swift +++ b/test/IDE/complete_with_closure_param.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COMPLETE | FileCheck %s +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=COMPLETE | %FileCheck %s typealias FunctionTypealias = (Int, Int) -> Bool typealias OptionalFunctionTypealias = ((Int, Int) -> Bool)? diff --git a/test/IDE/complete_with_header_import.swift b/test/IDE/complete_with_header_import.swift index cbf46e62de783..41d908661825a 100644 --- a/test/IDE/complete_with_header_import.swift +++ b/test/IDE/complete_with_header_import.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP -import-objc-header %S/Inputs/header.h | FileCheck %s -check-prefix=CHECK-TOP -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE -import-objc-header %S/Inputs/header.h | FileCheck %s -check-prefix=CHECK-TYPE +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TOP -import-objc-header %S/Inputs/header.h | %FileCheck %s -check-prefix=CHECK-TOP +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE -import-objc-header %S/Inputs/header.h | %FileCheck %s -check-prefix=CHECK-TYPE // REQUIRES: objc_interop diff --git a/test/IDE/complete_with_multiple_imports.swift b/test/IDE/complete_with_multiple_imports.swift index 2f672a8ef047c..1d30f0b1f22c2 100644 --- a/test/IDE/complete_with_multiple_imports.swift +++ b/test/IDE/complete_with_multiple_imports.swift @@ -2,7 +2,7 @@ import Foo import FooHelper // This checks that we don't provide duplicate results because FooHelper is also imported through Foo. -// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=TOP_COMPLETIONS | FileCheck %s -check-prefix=CHECK-TOP +// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=TOP_COMPLETIONS | %FileCheck %s -check-prefix=CHECK-TOP func testClangModule() { #^TOP_COMPLETIONS^# diff --git a/test/IDE/dump_swift_lookup_tables.swift b/test/IDE/dump_swift_lookup_tables.swift index b194872a0bf55..5b882687a17bb 100644 --- a/test/IDE/dump_swift_lookup_tables.swift +++ b/test/IDE/dump_swift_lookup_tables.swift @@ -1,5 +1,5 @@ // RUN: %target-swift-ide-test -dump-importer-lookup-table -source-filename %s -import-objc-header %S/Inputs/swift_name.h -I %S/Inputs/custom-modules > %t.log 2>&1 -// RUN: FileCheck %s < %t.log +// RUN: %FileCheck %s < %t.log // REQUIRES: objc_interop import ImportAsMember diff --git a/test/IDE/dump_swift_lookup_tables_objc.swift b/test/IDE/dump_swift_lookup_tables_objc.swift index 5f833d5eed847..0428976a32264 100644 --- a/test/IDE/dump_swift_lookup_tables_objc.swift +++ b/test/IDE/dump_swift_lookup_tables_objc.swift @@ -1,5 +1,5 @@ // RUN: %target-swift-ide-test -dump-importer-lookup-table -source-filename %s -import-objc-header %S/Inputs/swift_name_objc.h > %t.log 2>&1 -// RUN: FileCheck %s < %t.log +// RUN: %FileCheck %s < %t.log // REQUIRES: objc_interop // REQUIRES: OS=macosx diff --git a/test/IDE/importProtocols.swift b/test/IDE/importProtocols.swift index 49d1d80543ee5..d5bcdcc621c78 100644 --- a/test/IDE/importProtocols.swift +++ b/test/IDE/importProtocols.swift @@ -1,5 +1,5 @@ // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -I %t -I %S/Inputs/custom-modules -print-module -module-to-print=ImportedProtocols.SubModule -source-filename %s > %t.printed.txt -// RUN: FileCheck %s < %t.printed.txt +// RUN: %FileCheck %s < %t.printed.txt // REQUIRES: objc_interop diff --git a/test/IDE/import_as_member.swift b/test/IDE/import_as_member.swift index 75478192d538d..a7bbad00d728a 100644 --- a/test/IDE/import_as_member.swift +++ b/test/IDE/import_as_member.swift @@ -1,8 +1,8 @@ // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -I %t -I %S/Inputs/custom-modules -print-module -source-filename %s -module-to-print=ImportAsMember.A -always-argument-labels > %t.printed.A.txt // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -I %t -I %S/Inputs/custom-modules -print-module -source-filename %s -module-to-print=ImportAsMember.B -always-argument-labels > %t.printed.B.txt -// RUN: FileCheck %s -check-prefix=PRINT -strict-whitespace < %t.printed.A.txt -// RUN: FileCheck %s -check-prefix=PRINTB -strict-whitespace < %t.printed.B.txt +// RUN: %FileCheck %s -check-prefix=PRINT -strict-whitespace < %t.printed.A.txt +// RUN: %FileCheck %s -check-prefix=PRINTB -strict-whitespace < %t.printed.B.txt // PRINT: struct Struct1 { // PRINT-NEXT: var x: Double diff --git a/test/IDE/import_as_member_cf.swift b/test/IDE/import_as_member_cf.swift index ba78f55cfd26e..e37bfc7ecdf09 100644 --- a/test/IDE/import_as_member_cf.swift +++ b/test/IDE/import_as_member_cf.swift @@ -2,7 +2,7 @@ // REQUIRES: objc_interop -// RUN: FileCheck %s -check-prefix=PRINTC -strict-whitespace < %t.printed.C.txt +// RUN: %FileCheck %s -check-prefix=PRINTC -strict-whitespace < %t.printed.C.txt // PRINTC: extension CCPowerSupply { // PRINTC-NEXT: /*not inherited*/ init(watts watts: Double) diff --git a/test/IDE/import_as_member_objc.swift b/test/IDE/import_as_member_objc.swift index b689ce50e4a16..c139674e6f73a 100644 --- a/test/IDE/import_as_member_objc.swift +++ b/test/IDE/import_as_member_objc.swift @@ -1,6 +1,6 @@ // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -I %t -I %S/Inputs/custom-modules -print-module -source-filename %s -module-to-print=ImportAsMember.Proto -always-argument-labels > %t.printed.Proto.txt -// RUN: FileCheck %s -check-prefix=PRINT-PROTO -strict-whitespace < %t.printed.Proto.txt +// RUN: %FileCheck %s -check-prefix=PRINT-PROTO -strict-whitespace < %t.printed.Proto.txt // PRINT-PROTO-LABEL: protocol ImportedProtocolBase : NSObjectProtocol { // PRINT-PROTO-NEXT: } @@ -17,7 +17,7 @@ // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -I %t -I %S/Inputs/custom-modules -print-module -source-filename %s -module-to-print=ImportAsMember.Class -always-argument-labels > %t.printed.Class.txt -// RUN: FileCheck %s -check-prefix=PRINT-CLASS -strict-whitespace < %t.printed.Class.txt +// RUN: %FileCheck %s -check-prefix=PRINT-CLASS -strict-whitespace < %t.printed.Class.txt // PRINT-CLASS-LABEL: class SomeClass : NSObject { // PRINT-CLASS-NEXT: init() diff --git a/test/IDE/infer_import_as_member.swift b/test/IDE/infer_import_as_member.swift index d5c21927ea727..f7ad10ae6b13f 100644 --- a/test/IDE/infer_import_as_member.swift +++ b/test/IDE/infer_import_as_member.swift @@ -1,6 +1,6 @@ // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -import-objc-header %S/Inputs/custom-modules/CollisionImportAsMember.h -I %t -I %S/Inputs/custom-modules -print-module -source-filename %s -module-to-print=InferImportAsMember -always-argument-labels -enable-infer-import-as-member > %t.printed.A.txt // RUN: %target-swift-frontend -parse -import-objc-header %S/Inputs/custom-modules/CollisionImportAsMember.h -I %t -I %S/Inputs/custom-modules %s -enable-infer-import-as-member -verify -// RUN: FileCheck %s -check-prefix=PRINT -strict-whitespace < %t.printed.A.txt +// RUN: %FileCheck %s -check-prefix=PRINT -strict-whitespace < %t.printed.A.txt // REQUIRES: objc_interop diff --git a/test/IDE/local_types.swift b/test/IDE/local_types.swift index 04e98762e68d5..62505f0a20c47 100644 --- a/test/IDE/local_types.swift +++ b/test/IDE/local_types.swift @@ -2,7 +2,7 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swiftc_driver -v -emit-module -module-name LocalTypes -o %t/LocalTypes.swiftmodule %s -// RUN: %target-swift-ide-test -print-local-types -I %t -module-to-print LocalTypes -source-filename %s | FileCheck %s +// RUN: %target-swift-ide-test -print-local-types -I %t -module-to-print LocalTypes -source-filename %s | %FileCheck %s public func singleFunc() { // CHECK-DAG: VF10LocalTypes10singleFuncFT_T_L_16SingleFuncStruct diff --git a/test/IDE/merge_local_types.swift b/test/IDE/merge_local_types.swift index 0c32971e5e1e7..8818faf4d1223 100644 --- a/test/IDE/merge_local_types.swift +++ b/test/IDE/merge_local_types.swift @@ -5,7 +5,7 @@ // Create separate modules and merge them together // RUN: %target-swiftc_driver -v -emit-module -module-name LocalTypesMerged -o %t/LocalTypesMerged.swiftmodule %s %S/local_types.swift -// RUN: %target-swift-ide-test -print-local-types -I %t -module-to-print LocalTypesMerged -source-filename %s | FileCheck %s +// RUN: %target-swift-ide-test -print-local-types -I %t -module-to-print LocalTypesMerged -source-filename %s | %FileCheck %s public func toMerge() { // CHECK-DAG: VF16LocalTypesMerged7toMergeFT_T_L_16SingleFuncStruct diff --git a/test/IDE/module_api_smoketest.swift b/test/IDE/module_api_smoketest.swift index 68a46591eb923..7282f32f00eb0 100644 --- a/test/IDE/module_api_smoketest.swift +++ b/test/IDE/module_api_smoketest.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t // RUN: mkdir -p %t -// RUN: %swift-ide-test -generate-module-api-description -- -target %target-triple -module-cache-path %t %s | FileCheck %s +// RUN: %swift-ide-test -generate-module-api-description -- -target %target-triple -module-cache-path %t %s | %FileCheck %s public struct Struct1 {} diff --git a/test/IDE/newtype.swift b/test/IDE/newtype.swift index 5fe379b6deffd..5803836b81612 100644 --- a/test/IDE/newtype.swift +++ b/test/IDE/newtype.swift @@ -2,7 +2,7 @@ // RUN: mkdir -p %t // RUN: %build-clang-importer-objc-overlays // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk-nosource) -I %t -I %S/Inputs/custom-modules -enable-swift-newtype -print-module -source-filename %s -module-to-print=Newtype > %t.printed.A.txt -// RUN: FileCheck %s -check-prefix=PRINT -strict-whitespace < %t.printed.A.txt +// RUN: %FileCheck %s -check-prefix=PRINT -strict-whitespace < %t.printed.A.txt // RUN: %target-parse-verify-swift -sdk %clang-importer-sdk -I %S/Inputs/custom-modules -enable-swift-newtype -I %t // REQUIRES: objc_interop diff --git a/test/IDE/newtype_objc.swift b/test/IDE/newtype_objc.swift index a8af960fd4486..4c321bc50f99e 100644 --- a/test/IDE/newtype_objc.swift +++ b/test/IDE/newtype_objc.swift @@ -3,7 +3,7 @@ // RUN: %build-clang-importer-objc-overlays // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk-nosource) -I %t -I %S/Inputs/custom-modules -print-module -source-filename %s -module-to-print=NewtypeObjC -enable-swift-newtype > %t.printed.NewtypeObjC.txt -// RUN: FileCheck %s -check-prefix=PRINT -strict-whitespace < %t.printed.NewtypeObjC.txt +// RUN: %FileCheck %s -check-prefix=PRINT -strict-whitespace < %t.printed.NewtypeObjC.txt // RUN: %target-parse-verify-swift -sdk %clang-importer-sdk -I %S/Inputs/custom-modules -I %t -enable-swift-newtype %s // REQUIRES: objc_interop diff --git a/test/IDE/print_ast_interface.swift b/test/IDE/print_ast_interface.swift index 6d624bd288543..fd2d9399efe45 100644 --- a/test/IDE/print_ast_interface.swift +++ b/test/IDE/print_ast_interface.swift @@ -7,7 +7,7 @@ public enum Foo { case B(String) } -// RUN: %target-swift-ide-test -print-ast-typechecked -print-interface -source-filename %s | FileCheck %s -check-prefix=CHECK1 +// RUN: %target-swift-ide-test -print-ast-typechecked -print-interface -source-filename %s | %FileCheck %s -check-prefix=CHECK1 // CHECK1: {{^}}/// This is my enum.{{$}} // CHECK1: {{^}}public enum Foo {{{$}} // CHECK1: {{^}} /// This is really special.{{$}} diff --git a/test/IDE/print_ast_non_typechecked.swift b/test/IDE/print_ast_non_typechecked.swift index c77093400d958..90b2d463059dc 100644 --- a/test/IDE/print_ast_non_typechecked.swift +++ b/test/IDE/print_ast_non_typechecked.swift @@ -2,5 +2,5 @@ class C { func foo(s: Int, w } -// RUN: %target-swift-ide-test -print-ast-not-typechecked -source-filename %s | FileCheck %s -check-prefix=CHECK1 +// RUN: %target-swift-ide-test -print-ast-not-typechecked -source-filename %s | %FileCheck %s -check-prefix=CHECK1 // CHECK1: func foo(s: Int) diff --git a/test/IDE/print_ast_overlay.swift b/test/IDE/print_ast_overlay.swift index d19645121c33f..2a7f27cf9ac92 100644 --- a/test/IDE/print_ast_overlay.swift +++ b/test/IDE/print_ast_overlay.swift @@ -3,16 +3,16 @@ // RUN: %target-build-swift -emit-module -module-name Foo -o %t -F %S/Inputs/mock-sdk %s // // RUN: %target-swift-ide-test -print-module -source-filename %s -I %t -F %S/Inputs/mock-sdk -module-to-print=Foo -accessibility-filter-public > %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_WITH_OVERLAY -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_NO_INTERNAL -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_WITH_OVERLAY -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_NO_INTERNAL -strict-whitespace < %t.printed.txt // // RUN: %target-swift-ide-test -print-module -source-filename %s -I %t -F %S/Inputs/mock-sdk -module-to-print=Foo.FooSub > %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_WITHOUT_OVERLAY -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_WITHOUT_OVERLAY -strict-whitespace < %t.printed.txt // XFAIL: linux // RUN: %target-swift-ide-test -print-module -source-filename %s -I %t -F %S/Inputs/mock-sdk -module-to-print=Foo -accessibility-filter-public -annotate-print > %t.annotated.txt -// RUN: FileCheck %s -check-prefix=PASS_ANNOTATED -strict-whitespace < %t.annotated.txt +// RUN: %FileCheck %s -check-prefix=PASS_ANNOTATED -strict-whitespace < %t.annotated.txt // REQUIRES: executable_test @_exported import Foo diff --git a/test/IDE/print_ast_tc_decls.swift b/test/IDE/print_ast_tc_decls.swift index c596606e30d70..304850019b74e 100644 --- a/test/IDE/print_ast_tc_decls.swift +++ b/test/IDE/print_ast_tc_decls.swift @@ -11,51 +11,51 @@ // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -parse -verify %s -F %S/Inputs/mock-sdk -disable-objc-attr-requires-foundation-module // // RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -skip-deinit=false -print-ast-typechecked -source-filename %s -F %S/Inputs/mock-sdk -function-definitions=false -prefer-type-repr=false -print-implicit-attrs=true -disable-objc-attr-requires-foundation-module > %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_COMMON -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_PRINT_AST -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_RW_PROP_GET_SET -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_2200 -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_2500 -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_ONE_LINE -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_ONE_LINE_TYPE -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PREFER_TYPE_PRINTING -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_QUAL_UNQUAL -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_COMMON -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_PRINT_AST -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_RW_PROP_GET_SET -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_2200 -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_2500 -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_ONE_LINE -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_ONE_LINE_TYPE -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PREFER_TYPE_PRINTING -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_QUAL_UNQUAL -strict-whitespace < %t.printed.txt // // RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -skip-deinit=false -print-ast-typechecked -source-filename %s -F %S/Inputs/mock-sdk -function-definitions=false -prefer-type-repr=true -print-implicit-attrs=true -disable-objc-attr-requires-foundation-module > %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_COMMON -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_PRINT_AST -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_RW_PROP_GET_SET -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_2200 -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_2500 -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_ONE_LINE -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_ONE_LINE_TYPEREPR -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PREFER_TYPE_REPR_PRINTING -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_QUAL_UNQUAL -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_COMMON -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_PRINT_AST -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_RW_PROP_GET_SET -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_2200 -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_2500 -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_ONE_LINE -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_ONE_LINE_TYPEREPR -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PREFER_TYPE_REPR_PRINTING -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_QUAL_UNQUAL -strict-whitespace < %t.printed.txt // // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -emit-module -o %t -F %S/Inputs/mock-sdk -disable-objc-attr-requires-foundation-module %s // RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -skip-deinit=false -print-module -source-filename %s -F %S/Inputs/mock-sdk -module-to-print=print_ast_tc_decls -print-implicit-attrs=true -disable-objc-attr-requires-foundation-module > %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_COMMON -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_PRINT_MODULE_INTERFACE -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_RW_PROP_NO_GET_SET -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_2200_DESERIALIZED -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_COMMON -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_PRINT_MODULE_INTERFACE -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_RW_PROP_NO_GET_SET -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_2200_DESERIALIZED -strict-whitespace < %t.printed.txt // FIXME: rdar://15167697 -// FIXME: FileCheck %s -check-prefix=PASS_2500 -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_ONE_LINE -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PREFER_TYPE_REPR_PRINTING -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_QUAL_UNQUAL -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_EXPLODE_PATTERN -strict-whitespace < %t.printed.txt +// FIXME: %FileCheck %s -check-prefix=PASS_2500 -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_ONE_LINE -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PREFER_TYPE_REPR_PRINTING -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_QUAL_UNQUAL -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_EXPLODE_PATTERN -strict-whitespace < %t.printed.txt // // RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -skip-deinit=false -print-module -source-filename %s -F %S/Inputs/mock-sdk -I %t -module-to-print=print_ast_tc_decls -synthesize-sugar-on-types=true -print-implicit-attrs=true -disable-objc-attr-requires-foundation-module > %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_PRINT_MODULE_INTERFACE -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_QUAL_UNQUAL -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=SYNTHESIZE_SUGAR_ON_TYPES -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_EXPLODE_PATTERN -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_PRINT_MODULE_INTERFACE -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_QUAL_UNQUAL -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=SYNTHESIZE_SUGAR_ON_TYPES -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_EXPLODE_PATTERN -strict-whitespace < %t.printed.txt // RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -skip-deinit=false -print-module -source-filename %s -F %S/Inputs/mock-sdk -I %t -module-to-print=print_ast_tc_decls -synthesize-sugar-on-types=true -fully-qualified-types-if-ambiguous=true -print-implicit-attrs=true -disable-objc-attr-requires-foundation-module > %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_PRINT_MODULE_INTERFACE -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=PASS_QUAL_IF_AMBIGUOUS -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=SYNTHESIZE_SUGAR_ON_TYPES -strict-whitespace < %t.printed.txt -// FIXME: FileCheck %s -check-prefix=PASS_EXPLODE_PATTERN -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_PRINT_MODULE_INTERFACE -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=PASS_QUAL_IF_AMBIGUOUS -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=SYNTHESIZE_SUGAR_ON_TYPES -strict-whitespace < %t.printed.txt +// FIXME: %FileCheck %s -check-prefix=PASS_EXPLODE_PATTERN -strict-whitespace < %t.printed.txt // FIXME: rdar://problem/19648117 Needs splitting objc parts out // XFAIL: linux diff --git a/test/IDE/print_ast_tc_decls_errors.swift b/test/IDE/print_ast_tc_decls_errors.swift index 1cac9e8e61ded..718c2abc2cfe2 100644 --- a/test/IDE/print_ast_tc_decls_errors.swift +++ b/test/IDE/print_ast_tc_decls_errors.swift @@ -3,12 +3,12 @@ // RUN: %target-parse-verify-swift -show-diagnostics-after-fatal %s // RUN: %target-swift-ide-test -print-ast-typechecked -source-filename %s -prefer-type-repr=false > %t.printed.txt -// RUN: FileCheck %s -strict-whitespace < %t.printed.txt -// RUN: FileCheck -check-prefix=NO-TYPEREPR %s -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -strict-whitespace < %t.printed.txt +// RUN: %FileCheck -check-prefix=NO-TYPEREPR %s -strict-whitespace < %t.printed.txt // RUN: %target-swift-ide-test -print-ast-typechecked -source-filename %s -prefer-type-repr=true > %t.printed.txt -// RUN: FileCheck %s -strict-whitespace < %t.printed.txt -// RUN: FileCheck -check-prefix=TYPEREPR %s -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -strict-whitespace < %t.printed.txt +// RUN: %FileCheck -check-prefix=TYPEREPR %s -strict-whitespace < %t.printed.txt //===--- //===--- Helper types. diff --git a/test/IDE/print_ast_tc_function_bodies.swift b/test/IDE/print_ast_tc_function_bodies.swift index ebcca3a0b61ba..3b760528ec589 100644 --- a/test/IDE/print_ast_tc_function_bodies.swift +++ b/test/IDE/print_ast_tc_function_bodies.swift @@ -2,10 +2,10 @@ // RUN: %target-parse-verify-swift // RUN: %target-swift-ide-test -print-ast-typechecked -source-filename %s -function-definitions=true -prefer-type-repr=false > %t.printed.txt -// RUN: FileCheck %s -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -strict-whitespace < %t.printed.txt // RUN: %target-swift-ide-test -print-ast-typechecked -source-filename %s -function-definitions=true -prefer-type-repr=true > %t.printed.txt -// RUN: FileCheck %s -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -strict-whitespace < %t.printed.txt struct FooStruct { // CHECK-LABEL: {{^}}struct FooStruct {{{$}} diff --git a/test/IDE/print_ast_typechecked.swift b/test/IDE/print_ast_typechecked.swift index dec6e1d345d30..b8bc4c5d9461d 100644 --- a/test/IDE/print_ast_typechecked.swift +++ b/test/IDE/print_ast_typechecked.swift @@ -7,7 +7,7 @@ public class C { var (InternalTuple1, InternalTuple2) = (10, 20) } -// RUN: %target-swift-ide-test -print-ast-typechecked -accessibility-filter-internal -source-filename %s | FileCheck %s -check-prefix=CHECK1 +// RUN: %target-swift-ide-test -print-ast-typechecked -accessibility-filter-internal -source-filename %s | %FileCheck %s -check-prefix=CHECK1 // CHECK1: {{^}}public class C {{{$}} // CHECK1-NOT: private // CHECK1: {{^}} public var PublicVar: Int{{$}} diff --git a/test/IDE/print_clang_ObjectiveC.swift b/test/IDE/print_clang_ObjectiveC.swift index 9c7311f7abcf9..3ec1b731baab2 100644 --- a/test/IDE/print_clang_ObjectiveC.swift +++ b/test/IDE/print_clang_ObjectiveC.swift @@ -1,12 +1,12 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-swift-ide-test -print-module -source-filename %s -module-to-print=ObjectiveC.NSObject -function-definitions=false > %t/ObjectiveC.NSObject.printed.txt -// RUN: FileCheck -input-file %t/ObjectiveC.NSObject.printed.txt %s -// RUN: FileCheck -input-file %t/ObjectiveC.NSObject.printed.txt -check-prefix=NEGATIVE -check-prefix=NEGATIVE-WITHOUT-FORWARD-DECLS %s +// RUN: %FileCheck -input-file %t/ObjectiveC.NSObject.printed.txt %s +// RUN: %FileCheck -input-file %t/ObjectiveC.NSObject.printed.txt -check-prefix=NEGATIVE -check-prefix=NEGATIVE-WITHOUT-FORWARD-DECLS %s // RUN: %target-swift-ide-test -print-module -source-filename %s -module-to-print=ObjectiveC.NSObject -function-definitions=false -enable-objc-forward-declarations > %t/ObjectiveC.NSObject.forward-decls.txt -// RUN: FileCheck -input-file %t/ObjectiveC.NSObject.forward-decls.txt -check-prefix=CHECK -check-prefix=CHECK-WITH-FORWARD-DECLS %s -// RUN: FileCheck -input-file %t/ObjectiveC.NSObject.forward-decls.txt -check-prefix=NEGATIVE %s +// RUN: %FileCheck -input-file %t/ObjectiveC.NSObject.forward-decls.txt -check-prefix=CHECK -check-prefix=CHECK-WITH-FORWARD-DECLS %s +// RUN: %FileCheck -input-file %t/ObjectiveC.NSObject.forward-decls.txt -check-prefix=NEGATIVE %s // REQUIRES: objc_interop diff --git a/test/IDE/print_clang_category_ordering.swift b/test/IDE/print_clang_category_ordering.swift index bf05c86ac0738..5b23d6a5850eb 100644 --- a/test/IDE/print_clang_category_ordering.swift +++ b/test/IDE/print_clang_category_ordering.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-ide-test -print-module -source-filename %s -I %S/Inputs/category-ordering/ -module-to-print=ProtocolThenProperty | FileCheck %s -check-prefix=CHECK -check-prefix=CHECK-PROTO-FIRST -// RUN: %target-swift-ide-test -print-module -source-filename %s -I %S/Inputs/category-ordering/ -module-to-print=PropertyThenProtocol | FileCheck %s -check-prefix=CHECK -check-prefix=CHECK-PROP-FIRST +// RUN: %target-swift-ide-test -print-module -source-filename %s -I %S/Inputs/category-ordering/ -module-to-print=ProtocolThenProperty | %FileCheck %s -check-prefix=CHECK -check-prefix=CHECK-PROTO-FIRST +// RUN: %target-swift-ide-test -print-module -source-filename %s -I %S/Inputs/category-ordering/ -module-to-print=PropertyThenProtocol | %FileCheck %s -check-prefix=CHECK -check-prefix=CHECK-PROP-FIRST // REQUIRES: objc_interop diff --git a/test/IDE/print_clang_decls.swift b/test/IDE/print_clang_decls.swift index 475bd7fd14e2f..7e4a654f1891a 100644 --- a/test/IDE/print_clang_decls.swift +++ b/test/IDE/print_clang_decls.swift @@ -11,17 +11,17 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk -I %t) -emit-module -o %t %S/../Inputs/clang-importer-sdk/swift-modules/CoreGraphics.swift // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk -I %t) -emit-module -o %t %S/../Inputs/clang-importer-sdk/swift-modules/Foundation.swift // RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -print-module -source-filename %s -module-to-print=ctypes -function-definitions=false -prefer-type-repr=true > %t.printed.txt -// RUN: FileCheck %s -check-prefix=TAG_DECLS_AND_TYPEDEFS -strict-whitespace < %t.printed.txt -// RUN: FileCheck %s -check-prefix=NEGATIVE -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=TAG_DECLS_AND_TYPEDEFS -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=NEGATIVE -strict-whitespace < %t.printed.txt // RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -print-module -source-filename %s -module-to-print=Foundation -function-definitions=false -prefer-type-repr=true > %t.printed.txt -// RUN: FileCheck %s -check-prefix=FOUNDATION -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=FOUNDATION -strict-whitespace < %t.printed.txt // RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -print-module -source-filename %s -module-to-print=ctypes.bits -function-definitions=false -prefer-type-repr=true > %t.printed.txt -// RUN: FileCheck %s -check-prefix=CTYPESBITS -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=CTYPESBITS -strict-whitespace < %t.printed.txt // RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -print-module -source-filename %s -module-to-print=nullability -function-definitions=false -prefer-type-repr=true > %t.printed.txt -// RUN: FileCheck %s -check-prefix=CHECK-NULLABILITY -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=CHECK-NULLABILITY -strict-whitespace < %t.printed.txt // TAG_DECLS_AND_TYPEDEFS: {{^}}struct FooStruct1 {{{$}} // TAG_DECLS_AND_TYPEDEFS: {{^}} var x: Int32{{$}} diff --git a/test/IDE/print_clang_decls_AppKit.swift b/test/IDE/print_clang_decls_AppKit.swift index ddcc0afd33a9a..1167e5dd6013f 100644 --- a/test/IDE/print_clang_decls_AppKit.swift +++ b/test/IDE/print_clang_decls_AppKit.swift @@ -13,7 +13,7 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-module -o %t %S/../Inputs/clang-importer-sdk/swift-modules/AppKit.swift // RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -print-module -source-filename %s -module-to-print=AppKit -function-definitions=false -prefer-type-repr=true > %t.printed.txt -// RUN: FileCheck %s -check-prefix=APPKIT -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=APPKIT -strict-whitespace < %t.printed.txt // APPKIT-LABEL: {{^}}extension NSString {{{$}} diff --git a/test/IDE/print_clang_foundation.swift b/test/IDE/print_clang_foundation.swift index b6cad71fc0946..d95749a2c1cf0 100644 --- a/test/IDE/print_clang_foundation.swift +++ b/test/IDE/print_clang_foundation.swift @@ -2,7 +2,7 @@ // RUN: mkdir -p %t // RUN: %target-swift-ide-test -print-module -source-filename %s -module-to-print=Foundation.NSArray -function-definitions=false > %t/Foundation.NSArray.printed.txt -// RUN: FileCheck -input-file %t/Foundation.NSArray.printed.txt -check-prefix=CHECK_NSARRAY %s +// RUN: %FileCheck -input-file %t/Foundation.NSArray.printed.txt -check-prefix=CHECK_NSARRAY %s // REQUIRES: objc_interop @@ -19,13 +19,13 @@ // CHECK_NSARRAY: func setArray(_ otherArray: [Any]) // RUN: %target-swift-ide-test -print-module -source-filename %s -module-to-print=Foundation.NSKeyValueCoding -function-definitions=false -print-regular-comments > %t/Foundation.NSKeyValueCoding.printed.txt -// RUN: FileCheck -input-file %t/Foundation.NSKeyValueCoding.printed.txt -check-prefix=CHECK2 %s +// RUN: %FileCheck -input-file %t/Foundation.NSKeyValueCoding.printed.txt -check-prefix=CHECK2 %s // CHECK2: extension NSObject // RUN: %target-swift-ide-test -print-module -source-filename %s -module-to-print=Foundation.NSString -function-definitions=false > %t/Foundation.NSString.printed.txt -// RUN: FileCheck -input-file %t/Foundation.NSString.printed.txt -check-prefix=CHECK_NSSTRING %s -// RUN: FileCheck -input-file %t/Foundation.NSString.printed.txt -check-prefix=CHECK_DICTIONARY %s +// RUN: %FileCheck -input-file %t/Foundation.NSString.printed.txt -check-prefix=CHECK_NSSTRING %s +// RUN: %FileCheck -input-file %t/Foundation.NSString.printed.txt -check-prefix=CHECK_DICTIONARY %s // Make sure that we don't qualify 'NSErrorPointer'. // CHECK_NSSTRING: init(contentsOfFile path: String, encoding enc: UInt) throws @@ -33,30 +33,30 @@ // CHECK_DICTIONARY: func propertyListFromStringsFileFormat() -> [AnyHashable : Any] // RUN: %target-swift-ide-test -print-module -source-filename %s -module-to-print=Foundation -function-definitions=false > %t/Foundation.printed.txt -// RUN: FileCheck -input-file %t/Foundation.printed.txt -check-prefix=CHECK_DUP %s +// RUN: %FileCheck -input-file %t/Foundation.printed.txt -check-prefix=CHECK_DUP %s // CHECK_DUP: import CoreFoundation{{$}} // CHECK_DUP-NOT: import CoreFoundation{{$}} // RUN: %target-swift-ide-test -print-module -source-filename %s -module-to-print=Foundation.NSTimeZone -function-definitions=false > %t/Foundation.NSTimeZone.printed.txt -// RUN: FileCheck -input-file %t/Foundation.NSTimeZone.printed.txt -check-prefix=CHECK_NSTIMEZONE %s +// RUN: %FileCheck -input-file %t/Foundation.NSTimeZone.printed.txt -check-prefix=CHECK_NSTIMEZONE %s // CHECK_NSTIMEZONE: func secondsFromGMT(for aDate: Date) -> Int // CHECK_NSTIMEZONE: func abbreviation(for aDate: Date) -> String? // CHECK_NSTIMEZONE: var nextDaylightSavingTimeTransition: Date? { get } // RUN: %target-swift-ide-test -print-module -source-filename %s -module-to-print=Foundation.NSCalendar -function-definitions=false > %t/Foundation.NSCalendar.printed.txt -// RUN: FileCheck -input-file %t/Foundation.NSCalendar.printed.txt -check-prefix=CHECK_NSCALENDAR %s +// RUN: %FileCheck -input-file %t/Foundation.NSCalendar.printed.txt -check-prefix=CHECK_NSCALENDAR %s // CHECK_NSCALENDAR: func date(from comps: DateComponents) -> Date? // RUN: %target-swift-ide-test -print-module -source-filename %s -module-to-print=Foundation.NSDateInterval -function-definitions=false > %t/Foundation.NSDateInterval.printed.txt -// RUN: FileCheck -input-file %t/Foundation.NSDateInterval.printed.txt -check-prefix=CHECK_NSDATEINTERVAL %s +// RUN: %FileCheck -input-file %t/Foundation.NSDateInterval.printed.txt -check-prefix=CHECK_NSDATEINTERVAL %s // CHECK_NSDATEINTERVAL: func intersection(with dateInterval: DateInterval) -> DateInterval? // RUN: %target-swift-ide-test -print-module -source-filename %s -module-to-print=Foundation.NSCoder -function-definitions=false > %t/Foundation.NSCoder.printed.txt -// RUN: FileCheck -input-file %t/Foundation.NSCoder.printed.txt -check-prefix=CHECK_NSCODER %s +// RUN: %FileCheck -input-file %t/Foundation.NSCoder.printed.txt -check-prefix=CHECK_NSCODER %s // CHECK_NSCODER: func failWithError(_ error: Error) // CHECK_NSCODER: {{^}} var error: Error? { get } diff --git a/test/IDE/print_clang_framework.swift b/test/IDE/print_clang_framework.swift index fdad7f973e0cd..8dc47a9a50668 100644 --- a/test/IDE/print_clang_framework.swift +++ b/test/IDE/print_clang_framework.swift @@ -8,7 +8,7 @@ // RUN: diff -u %S/Inputs/mock-sdk/Foo.printed.txt %t/Foo.printed.txt // RUN: %target-swift-ide-test(mock-sdk: -F %S/Inputs/mock-sdk) -print-interface -print-module -source-filename %s -module-to-print=Foo -function-definitions=false -print-regular-comments > %t/Foo.interface.printed.txt -// RUN: FileCheck %s -check-prefix=INTERFACE1 < %t/Foo.interface.printed.txt +// RUN: %FileCheck %s -check-prefix=INTERFACE1 < %t/Foo.interface.printed.txt // RUN: %target-swift-ide-test(mock-sdk: -F %S/Inputs/mock-sdk) -print-module -source-filename %s -module-to-print=Foo -function-definitions=false -prefer-type-repr=true -module-print-submodules > %t/Foo.printed.recursive.txt // RUN: diff -u %S/Inputs/mock-sdk/Foo.printed.recursive.txt %t/Foo.printed.recursive.txt @@ -30,7 +30,7 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk -I %t) -emit-module -o %t %S/../Inputs/clang-importer-sdk/swift-modules/Foundation.swift // RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -print-module -source-filename %s -module-to-print=Foundation -function-definitions=false -prefer-type-repr=true > %t.printed.txt -// RUN: FileCheck %s -check-prefix=FOUNDATION -strict-whitespace < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=FOUNDATION -strict-whitespace < %t.printed.txt // This test is in general platform-independent, but it happens to check // printing of @available attributes for OS X, and those are not printed on diff --git a/test/IDE/print_clang_framework_with_overlay.swift b/test/IDE/print_clang_framework_with_overlay.swift index f474b0dc55b37..9cab00005b71b 100644 --- a/test/IDE/print_clang_framework_with_overlay.swift +++ b/test/IDE/print_clang_framework_with_overlay.swift @@ -2,7 +2,7 @@ // RUN: mkdir -p %t // RUN: %target-swift-frontend(mock-sdk: -F %S/Inputs/mock-sdk) -I %t -emit-module -o %t/FooOverlay.swiftmodule %S/Inputs/FooOverlay.swift -// RUN: %target-swift-ide-test(mock-sdk: -F %S/Inputs/mock-sdk) -I %t -print-module -source-filename %s -module-to-print=FooOverlay -function-definitions=false | FileCheck %s +// RUN: %target-swift-ide-test(mock-sdk: -F %S/Inputs/mock-sdk) -I %t -print-module -source-filename %s -module-to-print=FooOverlay -function-definitions=false | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IDE/print_clang_header_swift_name.swift b/test/IDE/print_clang_header_swift_name.swift index acff7b39e2af9..776464d621a3a 100644 --- a/test/IDE/print_clang_header_swift_name.swift +++ b/test/IDE/print_clang_header_swift_name.swift @@ -1,7 +1,7 @@ // RUN: echo '#include "print_clang_header_swift_name.h"' > %t.m // RUN: %target-swift-ide-test -source-filename %s -print-header -header-to-print \ // RUN: %S/Inputs/print_clang_header_swift_name.h --cc-args %target-cc-options \ -// RUN: -isysroot %clang-importer-sdk-path -fsyntax-only %t.m -I %S/Inputs | FileCheck %s +// RUN: -isysroot %clang-importer-sdk-path -fsyntax-only %t.m -I %S/Inputs | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IDE/print_module_without_deinit.swift b/test/IDE/print_module_without_deinit.swift index 6586b04f99c9d..cab47342ce85a 100644 --- a/test/IDE/print_module_without_deinit.swift +++ b/test/IDE/print_module_without_deinit.swift @@ -1,11 +1,11 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module -o %t %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-module -skip-deinit=true -module-to-print=print_module_without_deinit -I %t -source-filename=%s | FileCheck -check-prefix=SKIP1 %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-module -skip-deinit=false -module-to-print=print_module_without_deinit -I %t -source-filename=%s | FileCheck -check-prefix=NOSKIP1 %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-module -skip-deinit=true -module-to-print=print_module_without_deinit -I %t -source-filename=%s | FileCheck -check-prefix=INIT1 %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-module -skip-deinit=true -module-to-print=print_module_without_deinit -I %t -source-filename=%s | FileCheck -check-prefix=INIT2 %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-module -skip-deinit=true -module-to-print=print_module_without_deinit -I %t -source-filename=%s | FileCheck -check-prefix=ATTR1 %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-module -skip-deinit=true -module-to-print=print_module_without_deinit -I %t -source-filename=%s | %FileCheck -check-prefix=SKIP1 %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-module -skip-deinit=false -module-to-print=print_module_without_deinit -I %t -source-filename=%s | %FileCheck -check-prefix=NOSKIP1 %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-module -skip-deinit=true -module-to-print=print_module_without_deinit -I %t -source-filename=%s | %FileCheck -check-prefix=INIT1 %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-module -skip-deinit=true -module-to-print=print_module_without_deinit -I %t -source-filename=%s | %FileCheck -check-prefix=INIT2 %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-module -skip-deinit=true -module-to-print=print_module_without_deinit -I %t -source-filename=%s | %FileCheck -check-prefix=ATTR1 %s // SKIP1: class PropertyOwnership { // NOSKIP1: class PropertyOwnership { diff --git a/test/IDE/print_omit_needless_words.swift b/test/IDE/print_omit_needless_words.swift index bd75d3b76ccd5..23c0d7fe2228c 100644 --- a/test/IDE/print_omit_needless_words.swift +++ b/test/IDE/print_omit_needless_words.swift @@ -12,24 +12,24 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-module -o %t %S/../Inputs/clang-importer-sdk/swift-modules-without-ns/AppKit.swift // RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -print-module -source-filename %s -module-to-print=ObjectiveC -function-definitions=false -prefer-type-repr=true > %t.ObjectiveC.txt -// RUN: FileCheck %s -check-prefix=CHECK-OBJECTIVEC -strict-whitespace < %t.ObjectiveC.txt +// RUN: %FileCheck %s -check-prefix=CHECK-OBJECTIVEC -strict-whitespace < %t.ObjectiveC.txt // RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -print-module -source-filename %s -module-to-print=Foundation -function-definitions=false -prefer-type-repr=true -skip-parameter-names > %t.Foundation.txt -// RUN: FileCheck %s -check-prefix=CHECK-FOUNDATION -strict-whitespace < %t.Foundation.txt +// RUN: %FileCheck %s -check-prefix=CHECK-FOUNDATION -strict-whitespace < %t.Foundation.txt // RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -print-module -source-filename %s -module-to-print=AppKit -function-definitions=false -prefer-type-repr=true -skip-parameter-names > %t.AppKit.txt -// RUN: FileCheck %s -check-prefix=CHECK-APPKIT -strict-whitespace < %t.AppKit.txt +// RUN: %FileCheck %s -check-prefix=CHECK-APPKIT -strict-whitespace < %t.AppKit.txt // RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t -I %S/../ClangModules/Inputs/custom-modules) -print-module -source-filename %s -module-to-print=CoreCooling -function-definitions=false -prefer-type-repr=true -skip-parameter-names > %t.CoreCooling.txt -// RUN: FileCheck %s -check-prefix=CHECK-CORECOOLING -strict-whitespace < %t.CoreCooling.txt +// RUN: %FileCheck %s -check-prefix=CHECK-CORECOOLING -strict-whitespace < %t.CoreCooling.txt // RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t -I %S/Inputs/custom-modules) -print-module -source-filename %s -module-to-print=OmitNeedlessWords -function-definitions=false -prefer-type-repr=true -skip-parameter-names > %t.OmitNeedlessWords.txt 2> %t.OmitNeedlessWords.diagnostics.txt -// RUN: FileCheck %s -check-prefix=CHECK-OMIT-NEEDLESS-WORDS -strict-whitespace < %t.OmitNeedlessWords.txt -// RUN: FileCheck %s -check-prefix=CHECK-OMIT-NEEDLESS-WORDS-DIAGS -strict-whitespace < %t.OmitNeedlessWords.diagnostics.txt +// RUN: %FileCheck %s -check-prefix=CHECK-OMIT-NEEDLESS-WORDS -strict-whitespace < %t.OmitNeedlessWords.txt +// RUN: %FileCheck %s -check-prefix=CHECK-OMIT-NEEDLESS-WORDS-DIAGS -strict-whitespace < %t.OmitNeedlessWords.diagnostics.txt // RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -print-module -source-filename %s -module-to-print=errors -function-definitions=false -prefer-type-repr=true -skip-parameter-names > %t.errors.txt -// RUN: FileCheck %s -check-prefix=CHECK-ERRORS -strict-whitespace < %t.errors.txt +// RUN: %FileCheck %s -check-prefix=CHECK-ERRORS -strict-whitespace < %t.errors.txt // Note: SEL -> "Selector" // CHECK-FOUNDATION: func makeObjectsPerform(_: Selector) diff --git a/test/IDE/print_stdlib.swift b/test/IDE/print_stdlib.swift index 41ff055b42e99..b864e8896960c 100644 --- a/test/IDE/print_stdlib.swift +++ b/test/IDE/print_stdlib.swift @@ -4,18 +4,18 @@ // // RUN: %target-swift-frontend -parse %s // RUN: %target-swift-ide-test -print-module -module-to-print=Swift -source-filename %s -print-interface > %t.txt -// RUN: FileCheck -check-prefix=CHECK-ARGC %s < %t.txt -// RUN: FileCheck %s < %t.txt -// RUN: FileCheck -check-prefix=CHECK-SUGAR %s < %t.txt -// RUN: FileCheck -check-prefix=CHECK-MUTATING-ATTR %s < %t.txt -// RUN: FileCheck -check-prefix=NO-FIXMES %s < %t.txt -// RUN: FileCheck -check-prefix=CHECK-ARGC %s < %t.txt +// RUN: %FileCheck -check-prefix=CHECK-ARGC %s < %t.txt +// RUN: %FileCheck %s < %t.txt +// RUN: %FileCheck -check-prefix=CHECK-SUGAR %s < %t.txt +// RUN: %FileCheck -check-prefix=CHECK-MUTATING-ATTR %s < %t.txt +// RUN: %FileCheck -check-prefix=NO-FIXMES %s < %t.txt +// RUN: %FileCheck -check-prefix=CHECK-ARGC %s < %t.txt // RUN: %target-swift-ide-test -print-module -module-to-print=Swift -source-filename %s -print-interface-doc > %t-doc.txt -// RUN: FileCheck %s < %t-doc.txt +// RUN: %FileCheck %s < %t-doc.txt // RUN: %target-swift-ide-test -print-module -module-to-print=Swift -source-filename %s -print-interface -skip-underscored-stdlib-protocols > %t-prot.txt -// RUN: FileCheck -check-prefix=CHECK-UNDERSCORED-PROT %s < %t-prot.txt +// RUN: %FileCheck -check-prefix=CHECK-UNDERSCORED-PROT %s < %t-prot.txt // CHECK-UNDERSCORED-PROT: public protocol _DisallowMixedSignArithmetic // CHECK-UNDERSCORED-PROT: public protocol _Incrementable // CHECK-UNDERSCORED-PROT: public protocol _Integer @@ -57,7 +57,7 @@ func foo(x: _Pointer) {} // Checks that this protocol actually exists. // NO-FIXMES-NOT: FIXME // RUN: %target-swift-ide-test -print-module-groups -module-to-print=Swift -source-filename %s -print-interface > %t-group.txt -// RUN: FileCheck -check-prefix=CHECK-GROUPS1 %s < %t-group.txt +// RUN: %FileCheck -check-prefix=CHECK-GROUPS1 %s < %t-group.txt // CHECK-GROUPS1: Module groups begin: // CHECK-GROUPS1-DAG: Pointer // CHECK-GROUPS1-DAG: C diff --git a/test/IDE/print_stdlib_specialized.swift b/test/IDE/print_stdlib_specialized.swift index 6969a4dcc8792..51be5412e629e 100644 --- a/test/IDE/print_stdlib_specialized.swift +++ b/test/IDE/print_stdlib_specialized.swift @@ -4,23 +4,23 @@ // REQUIRES: nonexecutable_test // -// RUN: %target-swift-ide-test -print-module -module-group "Pointer" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | FileCheck %s -check-prefix=CHECK-FREQUENT-WORD -// RUN: %target-swift-ide-test -print-module -module-group "C" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | FileCheck %s -check-prefix=CHECK-FREQUENT-WORD -// RUN: %target-swift-ide-test -print-module -module-group "Protocols" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | FileCheck %s -check-prefix=CHECK-FREQUENT-WORD -// RUN: %target-swift-ide-test -print-module -module-group "Optional" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | FileCheck %s -check-prefix=CHECK-FREQUENT-WORD -// RUN: %target-swift-ide-test -print-module -module-group "Collection/Lazy Views" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | FileCheck %s -check-prefix=CHECK-FREQUENT-WORD -// RUN: %target-swift-ide-test -print-module -module-group "Math" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | FileCheck %s -check-prefix=CHECK-FREQUENT-WORD -// RUN: %target-swift-ide-test -print-module -module-group "Math/Floating" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | FileCheck %s -check-prefix=CHECK-FREQUENT-WORD -// RUN: %target-swift-ide-test -print-module -module-group "Math/Integers" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | FileCheck %s -check-prefix=CHECK-FREQUENT-WORD -// RUN: %target-swift-ide-test -print-module -module-group "Reflection" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | FileCheck %s -check-prefix=CHECK-FREQUENT-WORD -// RUN: %target-swift-ide-test -print-module -module-group "Misc" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | FileCheck %s -check-prefix=CHECK-FREQUENT-WORD -// RUN: %target-swift-ide-test -print-module -module-group "Collection" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | FileCheck %s -check-prefix=CHECK-COLLECTION-GROUP -// RUN: %target-swift-ide-test -print-module -module-group "Bool" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | FileCheck %s -check-prefix=CHECK-FREQUENT-WORD -// RUN: %target-swift-ide-test -print-module -module-group "Assert" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | FileCheck %s -check-prefix=CHECK-FREQUENT-WORD -// RUN: %target-swift-ide-test -print-module -module-group "String" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | FileCheck %s -check-prefix=CHECK-FREQUENT-WORD -// RUN: %target-swift-ide-test -print-module -module-group "Collection/Array" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | FileCheck %s -check-prefix=CHECK-FREQUENT-WORD -// RUN: %target-swift-ide-test -print-module -module-group "Collection/Type-erased" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | FileCheck %s -check-prefix=CHECK-FREQUENT-WORD -// RUN: %target-swift-ide-test -print-module -module-group "Collection/HashedCollections" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | FileCheck %s -check-prefix=CHECK-FREQUENT-WORD +// RUN: %target-swift-ide-test -print-module -module-group "Pointer" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | %FileCheck %s -check-prefix=CHECK-FREQUENT-WORD +// RUN: %target-swift-ide-test -print-module -module-group "C" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | %FileCheck %s -check-prefix=CHECK-FREQUENT-WORD +// RUN: %target-swift-ide-test -print-module -module-group "Protocols" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | %FileCheck %s -check-prefix=CHECK-FREQUENT-WORD +// RUN: %target-swift-ide-test -print-module -module-group "Optional" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | %FileCheck %s -check-prefix=CHECK-FREQUENT-WORD +// RUN: %target-swift-ide-test -print-module -module-group "Collection/Lazy Views" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | %FileCheck %s -check-prefix=CHECK-FREQUENT-WORD +// RUN: %target-swift-ide-test -print-module -module-group "Math" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | %FileCheck %s -check-prefix=CHECK-FREQUENT-WORD +// RUN: %target-swift-ide-test -print-module -module-group "Math/Floating" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | %FileCheck %s -check-prefix=CHECK-FREQUENT-WORD +// RUN: %target-swift-ide-test -print-module -module-group "Math/Integers" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | %FileCheck %s -check-prefix=CHECK-FREQUENT-WORD +// RUN: %target-swift-ide-test -print-module -module-group "Reflection" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | %FileCheck %s -check-prefix=CHECK-FREQUENT-WORD +// RUN: %target-swift-ide-test -print-module -module-group "Misc" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | %FileCheck %s -check-prefix=CHECK-FREQUENT-WORD +// RUN: %target-swift-ide-test -print-module -module-group "Collection" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | %FileCheck %s -check-prefix=CHECK-COLLECTION-GROUP +// RUN: %target-swift-ide-test -print-module -module-group "Bool" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | %FileCheck %s -check-prefix=CHECK-FREQUENT-WORD +// RUN: %target-swift-ide-test -print-module -module-group "Assert" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | %FileCheck %s -check-prefix=CHECK-FREQUENT-WORD +// RUN: %target-swift-ide-test -print-module -module-group "String" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | %FileCheck %s -check-prefix=CHECK-FREQUENT-WORD +// RUN: %target-swift-ide-test -print-module -module-group "Collection/Array" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | %FileCheck %s -check-prefix=CHECK-FREQUENT-WORD +// RUN: %target-swift-ide-test -print-module -module-group "Collection/Type-erased" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | %FileCheck %s -check-prefix=CHECK-FREQUENT-WORD +// RUN: %target-swift-ide-test -print-module -module-group "Collection/HashedCollections" -synthesize-extension -module-to-print=Swift -source-filename %s -print-interface | %FileCheck %s -check-prefix=CHECK-FREQUENT-WORD // CHECK-FREQUENT-WORD: /// // CHECK-FREQUENT-WORD-NOT: where Slice> == Slice diff --git a/test/IDE/print_swift_module.swift b/test/IDE/print_swift_module.swift index 345f52824d971..dc535c9af3eb6 100644 --- a/test/IDE/print_swift_module.swift +++ b/test/IDE/print_swift_module.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend -emit-module-path %t/print_swift_module.swiftmodule -emit-module-doc -emit-module-doc-path %t/print_swift_module.swiftdoc %s // RUN: %target-swift-ide-test -print-module -print-interface -no-empty-line-between-members -module-to-print=print_swift_module -I %t -source-filename=%s > %t.syn.txt -// RUN: FileCheck %s -check-prefix=CHECK1 < %t.syn.txt +// RUN: %FileCheck %s -check-prefix=CHECK1 < %t.syn.txt public protocol P1 { /// foo1 comment from P1 diff --git a/test/IDE/print_synthesized_extensions.swift b/test/IDE/print_synthesized_extensions.swift index fde83cd51eebb..35779e7722ecd 100644 --- a/test/IDE/print_synthesized_extensions.swift +++ b/test/IDE/print_synthesized_extensions.swift @@ -1,19 +1,19 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend -emit-module-path %t/print_synthesized_extensions.swiftmodule -emit-module-doc -emit-module-doc-path %t/print_synthesized_extensions.swiftdoc %s // RUN: %target-swift-ide-test -print-module -annotate-print -synthesize-extension -print-interface -no-empty-line-between-members -module-to-print=print_synthesized_extensions -I %t -source-filename=%s > %t.syn.txt -// RUN: FileCheck %s -check-prefix=CHECK1 < %t.syn.txt -// RUN: FileCheck %s -check-prefix=CHECK2 < %t.syn.txt -// RUN: FileCheck %s -check-prefix=CHECK3 < %t.syn.txt -// RUN: FileCheck %s -check-prefix=CHECK4 < %t.syn.txt -// RUN: FileCheck %s -check-prefix=CHECK5 < %t.syn.txt -// RUN: FileCheck %s -check-prefix=CHECK6 < %t.syn.txt -// RUN: FileCheck %s -check-prefix=CHECK7 < %t.syn.txt -// RUN: FileCheck %s -check-prefix=CHECK8 < %t.syn.txt -// RUN: FileCheck %s -check-prefix=CHECK9 < %t.syn.txt -// RUN: FileCheck %s -check-prefix=CHECK10 < %t.syn.txt -// RUN: FileCheck %s -check-prefix=CHECK11 < %t.syn.txt -// RUN: FileCheck %s -check-prefix=CHECK12 < %t.syn.txt -// RUN: FileCheck %s -check-prefix=CHECK13 < %t.syn.txt +// RUN: %FileCheck %s -check-prefix=CHECK1 < %t.syn.txt +// RUN: %FileCheck %s -check-prefix=CHECK2 < %t.syn.txt +// RUN: %FileCheck %s -check-prefix=CHECK3 < %t.syn.txt +// RUN: %FileCheck %s -check-prefix=CHECK4 < %t.syn.txt +// RUN: %FileCheck %s -check-prefix=CHECK5 < %t.syn.txt +// RUN: %FileCheck %s -check-prefix=CHECK6 < %t.syn.txt +// RUN: %FileCheck %s -check-prefix=CHECK7 < %t.syn.txt +// RUN: %FileCheck %s -check-prefix=CHECK8 < %t.syn.txt +// RUN: %FileCheck %s -check-prefix=CHECK9 < %t.syn.txt +// RUN: %FileCheck %s -check-prefix=CHECK10 < %t.syn.txt +// RUN: %FileCheck %s -check-prefix=CHECK11 < %t.syn.txt +// RUN: %FileCheck %s -check-prefix=CHECK12 < %t.syn.txt +// RUN: %FileCheck %s -check-prefix=CHECK13 < %t.syn.txt public protocol P1 { associatedtype T1 diff --git a/test/IDE/print_type_interface.swift b/test/IDE/print_type_interface.swift index 9a6ab593342dc..8948d58e383b2 100644 --- a/test/IDE/print_type_interface.swift +++ b/test/IDE/print_type_interface.swift @@ -18,8 +18,8 @@ class C1 { } } -// RUN: %target-swift-ide-test -print-type-interface -pos=15:6 -source-filename %s | FileCheck %s -check-prefix=TYPE1 -// RUN: %target-swift-ide-test -print-type-interface -usr=_TtV20print_type_interface1A -module-name print_type_interface -source-filename %s | FileCheck %s -check-prefix=TYPE1 +// RUN: %target-swift-ide-test -print-type-interface -pos=15:6 -source-filename %s | %FileCheck %s -check-prefix=TYPE1 +// RUN: %target-swift-ide-test -print-type-interface -usr=_TtV20print_type_interface1A -module-name print_type_interface -source-filename %s | %FileCheck %s -check-prefix=TYPE1 // TYPE1: public struct A { // TYPE1: public func fa() // TYPE1: public func fea1() @@ -39,10 +39,10 @@ class C2 { } } -// RUN: %target-swift-ide-test -print-type-interface -pos=37:6 -source-filename %s | FileCheck %s -check-prefix=TYPE2 -// RUN: %target-swift-ide-test -print-type-interface -usr=_TtGC20print_type_interface1DCS_2T1_ -module-name print_type_interface -source-filename %s | FileCheck %s -check-prefix=TYPE2 -// RUN: %target-swift-ide-test -print-type-interface -pos=38:6 -source-filename %s | FileCheck %s -check-prefix=TYPE3 -// RUN: %target-swift-ide-test -print-type-interface -usr=_TtGC20print_type_interface1DSi_ -module-name print_type_interface -source-filename %s | FileCheck %s -check-prefix=TYPE3 +// RUN: %target-swift-ide-test -print-type-interface -pos=37:6 -source-filename %s | %FileCheck %s -check-prefix=TYPE2 +// RUN: %target-swift-ide-test -print-type-interface -usr=_TtGC20print_type_interface1DCS_2T1_ -module-name print_type_interface -source-filename %s | %FileCheck %s -check-prefix=TYPE2 +// RUN: %target-swift-ide-test -print-type-interface -pos=38:6 -source-filename %s | %FileCheck %s -check-prefix=TYPE3 +// RUN: %target-swift-ide-test -print-type-interface -usr=_TtGC20print_type_interface1DSi_ -module-name print_type_interface -source-filename %s | %FileCheck %s -check-prefix=TYPE3 extension D where T : P1 { public func conditionalFunc1() {} @@ -68,7 +68,7 @@ extension D { // TYPE3: public func unconditionalFunc2(t: Int) -> Int // TYPE3: } -// RUN: %target-swift-ide-test -print-type-interface -usr=_TtGSaSi_ -module-name print_type_interface -source-filename %s | FileCheck %s -check-prefix=TYPE4 +// RUN: %target-swift-ide-test -print-type-interface -usr=_TtGSaSi_ -module-name print_type_interface -source-filename %s | %FileCheck %s -check-prefix=TYPE4 // TYPE4-DAG: public typealias Index = Int // TYPE4-DAG: public func min() -> Int? // TYPE4-DAG: public mutating func insert(contentsOf newElements: C, at i: Int) @@ -77,7 +77,7 @@ extension D { // TYPE4-DAG: public func makeIterator() -> IndexingIterator> // TYPE4-NOT: public func joined -// RUN: %target-swift-ide-test -print-type-interface -usr=_TtGSaSS_ -module-name print_type_interface -source-filename %s | FileCheck %s -check-prefix=TYPE5 +// RUN: %target-swift-ide-test -print-type-interface -usr=_TtGSaSS_ -module-name print_type_interface -source-filename %s | %FileCheck %s -check-prefix=TYPE5 // TYPE5-DAG: public func prefix(_ maxLength: Int) -> ArraySlice // TYPE5-DAG: public func suffix(_ maxLength: Int) -> ArraySlice // TYPE5-DAG: public func split(separator: String, maxSplits: Int = default, omittingEmptySubsequences: Bool = default) -> [ArraySlice] diff --git a/test/IDE/print_types.swift b/test/IDE/print_types.swift index 8845ef6ecfc48..a9ad68d6c8b96 100644 --- a/test/IDE/print_types.swift +++ b/test/IDE/print_types.swift @@ -1,8 +1,8 @@ // This file should not have any syntax or type checker errors. // RUN: %target-parse-verify-swift -// RUN: %target-swift-ide-test -print-types -source-filename %s -fully-qualified-types=false | FileCheck %s -strict-whitespace -// RUN: %target-swift-ide-test -print-types -source-filename %s -fully-qualified-types=true | FileCheck %s -check-prefix=FULL -strict-whitespace +// RUN: %target-swift-ide-test -print-types -source-filename %s -fully-qualified-types=false | %FileCheck %s -strict-whitespace +// RUN: %target-swift-ide-test -print-types -source-filename %s -fully-qualified-types=true | %FileCheck %s -check-prefix=FULL -strict-whitespace typealias MyInt = Int // CHECK: TypeAliasDecl '''MyInt''' MyInt.Type{{$}} diff --git a/test/IDE/print_usrs.swift b/test/IDE/print_usrs.swift index 61b0d22a41825..207cb55ec3900 100644 --- a/test/IDE/print_usrs.swift +++ b/test/IDE/print_usrs.swift @@ -1,5 +1,5 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse -verify -disable-objc-attr-requires-foundation-module %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-usrs -source-filename %s | FileCheck %s -strict-whitespace +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-usrs -source-filename %s | %FileCheck %s -strict-whitespace import macros diff --git a/test/IDE/print_usrs_invalid.swift b/test/IDE/print_usrs_invalid.swift index 0ade41d26ad55..847a34f602edb 100644 --- a/test/IDE/print_usrs_invalid.swift +++ b/test/IDE/print_usrs_invalid.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -print-usrs -source-filename %s | FileCheck %s -strict-whitespace +// RUN: %target-swift-ide-test -print-usrs -source-filename %s | %FileCheck %s -strict-whitespace // CHECK: [[@LINE+1]]:6 s:O14swift_ide_test11InvalidEnum{{$}} enum InvalidEnum { diff --git a/test/IDE/reconstruct_type_from_mangled_name.swift b/test/IDE/reconstruct_type_from_mangled_name.swift index e71ef8f0b7c6b..9603ba9e5735a 100644 --- a/test/IDE/reconstruct_type_from_mangled_name.swift +++ b/test/IDE/reconstruct_type_from_mangled_name.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -reconstruct-type -source-filename %s | FileCheck %s -implicit-check-not="FAILURE" +// RUN: %target-swift-ide-test -reconstruct-type -source-filename %s | %FileCheck %s -implicit-check-not="FAILURE" struct Mystruct1 { // CHECK: decl: struct Mystruct1 diff --git a/test/IDE/reconstruct_type_from_mangled_name_invalid.swift b/test/IDE/reconstruct_type_from_mangled_name_invalid.swift index 2869250566f57..3df56f72526c1 100644 --- a/test/IDE/reconstruct_type_from_mangled_name_invalid.swift +++ b/test/IDE/reconstruct_type_from_mangled_name_invalid.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -reconstruct-type -source-filename %s | FileCheck %s -implicit-check-not="FAILURE" +// RUN: %target-swift-ide-test -reconstruct-type -source-filename %s | %FileCheck %s -implicit-check-not="FAILURE" struct GS { // CHECK: decl: struct GS for 'GS' diff --git a/test/IDE/sdk_sugar.swift b/test/IDE/sdk_sugar.swift index fa87b2bd29d8c..3e746b428486c 100644 --- a/test/IDE/sdk_sugar.swift +++ b/test/IDE/sdk_sugar.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: %target-swift-ide-test -print-module -module-print-submodules -module-to-print=Foundation -function-definitions=false -source-filename %s > %t/out 2>&1 -// RUN: FileCheck -input-file=%t/out %s +// RUN: %FileCheck -input-file=%t/out %s // REQUIRES: objc_interop diff --git a/test/IDE/structure.swift b/test/IDE/structure.swift index 6ca5b22144e0e..36e9b860fdb51 100644 --- a/test/IDE/structure.swift +++ b/test/IDE/structure.swift @@ -1,4 +1,4 @@ -// RUN: %swift-ide-test -structure -source-filename %s | FileCheck %s +// RUN: %swift-ide-test -structure -source-filename %s | %FileCheck %s // CHECK: class MyCls : OtherClass { // CHECK: var bar : Int diff --git a/test/IDE/structure_object_literals.swift b/test/IDE/structure_object_literals.swift index ebc85e2736c32..23873e4898448 100644 --- a/test/IDE/structure_object_literals.swift +++ b/test/IDE/structure_object_literals.swift @@ -1,4 +1,4 @@ -// RUN: %swift-ide-test -structure -source-filename %s | FileCheck %s +// RUN: %swift-ide-test -structure -source-filename %s | %FileCheck %s struct S: _ExpressibleByColorLiteral { init(colorLiteralRed: Float, green: Float, blue: Float, alpha: Float) {} diff --git a/test/IDE/test-input-complete/test_input.swift b/test/IDE/test-input-complete/test_input.swift index 93c8585978008..b14afcad15e0a 100644 --- a/test/IDE/test-input-complete/test_input.swift +++ b/test/IDE/test-input-complete/test_input.swift @@ -1,35 +1,35 @@ -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/err_type_complete.swift | FileCheck %s -check-prefix=COMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/for_incomplete1.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_complete.swift | FileCheck %s -check-prefix=COMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete1.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete2.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete3.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete4.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete5.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete6.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete7.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete8.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete9.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete10.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete11.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete12.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/nominal_complete.swift | FileCheck %s -check-prefix=COMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/nominal_incomplete.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/nominal_incomplete2.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/nominal_incomplete3.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/switch_incomplete.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/switch_incomplete2.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/switch_incomplete3.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/toplevel_complete.swift | FileCheck %s -check-prefix=COMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/toplevel_incomplete.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/toplevel_incomplete2.swift | FileCheck %s -check-prefix=COMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/toplevel_incomplete3.swift | FileCheck %s -check-prefix=COMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/toplevel_incomplete4.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/toplevel_incomplete5.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/type_incomplete1.swift | FileCheck %s -check-prefix=COMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/type_incomplete2.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/type_incomplete3.swift | FileCheck %s -check-prefix=INCOMPLETE -// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/type_incomplete4.swift | FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/err_type_complete.swift | %FileCheck %s -check-prefix=COMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/for_incomplete1.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_complete.swift | %FileCheck %s -check-prefix=COMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete1.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete2.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete3.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete4.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete5.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete6.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete7.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete8.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete9.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete10.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete11.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/func_incomplete12.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/nominal_complete.swift | %FileCheck %s -check-prefix=COMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/nominal_incomplete.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/nominal_incomplete2.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/nominal_incomplete3.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/switch_incomplete.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/switch_incomplete2.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/switch_incomplete3.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/toplevel_complete.swift | %FileCheck %s -check-prefix=COMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/toplevel_incomplete.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/toplevel_incomplete2.swift | %FileCheck %s -check-prefix=COMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/toplevel_incomplete3.swift | %FileCheck %s -check-prefix=COMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/toplevel_incomplete4.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/toplevel_incomplete5.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/type_incomplete1.swift | %FileCheck %s -check-prefix=COMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/type_incomplete2.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/type_incomplete3.swift | %FileCheck %s -check-prefix=INCOMPLETE +// RUN: %swift-ide-test -test-input-complete -source-filename %S/Inputs/type_incomplete4.swift | %FileCheck %s -check-prefix=INCOMPLETE // INCOMPLETE: IS_INCOMPLETE // COMPLETE: IS_COMPLETE diff --git a/test/IRGen/UseObjCMethod.swift b/test/IRGen/UseObjCMethod.swift index b3522b913433f..0813ed3006350 100644 --- a/test/IRGen/UseObjCMethod.swift +++ b/test/IRGen/UseObjCMethod.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -import-objc-header %S/Inputs/StaticInline.h %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -import-objc-header %S/Inputs/StaticInline.h %s -emit-ir | %FileCheck %s // REQUIRES: objc_interop import Foundation diff --git a/test/IRGen/abi_v7k.swift b/test/IRGen/abi_v7k.swift index 62bcc533028ea..65e07f0a7fa2e 100644 --- a/test/IRGen/abi_v7k.swift +++ b/test/IRGen/abi_v7k.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -emit-ir -primary-file %s -module-name test_v7k | FileCheck %s -// RUN: %target-swift-frontend -S -primary-file %s -module-name test_v7k | FileCheck -check-prefix=V7K %s +// RUN: %target-swift-frontend -emit-ir -primary-file %s -module-name test_v7k | %FileCheck %s +// RUN: %target-swift-frontend -S -primary-file %s -module-name test_v7k | %FileCheck -check-prefix=V7K %s // REQUIRES: CPU=armv7k // REQUIRES: OS=watchos diff --git a/test/IRGen/abitypes.swift b/test/IRGen/abitypes.swift index f6602402b03ab..bb8411bd9db30 100644 --- a/test/IRGen/abitypes.swift +++ b/test/IRGen/abitypes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/abi %s -emit-ir | FileCheck -check-prefix=%target-cpu-%target-os %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/abi %s -emit-ir | %FileCheck -check-prefix=%target-cpu-%target-os %s // FIXME: rdar://problem/19648117 Needs splitting objc parts out // XFAIL: linux diff --git a/test/IRGen/access_control.sil b/test/IRGen/access_control.sil index 6726ff29718f4..ea7237a1a70bb 100644 --- a/test/IRGen/access_control.sil +++ b/test/IRGen/access_control.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s import Builtin import Swift diff --git a/test/IRGen/alignment.sil b/test/IRGen/alignment.sil index b0b22c0df4608..34e2760491240 100644 --- a/test/IRGen/alignment.sil +++ b/test/IRGen/alignment.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s import Swift diff --git a/test/IRGen/alloc.sil b/test/IRGen/alloc.sil index 93cb4071b8e17..de460ac697e02 100644 --- a/test/IRGen/alloc.sil +++ b/test/IRGen/alloc.sil @@ -1,9 +1,9 @@ -// RUN: %swift -target x86_64-apple-macosx10.9 -module-name main %s -emit-ir -o - | FileCheck %s -// RUN: %swift -target i386-apple-ios7.0 %s -module-name main -emit-ir -o - | FileCheck %s -// RUN: %swift -target x86_64-apple-ios7.0 %s -module-name main -emit-ir -o - | FileCheck %s -// RUN: %swift -target armv7-apple-ios7.0 %s -module-name main -emit-ir -o - | FileCheck %s -// RUN: %swift -target arm64-apple-ios7.0 %s -module-name main -emit-ir -o - | FileCheck %s -// RUN: %swift -target x86_64-unknown-linux-gnu %s -disable-objc-interop -module-name main -emit-ir -o - | FileCheck %s +// RUN: %swift -target x86_64-apple-macosx10.9 -module-name main %s -emit-ir -o - | %FileCheck %s +// RUN: %swift -target i386-apple-ios7.0 %s -module-name main -emit-ir -o - | %FileCheck %s +// RUN: %swift -target x86_64-apple-ios7.0 %s -module-name main -emit-ir -o - | %FileCheck %s +// RUN: %swift -target armv7-apple-ios7.0 %s -module-name main -emit-ir -o - | %FileCheck %s +// RUN: %swift -target arm64-apple-ios7.0 %s -module-name main -emit-ir -o - | %FileCheck %s +// RUN: %swift -target x86_64-unknown-linux-gnu %s -disable-objc-interop -module-name main -emit-ir -o - | %FileCheck %s // REQUIRES: X86 // REQUIRES: ARM diff --git a/test/IRGen/argument_attrs.sil b/test/IRGen/argument_attrs.sil index e8755fbed5d59..d4a1276c54f62 100644 --- a/test/IRGen/argument_attrs.sil +++ b/test/IRGen/argument_attrs.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s import Builtin diff --git a/test/IRGen/array_value_witnesses.sil b/test/IRGen/array_value_witnesses.sil index 06bcf66e03227..111125be0ac63 100644 --- a/test/IRGen/array_value_witnesses.sil +++ b/test/IRGen/array_value_witnesses.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize import Swift diff --git a/test/IRGen/asan-attributes.swift b/test/IRGen/asan-attributes.swift index dfb92861681f0..5eb9a4b126ee5 100644 --- a/test/IRGen/asan-attributes.swift +++ b/test/IRGen/asan-attributes.swift @@ -1,6 +1,6 @@ // This test verifies that we add the function attributes used by ASan. -// RUN: %target-swift-frontend -emit-ir -sanitize=address %s | FileCheck %s -check-prefix=ASAN +// RUN: %target-swift-frontend -emit-ir -sanitize=address %s | %FileCheck %s -check-prefix=ASAN // XFAIL: linux diff --git a/test/IRGen/asmname.swift b/test/IRGen/asmname.swift index d7649d31f6263..dcc73e59bbfcb 100644 --- a/test/IRGen/asmname.swift +++ b/test/IRGen/asmname.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/assert_conf_default.sil b/test/IRGen/assert_conf_default.sil index fa50c535e1bb0..32a440c5d4cbe 100644 --- a/test/IRGen/assert_conf_default.sil +++ b/test/IRGen/assert_conf_default.sil @@ -1,7 +1,7 @@ -// RUN: %target-swift-frontend -assert-config DisableReplacement -emit-ir %s | FileCheck %s --check-prefix=DISABLED -// RUN: %target-swift-frontend -assert-config Release -emit-ir %s | FileCheck %s --check-prefix=RELEASE -// RUN: %target-swift-frontend -assert-config Debug -emit-ir %s | FileCheck %s --check-prefix=DEBUG -// RUN: %target-swift-frontend -assert-config Unchecked -emit-ir %s | FileCheck %s --check-prefix=UNCHECKED +// RUN: %target-swift-frontend -assert-config DisableReplacement -emit-ir %s | %FileCheck %s --check-prefix=DISABLED +// RUN: %target-swift-frontend -assert-config Release -emit-ir %s | %FileCheck %s --check-prefix=RELEASE +// RUN: %target-swift-frontend -assert-config Debug -emit-ir %s | %FileCheck %s --check-prefix=DEBUG +// RUN: %target-swift-frontend -assert-config Unchecked -emit-ir %s | %FileCheck %s --check-prefix=UNCHECKED import Builtin diff --git a/test/IRGen/associated_type_witness.swift b/test/IRGen/associated_type_witness.swift index 9e1d06cea7fdb..b99574d957462 100644 --- a/test/IRGen/associated_type_witness.swift +++ b/test/IRGen/associated_type_witness.swift @@ -1,6 +1,6 @@ // RUN: %target-swift-frontend -primary-file %s -emit-ir > %t.ll -// RUN: FileCheck %s -check-prefix=GLOBAL < %t.ll -// RUN: FileCheck %s < %t.ll +// RUN: %FileCheck %s -check-prefix=GLOBAL < %t.ll +// RUN: %FileCheck %s < %t.ll // REQUIRES: CPU=x86_64 protocol P {} diff --git a/test/IRGen/associated_types.swift b/test/IRGen/associated_types.swift index bb01e69e62d16..a14b8016ce2df 100644 --- a/test/IRGen/associated_types.swift +++ b/test/IRGen/associated_types.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir -primary-file %s | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/autolink-coff-force-link.swift b/test/IRGen/autolink-coff-force-link.swift index 6e5c824fb9f45..a885512541931 100644 --- a/test/IRGen/autolink-coff-force-link.swift +++ b/test/IRGen/autolink-coff-force-link.swift @@ -1,9 +1,9 @@ // RUN: rm -rf %t // RUN: mkdir -p %t -// RUN: %swift -target i686--windows-msvc -parse-as-library -parse-stdlib -module-name autolink -module-link-name autolink -autolink-force-load -emit-ir -o - %s | FileCheck %s -// RUN: %swift -target i686--windows-itanium -parse-as-library -parse-stdlib -module-name autolink -module-link-name autolink -autolink-force-load -S -o - %s | FileCheck %s -check-prefix CHECK-ASM-GNU -// RUN: %swift -target i686--windows-msvc -parse-as-library -parse-stdlib -module-name autolink -module-link-name autolink -autolink-force-load -S -o - %s | FileCheck %s -check-prefix CHECK-ASM-MSC +// RUN: %swift -target i686--windows-msvc -parse-as-library -parse-stdlib -module-name autolink -module-link-name autolink -autolink-force-load -emit-ir -o - %s | %FileCheck %s +// RUN: %swift -target i686--windows-itanium -parse-as-library -parse-stdlib -module-name autolink -module-link-name autolink -autolink-force-load -S -o - %s | %FileCheck %s -check-prefix CHECK-ASM-GNU +// RUN: %swift -target i686--windows-msvc -parse-as-library -parse-stdlib -module-name autolink -module-link-name autolink -autolink-force-load -S -o - %s | %FileCheck %s -check-prefix CHECK-ASM-MSC // CHECK: @"_swift_FORCE_LOAD_$_autolink" = common dllexport global i1 false // CHECK-ASM-GNU: .ascii " -export:__swift_FORCE_LOAD_$_autolink,data" diff --git a/test/IRGen/autolink-coff.swift b/test/IRGen/autolink-coff.swift index cf57eff7031c3..ded2e97c9be60 100644 --- a/test/IRGen/autolink-coff.swift +++ b/test/IRGen/autolink-coff.swift @@ -2,16 +2,16 @@ // RUN: mkdir -p %t // RUN: %swift -target thumbv7--windows-gnu -parse-as-library -parse-stdlib -emit-module-path %t/module.swiftmodule -module-name module -module-link-name module %s -// RUN: %swift -target thumbv7--windows-gnu -parse-as-library -parse-stdlib -module-name autolink -I %t -D MAIN_MODULE -emit-ir -o - %s | FileCheck %s -check-prefix CHECK-GNU-IR -// RUN: %swift -target thumbv7--windows-gnu -parse-as-library -parse-stdlib -module-name autolink -I %t -D MAIN_MODULE -S -o - %s | FileCheck %s -check-prefix CHECK-GNU-ASM +// RUN: %swift -target thumbv7--windows-gnu -parse-as-library -parse-stdlib -module-name autolink -I %t -D MAIN_MODULE -emit-ir -o - %s | %FileCheck %s -check-prefix CHECK-GNU-IR +// RUN: %swift -target thumbv7--windows-gnu -parse-as-library -parse-stdlib -module-name autolink -I %t -D MAIN_MODULE -S -o - %s | %FileCheck %s -check-prefix CHECK-GNU-ASM // RUN: %swift -target thumbv7--windows-itanium -parse-as-library -parse-stdlib -emit-module-path %t/module.swiftmodule -module-name module -module-link-name module %s -// RUN: %swift -target thumbv7--windows-itanium -parse-as-library -parse-stdlib -module-name autolink -I %t -D MAIN_MODULE -emit-ir -o - %s | FileCheck %s -check-prefix CHECK-MSVC-IR -// RUN: %swift -target thumbv7--windows-itanium -parse-as-library -parse-stdlib -module-name autolink -I %t -D MAIN_MODULE -S -o - %s | FileCheck %s -check-prefix CHECK-MSVC-ASM +// RUN: %swift -target thumbv7--windows-itanium -parse-as-library -parse-stdlib -module-name autolink -I %t -D MAIN_MODULE -emit-ir -o - %s | %FileCheck %s -check-prefix CHECK-MSVC-IR +// RUN: %swift -target thumbv7--windows-itanium -parse-as-library -parse-stdlib -module-name autolink -I %t -D MAIN_MODULE -S -o - %s | %FileCheck %s -check-prefix CHECK-MSVC-ASM // RUN: %swift -target thumbv7--windows-msvc -parse-as-library -parse-stdlib -emit-module-path %t/module.swiftmodule -module-name module -module-link-name module %s -// RUN: %swift -target thumbv7--windows-msvc -parse-as-library -parse-stdlib -module-name autolink -I %t -D MAIN_MODULE -emit-ir -o - %s | FileCheck %s -check-prefix CHECK-MSVC-IR -// RUN: %swift -target thumbv7--windows-msvc -parse-as-library -parse-stdlib -module-name autolink -I %t -D MAIN_MODULE -S -o - %s | FileCheck %s -check-prefix CHECK-MSVC-ASM +// RUN: %swift -target thumbv7--windows-msvc -parse-as-library -parse-stdlib -module-name autolink -I %t -D MAIN_MODULE -emit-ir -o - %s | %FileCheck %s -check-prefix CHECK-MSVC-IR +// RUN: %swift -target thumbv7--windows-msvc -parse-as-library -parse-stdlib -module-name autolink -I %t -D MAIN_MODULE -S -o - %s | %FileCheck %s -check-prefix CHECK-MSVC-ASM // REQUIRES: CODEGENERATOR=ARM diff --git a/test/IRGen/autolink-psei.swift b/test/IRGen/autolink-psei.swift index 2fb66998f46be..392b15c3a23a7 100644 --- a/test/IRGen/autolink-psei.swift +++ b/test/IRGen/autolink-psei.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: %swift -target x86_64-scei-ps4 -parse-as-library -parse-stdlib -emit-module-path %t/module.swiftmodule -module-name module -module-link-name module %s -// RUN: %swift -target x86_64-scei-ps4 -parse-as-library -parse-stdlib -module-name autolink -I %t -D MAIN_MODULE -emit-ir -o - %s | FileCheck %s -check-prefix CHECK-IR +// RUN: %swift -target x86_64-scei-ps4 -parse-as-library -parse-stdlib -module-name autolink -I %t -D MAIN_MODULE -emit-ir -o - %s | %FileCheck %s -check-prefix CHECK-IR #if MAIN_MODULE import module diff --git a/test/IRGen/autolink_elf.swift b/test/IRGen/autolink_elf.swift index 32d0ba726e906..573bdfaacce73 100644 --- a/test/IRGen/autolink_elf.swift +++ b/test/IRGen/autolink_elf.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %swift -target x86_64-unknown-linux-gnu -emit-module -parse-stdlib -o %t -module-name Empty -module-link-name swiftEmpty %S/../Inputs/empty.swift -// RUN: %swift -target x86_64-unknown-linux-gnu %s -I %t -parse-stdlib -disable-objc-interop -module-name main -emit-ir -o - | FileCheck %s +// RUN: %swift -target x86_64-unknown-linux-gnu %s -I %t -parse-stdlib -disable-objc-interop -module-name main -emit-ir -o - | %FileCheck %s // REQUIRES: CODEGENERATOR=X86 diff --git a/test/IRGen/autorelease.sil b/test/IRGen/autorelease.sil index 9e3e90119961b..1ce783cd3c26c 100644 --- a/test/IRGen/autorelease.sil +++ b/test/IRGen/autorelease.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir | FileCheck -check-prefix=%target-cpu %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir | %FileCheck -check-prefix=%target-cpu %s // REQUIRES: objc_interop // rdar://16565958 diff --git a/test/IRGen/autorelease_optimized_aarch64.sil b/test/IRGen/autorelease_optimized_aarch64.sil index 1348613db9f09..e6e3d1e1d0d37 100644 --- a/test/IRGen/autorelease_optimized_aarch64.sil +++ b/test/IRGen/autorelease_optimized_aarch64.sil @@ -1,4 +1,4 @@ -// RUN: %swift -gnone -O -target arm64-apple-ios7 -emit-assembly %s -o - | FileCheck %s +// RUN: %swift -gnone -O -target arm64-apple-ios7 -emit-assembly %s -o - | %FileCheck %s // REQUIRES: CODEGENERATOR=AArch64 diff --git a/test/IRGen/autorelease_optimized_armv7.sil b/test/IRGen/autorelease_optimized_armv7.sil index 070b4f85b77cb..4bd8766129cf0 100644 --- a/test/IRGen/autorelease_optimized_armv7.sil +++ b/test/IRGen/autorelease_optimized_armv7.sil @@ -1,4 +1,4 @@ -// RUN: %swift -gnone -O -target armv7-apple-ios7 -emit-assembly %s -o - | FileCheck %s +// RUN: %swift -gnone -O -target armv7-apple-ios7 -emit-assembly %s -o - | %FileCheck %s // REQUIRES: CODEGENERATOR=ARM diff --git a/test/IRGen/autorelease_optimized_x86_64.sil b/test/IRGen/autorelease_optimized_x86_64.sil index e689038a41b22..39142c689e85e 100644 --- a/test/IRGen/autorelease_optimized_x86_64.sil +++ b/test/IRGen/autorelease_optimized_x86_64.sil @@ -1,4 +1,4 @@ -// RUN: %swift -gnone -O -target x86_64-apple-macosx10.9 -emit-assembly %s -o - | FileCheck %s +// RUN: %swift -gnone -O -target x86_64-apple-macosx10.9 -emit-assembly %s -o - | %FileCheck %s // REQUIRES: CODEGENERATOR=X86 diff --git a/test/IRGen/bitcast.sil b/test/IRGen/bitcast.sil index 7ed2c297d1754..a7159712542bb 100644 --- a/test/IRGen/bitcast.sil +++ b/test/IRGen/bitcast.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir| FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-cpu %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir| %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-cpu %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/bitcast_different_size.sil b/test/IRGen/bitcast_different_size.sil index 5ea95d6572a98..e24411098724b 100644 --- a/test/IRGen/bitcast_different_size.sil +++ b/test/IRGen/bitcast_different_size.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s -verify | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s -verify | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/boxed_existential.sil b/test/IRGen/boxed_existential.sil index 4eb90d65445af..bd385120aa099 100644 --- a/test/IRGen/boxed_existential.sil +++ b/test/IRGen/boxed_existential.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-%target-runtime +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-%target-runtime import Swift diff --git a/test/IRGen/bridge_object_arm64.sil b/test/IRGen/bridge_object_arm64.sil index fd1f76c3af076..ed3e051e8b7e9 100644 --- a/test/IRGen/bridge_object_arm64.sil +++ b/test/IRGen/bridge_object_arm64.sil @@ -1,4 +1,4 @@ -// RUN: %swift -module-name bridge_object -emit-ir -target arm64-apple-ios8.0 %s | FileCheck %s +// RUN: %swift -module-name bridge_object -emit-ir -target arm64-apple-ios8.0 %s | %FileCheck %s // REQUIRES: CODEGENERATOR=AArch64 diff --git a/test/IRGen/bridge_object_armv7.sil b/test/IRGen/bridge_object_armv7.sil index 7bf06bac990c9..654fe1c5d8baf 100644 --- a/test/IRGen/bridge_object_armv7.sil +++ b/test/IRGen/bridge_object_armv7.sil @@ -1,4 +1,4 @@ -// RUN: %swift -module-name bridge_object -emit-ir -target armv7-apple-ios8.0 %s | FileCheck %s +// RUN: %swift -module-name bridge_object -emit-ir -target armv7-apple-ios8.0 %s | %FileCheck %s // REQUIRES: CODEGENERATOR=ARM diff --git a/test/IRGen/bridge_object_x86_64.sil b/test/IRGen/bridge_object_x86_64.sil index 070fc8771f83b..7890abf8a6ad7 100644 --- a/test/IRGen/bridge_object_x86_64.sil +++ b/test/IRGen/bridge_object_x86_64.sil @@ -1,4 +1,4 @@ -// RUN: %swift -module-name bridge_object -emit-ir -target x86_64-apple-macosx10.9 %s | FileCheck %s +// RUN: %swift -module-name bridge_object -emit-ir -target x86_64-apple-macosx10.9 %s | %FileCheck %s // REQUIRES: CODEGENERATOR=X86 diff --git a/test/IRGen/builtin_math.swift b/test/IRGen/builtin_math.swift index 254c2ee991b5c..7e32c0ee1ec2a 100644 --- a/test/IRGen/builtin_math.swift +++ b/test/IRGen/builtin_math.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // XFAIL: linux diff --git a/test/IRGen/builtin_word.sil b/test/IRGen/builtin_word.sil index 7516adc0968a3..542078eb80176 100644 --- a/test/IRGen/builtin_word.sil +++ b/test/IRGen/builtin_word.sil @@ -1,5 +1,5 @@ -// RUN: %swift -target x86_64-apple-macosx10.9 %s -gnone -emit-ir -o - | FileCheck %s -check-prefix=INTEL -// RUN: %swift -target armv7-apple-ios7 %s -gnone -emit-ir -o - | FileCheck %s -check-prefix=ARM32 +// RUN: %swift -target x86_64-apple-macosx10.9 %s -gnone -emit-ir -o - | %FileCheck %s -check-prefix=INTEL +// RUN: %swift -target armv7-apple-ios7 %s -gnone -emit-ir -o - | %FileCheck %s -check-prefix=ARM32 // REQUIRES: ARM diff --git a/test/IRGen/builtins.swift b/test/IRGen/builtins.swift index 7862df06e326f..8ad6a7632f812 100644 --- a/test/IRGen/builtins.swift +++ b/test/IRGen/builtins.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-stdlib -primary-file %s -emit-ir -o - -disable-objc-attr-requires-foundation-module | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime +// RUN: %target-swift-frontend -parse-stdlib -primary-file %s -emit-ir -o - -disable-objc-attr-requires-foundation-module | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime // REQUIRES: executable_test // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/c_function_pointer.sil b/test/IRGen/c_function_pointer.sil index 492cfc0eb3f9e..01b910ea2a31a 100644 --- a/test/IRGen/c_function_pointer.sil +++ b/test/IRGen/c_function_pointer.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s import Swift diff --git a/test/IRGen/c_functions.swift b/test/IRGen/c_functions.swift index 91eebf6ccf7c9..749d5482208ad 100644 --- a/test/IRGen/c_functions.swift +++ b/test/IRGen/c_functions.swift @@ -1,5 +1,5 @@ // RUN: rm -rf %t && mkdir -p %t -// RUN: %target-swift-frontend -import-objc-header %S/Inputs/c_functions.h -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -import-objc-header %S/Inputs/c_functions.h -primary-file %s -emit-ir | %FileCheck %s // This is deliberately not a SIL test so that we can test SILGen too. diff --git a/test/IRGen/c_globals.swift b/test/IRGen/c_globals.swift index 7ad6381884195..2586e84a595e2 100644 --- a/test/IRGen/c_globals.swift +++ b/test/IRGen/c_globals.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/abi %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/abi %s -emit-ir | %FileCheck %s import c_layout diff --git a/test/IRGen/c_layout.sil b/test/IRGen/c_layout.sil index 297d861d3d995..50b808f78a45b 100644 --- a/test/IRGen/c_layout.sil +++ b/test/IRGen/c_layout.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -I %S/Inputs/abi %s -emit-ir | FileCheck %s --check-prefix=CHECK-%target-cpu +// RUN: %target-swift-frontend -I %S/Inputs/abi %s -emit-ir | %FileCheck %s --check-prefix=CHECK-%target-cpu sil_stage canonical import c_layout diff --git a/test/IRGen/casts.sil b/test/IRGen/casts.sil index 6635fd5719ecf..54e403b9bc272 100644 --- a/test/IRGen/casts.sil +++ b/test/IRGen/casts.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-disable-pass="External Defs To Decls" %s -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-disable-pass="External Defs To Decls" %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 // XFAIL: linux diff --git a/test/IRGen/cf.sil b/test/IRGen/cf.sil index 9492ee87111fd..845d7de047595 100644 --- a/test/IRGen/cf.sil +++ b/test/IRGen/cf.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs %s -emit-ir -import-cf-types | FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize %s +// RUN: %target-swift-frontend -sdk %S/Inputs %s -emit-ir -import-cf-types | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize %s // REQUIRES: CPU=i386_or_x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/clang_inline.swift b/test/IRGen/clang_inline.swift index 4d6f2625a9c17..4f614fcfc75df 100644 --- a/test/IRGen/clang_inline.swift +++ b/test/IRGen/clang_inline.swift @@ -1,11 +1,11 @@ // RUN: rm -rf %t && mkdir -p %t -// RUN: %target-swift-frontend -sdk %S/Inputs -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -primary-file %s -emit-ir | %FileCheck %s // RUN: mkdir -p %t/Empty.framework/Modules/Empty.swiftmodule // RUN: %target-swift-frontend -emit-module-path %t/Empty.framework/Modules/Empty.swiftmodule/%target-swiftmodule-name %S/../Inputs/empty.swift -module-name Empty // RUN: %target-swift-frontend -sdk %S/Inputs -primary-file %s -F %t -DIMPORT_EMPTY -emit-ir > %t.ll -// RUN: FileCheck %s < %t.ll -// RUN: FileCheck -check-prefix=NEGATIVE %s < %t.ll +// RUN: %FileCheck %s < %t.ll +// RUN: %FileCheck -check-prefix=NEGATIVE %s < %t.ll // REQUIRES: CPU=i386_or_x86_64 // XFAIL: linux diff --git a/test/IRGen/clang_inline_reverse.swift b/test/IRGen/clang_inline_reverse.swift index a9f489677be9e..1a743ac7f2497 100644 --- a/test/IRGen/clang_inline_reverse.swift +++ b/test/IRGen/clang_inline_reverse.swift @@ -1,6 +1,6 @@ // Same test as clang_inline.swift, but with the order swapped. -// RUN: %target-swift-frontend -sdk %S/Inputs -primary-file %s -emit-ir -module-name clang_inline | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -primary-file %s -emit-ir -module-name clang_inline | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 // XFAIL: linux diff --git a/test/IRGen/class.sil b/test/IRGen/class.sil index 702c6dd337678..8d58f063bce46 100644 --- a/test/IRGen/class.sil +++ b/test/IRGen/class.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/class_bounded_generics.swift b/test/IRGen/class_bounded_generics.swift index 5d0bb2901eec0..e69d0045cde94 100644 --- a/test/IRGen/class_bounded_generics.swift +++ b/test/IRGen/class_bounded_generics.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir -primary-file %s -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -emit-ir -primary-file %s -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: CPU=x86_64 // XFAIL: linux diff --git a/test/IRGen/class_constraint.sil b/test/IRGen/class_constraint.sil index 04c7b0786c806..89a50a6a1eb48 100644 --- a/test/IRGen/class_constraint.sil +++ b/test/IRGen/class_constraint.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir -primary-file %s | %FileCheck %s protocol P {} class A : P {} diff --git a/test/IRGen/class_isa_pointers.sil b/test/IRGen/class_isa_pointers.sil index 42b7e03f0e4fb..91f757aabcf2d 100644 --- a/test/IRGen/class_isa_pointers.sil +++ b/test/IRGen/class_isa_pointers.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/class_isa_pointers_armv7k_watchos.sil b/test/IRGen/class_isa_pointers_armv7k_watchos.sil index 60f3c6ac98984..47bd4c4883567 100644 --- a/test/IRGen/class_isa_pointers_armv7k_watchos.sil +++ b/test/IRGen/class_isa_pointers_armv7k_watchos.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: CPU=armv7k, OS=watchos // REQUIRES: objc_interop diff --git a/test/IRGen/class_resilience.swift b/test/IRGen/class_resilience.swift index 4e0e838abb958..c917193933f3f 100644 --- a/test/IRGen/class_resilience.swift +++ b/test/IRGen/class_resilience.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-ir -enable-resilience %s | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime +// RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-ir -enable-resilience %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime // RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-ir -enable-resilience -O %s // CHECK: %swift.type = type { [[INT:i32|i64]] } diff --git a/test/IRGen/class_resilience_objc.swift b/test/IRGen/class_resilience_objc.swift index e25f9e6a4291d..7ed403e6698cc 100644 --- a/test/IRGen/class_resilience_objc.swift +++ b/test/IRGen/class_resilience_objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-source-import -emit-ir -o - -primary-file %s | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-source-import -emit-ir -o - -primary-file %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop diff --git a/test/IRGen/class_stack_alloc.sil b/test/IRGen/class_stack_alloc.sil index 29b57208320c5..6c0611cd39145 100644 --- a/test/IRGen/class_stack_alloc.sil +++ b/test/IRGen/class_stack_alloc.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -stack-promotion-limit 48 -Onone -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -stack-promotion-limit 48 -Onone -emit-ir %s | %FileCheck %s import Builtin import Swift diff --git a/test/IRGen/class_with_stub_initializers.swift b/test/IRGen/class_with_stub_initializers.swift index 76903f8bb7ba8..3a6c0785b6f6f 100644 --- a/test/IRGen/class_with_stub_initializers.swift +++ b/test/IRGen/class_with_stub_initializers.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/closure.swift b/test/IRGen/closure.swift index 8ea5b8c2c6552..daec9f93923f1 100644 --- a/test/IRGen/closure.swift +++ b/test/IRGen/closure.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/concrete_inherits_generic_base.swift b/test/IRGen/concrete_inherits_generic_base.swift index 062002c390891..97c26f438ca01 100644 --- a/test/IRGen/concrete_inherits_generic_base.swift +++ b/test/IRGen/concrete_inherits_generic_base.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -module-name foo -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -module-name foo -emit-ir %s | %FileCheck %s // CHECK: %swift.type = type { [[INT:i32|i64]] } diff --git a/test/IRGen/condfail.sil b/test/IRGen/condfail.sil index 0214477415c93..8f1fb83811129 100644 --- a/test/IRGen/condfail.sil +++ b/test/IRGen/condfail.sil @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -primary-file %s -O -g -S | FileCheck %s --check-prefix CHECK --check-prefix CHECK-%target-cpu --check-prefix CHECK-OPT-%target-os -// RUN: %target-swift-frontend -primary-file %s -g -S | FileCheck %s --check-prefix CHECK --check-prefix CHECK-%target-cpu --check-prefix CHECK-NOOPT-%target-os +// RUN: %target-swift-frontend -primary-file %s -O -g -S | %FileCheck %s --check-prefix CHECK --check-prefix CHECK-%target-cpu --check-prefix CHECK-OPT-%target-os +// RUN: %target-swift-frontend -primary-file %s -g -S | %FileCheck %s --check-prefix CHECK --check-prefix CHECK-%target-cpu --check-prefix CHECK-NOOPT-%target-os import Builtin import Swift diff --git a/test/IRGen/coverage.swift b/test/IRGen/coverage.swift index 9bcd6bddb2ef0..4e5d40d99660e 100644 --- a/test/IRGen/coverage.swift +++ b/test/IRGen/coverage.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend %s -profile-generate -profile-coverage-mapping -emit-sil -o - | FileCheck %s --check-prefix=SIL -// RUN: %target-swift-frontend %s -profile-generate -profile-coverage-mapping -emit-ir -o - | FileCheck %s --check-prefix=IR +// RUN: %target-swift-frontend %s -profile-generate -profile-coverage-mapping -emit-sil -o - | %FileCheck %s --check-prefix=SIL +// RUN: %target-swift-frontend %s -profile-generate -profile-coverage-mapping -emit-ir -o - | %FileCheck %s --check-prefix=IR // SIL-DAG: sil hidden @_TF8coverage2f1FT_T_ // SIL-DAG: string_literal utf8 "{{.*}}coverage.swift:{{.*}}_TF8coverage2f1FT_T_" diff --git a/test/IRGen/coverage_with_asan.swift b/test/IRGen/coverage_with_asan.swift index 25f9adace87fb..63803d72d2b62 100644 --- a/test/IRGen/coverage_with_asan.swift +++ b/test/IRGen/coverage_with_asan.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -profile-generate -profile-coverage-mapping -sanitize=address -emit-ir -o - | FileCheck %s +// RUN: %target-swift-frontend %s -profile-generate -profile-coverage-mapping -sanitize=address -emit-ir -o - | %FileCheck %s // REQUIRES: OS=macosx // CHECK: main diff --git a/test/IRGen/deallocate.swift b/test/IRGen/deallocate.swift index 89018d54ba6b0..c11c064d441e5 100644 --- a/test/IRGen/deallocate.swift +++ b/test/IRGen/deallocate.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/decls.swift b/test/IRGen/decls.swift index 72d1813904005..3595604123d54 100644 --- a/test/IRGen/decls.swift +++ b/test/IRGen/decls.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s // Check that we emit all local decls, not just the first one. func test1() { diff --git a/test/IRGen/dependent-library.swift b/test/IRGen/dependent-library.swift index e9dc804a042c3..4c27b5ef2bf32 100644 --- a/test/IRGen/dependent-library.swift +++ b/test/IRGen/dependent-library.swift @@ -1,4 +1,4 @@ -// RUN: %swift -target i686-unknown-windows-msvc -emit-ir -parse-as-library -parse-stdlib -module-name dependent -autolink-library oldnames -autolink-library msvcrt %s -o - | FileCheck %s +// RUN: %swift -target i686-unknown-windows-msvc -emit-ir -parse-as-library -parse-stdlib -module-name dependent -autolink-library oldnames -autolink-library msvcrt %s -o - | %FileCheck %s // CHECK: !{i32 6, !"Linker Options", ![[options:[0-9]+]]} // CHECK: ![[options]] = !{![[oldnames:[0-9]+]], ![[msvcrtd:[0-9]+]]} diff --git a/test/IRGen/dependent_reabstraction.swift b/test/IRGen/dependent_reabstraction.swift index 0c13673a69d52..4091d96651060 100644 --- a/test/IRGen/dependent_reabstraction.swift +++ b/test/IRGen/dependent_reabstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/IRGen/dllexport.swift b/test/IRGen/dllexport.swift index 5955ef8d3add7..f9c616de8e765 100644 --- a/test/IRGen/dllexport.swift +++ b/test/IRGen/dllexport.swift @@ -1,5 +1,5 @@ -// RUN: %swift -target thumbv7--windows-itanium -emit-ir -parse-as-library -parse-stdlib -module-name dllexport %s -o - | FileCheck %s -check-prefix CHECK -check-prefix CHECK-NO-OPT -// RUN: %swift -target thumbv7--windows-itanium -O -emit-ir -parse-as-library -parse-stdlib -module-name dllexport %s -o - | FileCheck %s -check-prefix CHECK -check-prefix CHECK-OPT +// RUN: %swift -target thumbv7--windows-itanium -emit-ir -parse-as-library -parse-stdlib -module-name dllexport %s -o - | %FileCheck %s -check-prefix CHECK -check-prefix CHECK-NO-OPT +// RUN: %swift -target thumbv7--windows-itanium -O -emit-ir -parse-as-library -parse-stdlib -module-name dllexport %s -o - | %FileCheck %s -check-prefix CHECK -check-prefix CHECK-OPT // REQUIRES: CODEGENERATOR=ARM diff --git a/test/IRGen/dllimport.swift b/test/IRGen/dllimport.swift index da1178531a1c7..b9d39bcc4d583 100644 --- a/test/IRGen/dllimport.swift +++ b/test/IRGen/dllimport.swift @@ -1,5 +1,5 @@ -// RUN: %swift -target thumbv7--windows-itanium -emit-ir -parse-as-library -parse-stdlib -module-name dllimport %s -o - -enable-source-import -I %S | FileCheck %s -check-prefix CHECK -check-prefix CHECK-NO-OPT -// RUN: %swift -target thumbv7--windows-itanium -O -emit-ir -parse-as-library -parse-stdlib -module-name dllimport %s -o - -enable-source-import -I %S | FileCheck %s -check-prefix CHECK -check-prefix CHECK-OPT +// RUN: %swift -target thumbv7--windows-itanium -emit-ir -parse-as-library -parse-stdlib -module-name dllimport %s -o - -enable-source-import -I %S | %FileCheck %s -check-prefix CHECK -check-prefix CHECK-NO-OPT +// RUN: %swift -target thumbv7--windows-itanium -O -emit-ir -parse-as-library -parse-stdlib -module-name dllimport %s -o - -enable-source-import -I %S | %FileCheck %s -check-prefix CHECK -check-prefix CHECK-OPT // REQUIRES: CODEGENERATOR=ARM diff --git a/test/IRGen/dynamic_cast.sil b/test/IRGen/dynamic_cast.sil index cbbed04edf595..f0147f683b426 100644 --- a/test/IRGen/dynamic_cast.sil +++ b/test/IRGen/dynamic_cast.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/dynamic_init.sil b/test/IRGen/dynamic_init.sil index 9e1bb55869694..c2aff16125d5c 100644 --- a/test/IRGen/dynamic_init.sil +++ b/test/IRGen/dynamic_init.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/dynamic_lookup.sil b/test/IRGen/dynamic_lookup.sil index a962f9c4f78d4..2714a5d8e772a 100644 --- a/test/IRGen/dynamic_lookup.sil +++ b/test/IRGen/dynamic_lookup.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/dynamic_self.sil b/test/IRGen/dynamic_self.sil index ac166999a9c86..7b436b0b11f1d 100644 --- a/test/IRGen/dynamic_self.sil +++ b/test/IRGen/dynamic_self.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/dynamic_self_metadata.swift b/test/IRGen/dynamic_self_metadata.swift index dd7873e76138c..6217426e9f0f8 100644 --- a/test/IRGen/dynamic_self_metadata.swift +++ b/test/IRGen/dynamic_self_metadata.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -parse-as-library | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -parse-as-library | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/empty_array.sil b/test/IRGen/empty_array.sil index 4d2716d121e6f..e6fb6438758fc 100644 --- a/test/IRGen/empty_array.sil +++ b/test/IRGen/empty_array.sil @@ -1,9 +1,9 @@ -// RUN: %swift -target x86_64-apple-macosx10.9 -module-name main %s -emit-ir -o - | FileCheck -check-prefix=CHECK-64 %s -// RUN: %swift -target i386-apple-ios7.1 %s -module-name main -emit-ir -o - | FileCheck -check-prefix=CHECK-32 %s -// RUN: %swift -target x86_64-apple-ios7.1 %s -module-name main -emit-ir -o - | FileCheck -check-prefix=CHECK-64 %s -// RUN: %swift -target armv7-apple-ios7.1 %s -module-name main -emit-ir -o - | FileCheck -check-prefix=CHECK-32 %s -// RUN: %swift -target arm64-apple-ios7.1 %s -module-name main -emit-ir -o - | FileCheck -check-prefix=CHECK-64 %s -// RUN: %swift -target x86_64-unknown-linux-gnu -disable-objc-interop %s -module-name main -emit-ir -o - | FileCheck -check-prefix=CHECK-64 %s +// RUN: %swift -target x86_64-apple-macosx10.9 -module-name main %s -emit-ir -o - | %FileCheck -check-prefix=CHECK-64 %s +// RUN: %swift -target i386-apple-ios7.1 %s -module-name main -emit-ir -o - | %FileCheck -check-prefix=CHECK-32 %s +// RUN: %swift -target x86_64-apple-ios7.1 %s -module-name main -emit-ir -o - | %FileCheck -check-prefix=CHECK-64 %s +// RUN: %swift -target armv7-apple-ios7.1 %s -module-name main -emit-ir -o - | %FileCheck -check-prefix=CHECK-32 %s +// RUN: %swift -target arm64-apple-ios7.1 %s -module-name main -emit-ir -o - | %FileCheck -check-prefix=CHECK-64 %s +// RUN: %swift -target x86_64-unknown-linux-gnu -disable-objc-interop %s -module-name main -emit-ir -o - | %FileCheck -check-prefix=CHECK-64 %s // REQUIRES: X86 // REQUIRES: ARM diff --git a/test/IRGen/enum.sil b/test/IRGen/enum.sil index 61597ebe5bd11..8bd5819a0de8d 100644 --- a/test/IRGen/enum.sil +++ b/test/IRGen/enum.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -gnone -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-%target-runtime-%target-ptrsize +// RUN: %target-swift-frontend %s -gnone -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-%target-runtime-%target-ptrsize // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/enum_32_bit.sil b/test/IRGen/enum_32_bit.sil index d3af2b9507003..89b10579c03f7 100644 --- a/test/IRGen/enum_32_bit.sil +++ b/test/IRGen/enum_32_bit.sil @@ -1,5 +1,5 @@ -// RUN: %swift -target i386-apple-ios7 %s -gnone -emit-ir | FileCheck %s -// RUN: %swift -target armv7-apple-ios7 %s -gnone -emit-ir | FileCheck %s +// RUN: %swift -target i386-apple-ios7 %s -gnone -emit-ir | %FileCheck %s +// RUN: %swift -target armv7-apple-ios7 %s -gnone -emit-ir | %FileCheck %s // REQUIRES: X86 // REQUIRES: ARM diff --git a/test/IRGen/enum_derived.swift b/test/IRGen/enum_derived.swift index 40c2219d39200..c05f7015f641f 100644 --- a/test/IRGen/enum_derived.swift +++ b/test/IRGen/enum_derived.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -module-name def_enum -o %t %S/Inputs/def_enum.swift -// RUN: %target-swift-frontend -I %t -O -primary-file %s -emit-ir | FileCheck -check-prefix=CHECK -check-prefix=CHECK-NORMAL %s -// RUN: %target-swift-frontend -I %t -O -primary-file %s -enable-testing -emit-ir | FileCheck -check-prefix=CHECK -check-prefix=CHECK-TESTABLE %s +// RUN: %target-swift-frontend -I %t -O -primary-file %s -emit-ir | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-NORMAL %s +// RUN: %target-swift-frontend -I %t -O -primary-file %s -enable-testing -emit-ir | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-TESTABLE %s import def_enum diff --git a/test/IRGen/enum_dynamic_multi_payload.sil b/test/IRGen/enum_dynamic_multi_payload.sil index ebbc0f472c60a..8b0242dbb1198 100644 --- a/test/IRGen/enum_dynamic_multi_payload.sil +++ b/test/IRGen/enum_dynamic_multi_payload.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -gnone -emit-ir -I %S/Inputs | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-frontend %s -gnone -emit-ir -I %S/Inputs | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize import Builtin diff --git a/test/IRGen/enum_function.sil b/test/IRGen/enum_function.sil index ee40e48d15b76..f3857ecada6d7 100644 --- a/test/IRGen/enum_function.sil +++ b/test/IRGen/enum_function.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -gnone -emit-ir | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-frontend -primary-file %s -gnone -emit-ir | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/enum_resilience.swift b/test/IRGen/enum_resilience.swift index 2e51f6169c7cb..ce70ef3ee8758 100644 --- a/test/IRGen/enum_resilience.swift +++ b/test/IRGen/enum_resilience.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-ir -enable-resilience %s | FileCheck %s +// RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-ir -enable-resilience %s | %FileCheck %s // RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-ir -enable-resilience -O %s import resilient_enum diff --git a/test/IRGen/enum_spare_bits.sil b/test/IRGen/enum_spare_bits.sil index 03c9fd5266e1a..18a2a5b71a1e2 100644 --- a/test/IRGen/enum_spare_bits.sil +++ b/test/IRGen/enum_spare_bits.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize %s // REQUIRES: CPU=i386_or_x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/enum_switch_singleton_enum_in_optional.sil b/test/IRGen/enum_switch_singleton_enum_in_optional.sil index ed8725478d408..e45eea4ec260e 100644 --- a/test/IRGen/enum_switch_singleton_enum_in_optional.sil +++ b/test/IRGen/enum_switch_singleton_enum_in_optional.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s sil_stage canonical enum Optional { case some(T), none } diff --git a/test/IRGen/enum_value_semantics.sil b/test/IRGen/enum_value_semantics.sil index 70c6c7abe6966..86241dc637940 100644 --- a/test/IRGen/enum_value_semantics.sil +++ b/test/IRGen/enum_value_semantics.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -gnone -emit-ir | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-frontend %s -gnone -emit-ir | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/enum_value_semantics_special_cases.sil b/test/IRGen/enum_value_semantics_special_cases.sil index 96469426be4fb..b90e6f86a7940 100644 --- a/test/IRGen/enum_value_semantics_special_cases.sil +++ b/test/IRGen/enum_value_semantics_special_cases.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/enum_value_semantics_special_cases_objc.sil b/test/IRGen/enum_value_semantics_special_cases_objc.sil index 014e60c22d8a9..500cdbb7e3564 100644 --- a/test/IRGen/enum_value_semantics_special_cases_objc.sil +++ b/test/IRGen/enum_value_semantics_special_cases_objc.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/errors.sil b/test/IRGen/errors.sil index 1f18bc7c0dcdf..607c283c7c51a 100644 --- a/test/IRGen/errors.sil +++ b/test/IRGen/errors.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime +// RUN: %target-swift-frontend -primary-file %s -emit-ir | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime // REQUIRES: executable_test sil_stage canonical diff --git a/test/IRGen/errors_optimized.sil b/test/IRGen/errors_optimized.sil index 3030e7ceb6b19..3a7868c848d0b 100644 --- a/test/IRGen/errors_optimized.sil +++ b/test/IRGen/errors_optimized.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -O -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -O -emit-ir | %FileCheck %s sil_stage canonical diff --git a/test/IRGen/exactcast.sil b/test/IRGen/exactcast.sil index c320205e45935..7e90b8d49fd7a 100644 --- a/test/IRGen/exactcast.sil +++ b/test/IRGen/exactcast.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/existential_metatypes.sil b/test/IRGen/existential_metatypes.sil index 7dd20ef629b9d..23ee2665b374e 100644 --- a/test/IRGen/existential_metatypes.sil +++ b/test/IRGen/existential_metatypes.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir -o - -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir -o - -primary-file %s | %FileCheck %s // REQUIRES: CPU=x86_64 sil_stage canonical diff --git a/test/IRGen/existentials.sil b/test/IRGen/existentials.sil index a0e25dec8f889..dcb90cc2ed61c 100644 --- a/test/IRGen/existentials.sil +++ b/test/IRGen/existentials.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -disable-objc-interop | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -disable-objc-interop | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/existentials_objc.sil b/test/IRGen/existentials_objc.sil index e7d7ba3566d0b..049174922f5e6 100644 --- a/test/IRGen/existentials_objc.sil +++ b/test/IRGen/existentials_objc.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend -sdk %S/Inputs -I %t %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %t %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/expressions.swift b/test/IRGen/expressions.swift index 449799825fafb..9acc7ac447716 100644 --- a/test/IRGen/expressions.swift +++ b/test/IRGen/expressions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -parse-stdlib -disable-access-control | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -parse-stdlib -disable-access-control | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/field_type_vectors.sil b/test/IRGen/field_type_vectors.sil index 666385dcfc884..dcc30eb73dd38 100644 --- a/test/IRGen/field_type_vectors.sil +++ b/test/IRGen/field_type_vectors.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/fixed_size_buffer_peepholes.sil b/test/IRGen/fixed_size_buffer_peepholes.sil index 5ba5daf92848c..9755bd1cd7ab0 100644 --- a/test/IRGen/fixed_size_buffer_peepholes.sil +++ b/test/IRGen/fixed_size_buffer_peepholes.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s import Builtin diff --git a/test/IRGen/fixlifetime.sil b/test/IRGen/fixlifetime.sil index a1e54907a2b3f..5e9d89ddc41ad 100644 --- a/test/IRGen/fixlifetime.sil +++ b/test/IRGen/fixlifetime.sil @@ -1,6 +1,6 @@ -// RUN: %target-swift-frontend -parse-sil -emit-ir -disable-llvm-optzns -O %s | FileCheck --check-prefix=CHECK-%target-runtime %s -// RUN: %target-swift-frontend -parse-sil -emit-ir -disable-llvm-optzns -Ounchecked %s | FileCheck --check-prefix=CHECK-%target-runtime %s -// RUN: %target-swift-frontend -parse-sil -emit-ir -disable-llvm-optzns -Onone %s | FileCheck --check-prefix=ONONE %s +// RUN: %target-swift-frontend -parse-sil -emit-ir -disable-llvm-optzns -O %s | %FileCheck --check-prefix=CHECK-%target-runtime %s +// RUN: %target-swift-frontend -parse-sil -emit-ir -disable-llvm-optzns -Ounchecked %s | %FileCheck --check-prefix=CHECK-%target-runtime %s +// RUN: %target-swift-frontend -parse-sil -emit-ir -disable-llvm-optzns -Onone %s | %FileCheck --check-prefix=ONONE %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/foreign_class_extension.swift b/test/IRGen/foreign_class_extension.swift index 850677896f6d4..851edf6c7a9b9 100644 --- a/test/IRGen/foreign_class_extension.swift +++ b/test/IRGen/foreign_class_extension.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/foreign_types.sil b/test/IRGen/foreign_types.sil index e0c7c51c88e91..f29a7407aeba3 100644 --- a/test/IRGen/foreign_types.sil +++ b/test/IRGen/foreign_types.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -I %S/Inputs/abi %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -I %S/Inputs/abi %s -emit-ir | %FileCheck %s sil_stage canonical import c_layout diff --git a/test/IRGen/fulfillment.sil b/test/IRGen/fulfillment.sil index 66b51298c3d5d..bc37934d2565a 100644 --- a/test/IRGen/fulfillment.sil +++ b/test/IRGen/fulfillment.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/function-target-features.swift b/test/IRGen/function-target-features.swift index bcd9f645126d7..c862dab5c1a38 100644 --- a/test/IRGen/function-target-features.swift +++ b/test/IRGen/function-target-features.swift @@ -1,12 +1,12 @@ // This test verifies that we produce target-cpu and target-features attributes // on functions. -// RUN: %target-swift-frontend -emit-ir -o - %s -Xcc -Xclang -Xcc -target-feature -Xcc -Xclang -Xcc +avx | FileCheck %s -check-prefix=AVX-FEATURE -// RUN: %target-swift-frontend -emit-ir -o - %s -Xcc -Xclang -Xcc -target-feature -Xcc -Xclang -Xcc +avx512f -Xcc -Xclang -Xcc -target-feature -Xcc -Xclang -Xcc +avx512er | FileCheck %s -check-prefix=TWO-AVX -// RUN: %target-swift-frontend -emit-ir -o - %s -Xcc -Xclang -Xcc -target-cpu -Xcc -Xclang -Xcc corei7 | FileCheck %s -check-prefix=CORE-CPU -// RUN: %target-swift-frontend -emit-ir -o - %s -Xcc -Xclang -Xcc -target-cpu -Xcc -Xclang -Xcc corei7 -Xcc -Xclang -Xcc -target-feature -Xcc -Xclang -Xcc +avx | FileCheck %s -check-prefix=CORE-CPU-AND-FEATURES -// RUN: %target-swift-frontend -emit-ir -o - %s -Xcc -Xclang -Xcc -target-cpu -Xcc -Xclang -Xcc x86-64 | FileCheck %s -check-prefix=X86-64-CPU -// RUN: %target-swift-frontend -emit-ir -o - %s -Xcc -Xclang -Xcc -target-cpu -Xcc -Xclang -Xcc corei7-avx -Xcc -Xclang -Xcc -target-feature -Xcc -Xclang -Xcc -avx | FileCheck %s -check-prefix=AVX-MINUS-FEATURE +// RUN: %target-swift-frontend -emit-ir -o - %s -Xcc -Xclang -Xcc -target-feature -Xcc -Xclang -Xcc +avx | %FileCheck %s -check-prefix=AVX-FEATURE +// RUN: %target-swift-frontend -emit-ir -o - %s -Xcc -Xclang -Xcc -target-feature -Xcc -Xclang -Xcc +avx512f -Xcc -Xclang -Xcc -target-feature -Xcc -Xclang -Xcc +avx512er | %FileCheck %s -check-prefix=TWO-AVX +// RUN: %target-swift-frontend -emit-ir -o - %s -Xcc -Xclang -Xcc -target-cpu -Xcc -Xclang -Xcc corei7 | %FileCheck %s -check-prefix=CORE-CPU +// RUN: %target-swift-frontend -emit-ir -o - %s -Xcc -Xclang -Xcc -target-cpu -Xcc -Xclang -Xcc corei7 -Xcc -Xclang -Xcc -target-feature -Xcc -Xclang -Xcc +avx | %FileCheck %s -check-prefix=CORE-CPU-AND-FEATURES +// RUN: %target-swift-frontend -emit-ir -o - %s -Xcc -Xclang -Xcc -target-cpu -Xcc -Xclang -Xcc x86-64 | %FileCheck %s -check-prefix=X86-64-CPU +// RUN: %target-swift-frontend -emit-ir -o - %s -Xcc -Xclang -Xcc -target-cpu -Xcc -Xclang -Xcc corei7-avx -Xcc -Xclang -Xcc -target-feature -Xcc -Xclang -Xcc -avx | %FileCheck %s -check-prefix=AVX-MINUS-FEATURE // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/function_metadata.swift b/test/IRGen/function_metadata.swift index 988d168bfd527..f0220818ca814 100644 --- a/test/IRGen/function_metadata.swift +++ b/test/IRGen/function_metadata.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir -primary-file %s | %FileCheck %s func arch(_ f: F) {} diff --git a/test/IRGen/function_param_convention.sil b/test/IRGen/function_param_convention.sil index 01c6d32fe05b9..d873f6bbda360 100644 --- a/test/IRGen/function_param_convention.sil +++ b/test/IRGen/function_param_convention.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s -module-name Test | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s -module-name Test | %FileCheck %s import Builtin diff --git a/test/IRGen/function_types.sil b/test/IRGen/function_types.sil index 309937a94f5b5..f4e452f28cc31 100644 --- a/test/IRGen/function_types.sil +++ b/test/IRGen/function_types.sil @@ -1,9 +1,9 @@ -// RUN: %swift -target x86_64-apple-macosx10.9 -module-name function_types %s -emit-ir -o - | FileCheck %s -// RUN: %swift -target i386-apple-ios7.1 %s -module-name function_types -emit-ir -o - | FileCheck %s -// RUN: %swift -target x86_64-apple-ios7.1 %s -module-name function_types -emit-ir -o - | FileCheck %s -// RUN: %swift -target armv7-apple-ios7.1 %s -module-name function_types -emit-ir -o - | FileCheck %s -// RUN: %swift -target arm64-apple-ios7.1 %s -module-name function_types -emit-ir -o - | FileCheck %s -// RUN: %swift -target x86_64-unknown-linux-gnu -disable-objc-interop %s -module-name function_types -emit-ir -o - | FileCheck %s +// RUN: %swift -target x86_64-apple-macosx10.9 -module-name function_types %s -emit-ir -o - | %FileCheck %s +// RUN: %swift -target i386-apple-ios7.1 %s -module-name function_types -emit-ir -o - | %FileCheck %s +// RUN: %swift -target x86_64-apple-ios7.1 %s -module-name function_types -emit-ir -o - | %FileCheck %s +// RUN: %swift -target armv7-apple-ios7.1 %s -module-name function_types -emit-ir -o - | %FileCheck %s +// RUN: %swift -target arm64-apple-ios7.1 %s -module-name function_types -emit-ir -o - | %FileCheck %s +// RUN: %swift -target x86_64-unknown-linux-gnu -disable-objc-interop %s -module-name function_types -emit-ir -o - | %FileCheck %s // REQUIRES: X86 // REQUIRES: ARM diff --git a/test/IRGen/generic_casts.swift b/test/IRGen/generic_casts.swift index c4b1353854b91..9e62baa63a1ac 100644 --- a/test/IRGen/generic_casts.swift +++ b/test/IRGen/generic_casts.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/generic_class_anyobject.swift b/test/IRGen/generic_class_anyobject.swift index 8ab93870f69f3..5035a82709540 100644 --- a/test/IRGen/generic_class_anyobject.swift +++ b/test/IRGen/generic_class_anyobject.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/generic_classes.sil b/test/IRGen/generic_classes.sil index 1a7a0ea609103..24a5ee34cb365 100644 --- a/test/IRGen/generic_classes.sil +++ b/test/IRGen/generic_classes.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/generic_classes_objc.sil b/test/IRGen/generic_classes_objc.sil index 4e4e990802008..a8aca5c17bb57 100644 --- a/test/IRGen/generic_classes_objc.sil +++ b/test/IRGen/generic_classes_objc.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/generic_metatypes.swift b/test/IRGen/generic_metatypes.swift index 82cc76415135c..a9f704f5ffbb6 100644 --- a/test/IRGen/generic_metatypes.swift +++ b/test/IRGen/generic_metatypes.swift @@ -1,15 +1,15 @@ -// RUN: %swift -target x86_64-apple-macosx10.9 -emit-ir -parse-stdlib -primary-file %s | FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s -// RUN: %swift -target i386-apple-ios7.0 -emit-ir -parse-stdlib -primary-file %s | FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s -// RUN: %swift -target x86_64-apple-ios7.0 -emit-ir -parse-stdlib -primary-file %s | FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s -// RUN: %swift -target i386-apple-tvos9.0 -emit-ir -parse-stdlib -primary-file %s | FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s -// RUN: %swift -target x86_64-apple-tvos9.0 -emit-ir -parse-stdlib -primary-file %s | FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s -// RUN: %swift -target i386-apple-watchos2.0 -emit-ir -parse-stdlib -primary-file %s | FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s -// RUN: %swift -target armv7-apple-ios7.0 -emit-ir -parse-stdlib -primary-file %s | FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s -// RUN: %swift -target arm64-apple-ios7.0 -emit-ir -parse-stdlib -primary-file %s | FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s -// RUN: %swift -target armv7-apple-tvos9.0 -emit-ir -parse-stdlib -primary-file %s | FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s -// RUN: %swift -target arm64-apple-tvos9.0 -emit-ir -parse-stdlib -primary-file %s | FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s -// RUN: %swift -target armv7k-apple-watchos2.0 -emit-ir -parse-stdlib -primary-file %s | FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s -// RUN: %swift -target x86_64-unknown-linux-gnu -disable-objc-interop -emit-ir -parse-stdlib -primary-file %s | FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s +// RUN: %swift -target x86_64-apple-macosx10.9 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s +// RUN: %swift -target i386-apple-ios7.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s +// RUN: %swift -target x86_64-apple-ios7.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s +// RUN: %swift -target i386-apple-tvos9.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s +// RUN: %swift -target x86_64-apple-tvos9.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s +// RUN: %swift -target i386-apple-watchos2.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s +// RUN: %swift -target armv7-apple-ios7.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s +// RUN: %swift -target arm64-apple-ios7.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s +// RUN: %swift -target armv7-apple-tvos9.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s +// RUN: %swift -target arm64-apple-tvos9.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s +// RUN: %swift -target armv7k-apple-watchos2.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s +// RUN: %swift -target x86_64-unknown-linux-gnu -disable-objc-interop -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s // REQUIRES: X86 diff --git a/test/IRGen/generic_structs.sil b/test/IRGen/generic_structs.sil index 22a599d4a3400..003873164173d 100644 --- a/test/IRGen/generic_structs.sil +++ b/test/IRGen/generic_structs.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/generic_ternary.swift b/test/IRGen/generic_ternary.swift index df5e1b45ad808..48c0ad8109312 100644 --- a/test/IRGen/generic_ternary.swift +++ b/test/IRGen/generic_ternary.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/generic_tuples.swift b/test/IRGen/generic_tuples.swift index e75ba0dc6127b..f86f37f8c98b8 100644 --- a/test/IRGen/generic_tuples.swift +++ b/test/IRGen/generic_tuples.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir -primary-file %s | %FileCheck %s // Make sure that optimization passes don't choke on storage types for generic tuples // RUN: %target-swift-frontend -emit-ir -O %s diff --git a/test/IRGen/generic_types.swift b/test/IRGen/generic_types.swift index 49136aad3b3c9..e1b8af8be1dac 100644 --- a/test/IRGen/generic_types.swift +++ b/test/IRGen/generic_types.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/global_resilience.sil b/test/IRGen/global_resilience.sil index b98ce3753962a..fdbc117b8349e 100644 --- a/test/IRGen/global_resilience.sil +++ b/test/IRGen/global_resilience.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-ir -enable-resilience %s | FileCheck %s +// RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-ir -enable-resilience %s | %FileCheck %s // RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-ir -enable-resilience -O %s // CHECK: %swift.type = type { [[INT:i32|i64]] } diff --git a/test/IRGen/globals.swift b/test/IRGen/globals.swift index 6d657c0198045..5f9ac83127364 100644 --- a/test/IRGen/globals.swift +++ b/test/IRGen/globals.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/indexing.sil b/test/IRGen/indexing.sil index f5a9d1f8fcfbb..772741498b0ea 100644 --- a/test/IRGen/indexing.sil +++ b/test/IRGen/indexing.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/indirect_argument.sil b/test/IRGen/indirect_argument.sil index 398957d63fb8f..8cc2f395ac72a 100644 --- a/test/IRGen/indirect_argument.sil +++ b/test/IRGen/indirect_argument.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck -check-prefix=CHECK -check-prefix=CHECK-%target-ptrsize %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-%target-ptrsize %s import Swift import Builtin diff --git a/test/IRGen/indirect_enum.sil b/test/IRGen/indirect_enum.sil index 0bf6e99cdbbd2..c6a7fffd05856 100644 --- a/test/IRGen/indirect_enum.sil +++ b/test/IRGen/indirect_enum.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize import Swift diff --git a/test/IRGen/indirect_return.swift b/test/IRGen/indirect_return.swift index 4378fec0f1a18..b39eee574b3f6 100644 --- a/test/IRGen/indirect_return.swift +++ b/test/IRGen/indirect_return.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/infinite_archetype.swift b/test/IRGen/infinite_archetype.swift index a3782527f9104..0e8dd63bfbcd2 100644 --- a/test/IRGen/infinite_archetype.swift +++ b/test/IRGen/infinite_archetype.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/int_to_fp.sil b/test/IRGen/int_to_fp.sil index 5f7bd76809c24..af53795738004 100644 --- a/test/IRGen/int_to_fp.sil +++ b/test/IRGen/int_to_fp.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // Test if llvm can generate code for it // RUN: %target-swift-frontend -c %s diff --git a/test/IRGen/ivar_destroyer.sil b/test/IRGen/ivar_destroyer.sil index 9360ce8670334..9f4a6a073263f 100644 --- a/test/IRGen/ivar_destroyer.sil +++ b/test/IRGen/ivar_destroyer.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/lazy_globals.swift b/test/IRGen/lazy_globals.swift index fcada673dd048..7b92980c29188 100644 --- a/test/IRGen/lazy_globals.swift +++ b/test/IRGen/lazy_globals.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -emit-ir -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-ir -primary-file %s | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/lazy_multi_file.swift b/test/IRGen/lazy_multi_file.swift index 9c24322385ae9..6cc18504f547c 100644 --- a/test/IRGen/lazy_multi_file.swift +++ b/test/IRGen/lazy_multi_file.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s %S/Inputs/lazy_multi_file_helper.swift -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s %S/Inputs/lazy_multi_file_helper.swift -emit-ir | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/lifetime.sil b/test/IRGen/lifetime.sil index 3f42a78604ae7..bc958190c8be6 100644 --- a/test/IRGen/lifetime.sil +++ b/test/IRGen/lifetime.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -gnone -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -gnone -emit-ir %s | %FileCheck %s // CHECK: [[OPAQUE:%swift.opaque]] = type opaque // CHECK: [[TYPE:%swift.type]] = type diff --git a/test/IRGen/linker_options_objc.swift b/test/IRGen/linker_options_objc.swift index f41357baba5b5..acb1dae4eb378 100644 --- a/test/IRGen/linker_options_objc.swift +++ b/test/IRGen/linker_options_objc.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swiftc_driver -emit-module -o %t -module-name Empty -module-link-name swiftEmpty %S/../Inputs/empty.swift -// RUN: %target-swiftc_driver %s -I %t -emit-ir | FileCheck %s +// RUN: %target-swiftc_driver %s -I %t -emit-ir | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/literals.sil b/test/IRGen/literals.sil index 8e2410c64451d..9f0c93586affd 100644 --- a/test/IRGen/literals.sil +++ b/test/IRGen/literals.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/local_types.swift b/test/IRGen/local_types.swift index 363263b5be5dd..53f85ff5a0296 100644 --- a/test/IRGen/local_types.swift +++ b/test/IRGen/local_types.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-swift-frontend -emit-module %S/Inputs/local_types_helper.swift -o %t // RUN: %target-swift-frontend -emit-ir -parse-as-library %s -I %t > %t.ll -// RUN: FileCheck %s < %t.ll -// RUN: FileCheck -check-prefix=NEGATIVE %s < %t.ll +// RUN: %FileCheck %s < %t.ll +// RUN: %FileCheck -check-prefix=NEGATIVE %s < %t.ll // XFAIL: linux diff --git a/test/IRGen/mangle-anonclosure.swift b/test/IRGen/mangle-anonclosure.swift index c0902da27f236..0a5b1f03244de 100644 --- a/test/IRGen/mangle-anonclosure.swift +++ b/test/IRGen/mangle-anonclosure.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s -o - | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s -o - | %FileCheck %s func someValidPointer() -> UnsafeMutablePointer { fatalError() } diff --git a/test/IRGen/meta_meta_type.swift b/test/IRGen/meta_meta_type.swift index b434a0f8a5590..a5ae333142444 100644 --- a/test/IRGen/meta_meta_type.swift +++ b/test/IRGen/meta_meta_type.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift %s -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s -// RUN: %target-swift-frontend -primary-file %s -emit-ir | FileCheck -check-prefix=CHECKIR %s +// RUN: %target-run %t/a.out | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir | %FileCheck -check-prefix=CHECKIR %s // REQUIRES: executable_test protocol Proto { diff --git a/test/IRGen/metadata_dominance.swift b/test/IRGen/metadata_dominance.swift index 96846a051e0a9..234409cc661b6 100644 --- a/test/IRGen/metadata_dominance.swift +++ b/test/IRGen/metadata_dominance.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -emit-ir -primary-file %s | FileCheck %s -// RUN: %target-swift-frontend -O -emit-ir -primary-file %s | FileCheck %s --check-prefix=CHECK-OPT +// RUN: %target-swift-frontend -emit-ir -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -O -emit-ir -primary-file %s | %FileCheck %s --check-prefix=CHECK-OPT func use_metadata(_ f: F) {} diff --git a/test/IRGen/metatype.sil b/test/IRGen/metatype.sil index 01bcc5ad605c1..afef2c37ddc4b 100644 --- a/test/IRGen/metatype.sil +++ b/test/IRGen/metatype.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend -sdk %S/Inputs -I %t -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %t -emit-ir %s | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/metatype_casts.sil b/test/IRGen/metatype_casts.sil index 75ed4d2c6df33..f18797c4a8d3e 100644 --- a/test/IRGen/metatype_casts.sil +++ b/test/IRGen/metatype_casts.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 // XFAIL: linux diff --git a/test/IRGen/method_linkage.swift b/test/IRGen/method_linkage.swift index 39054dd7c2660..33de988f3a9e7 100644 --- a/test/IRGen/method_linkage.swift +++ b/test/IRGen/method_linkage.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir | %FileCheck %s // Test if all methods which go into a vtable have at least the visibility of its class. // Reason: Derived classes from "outside" still have to put the less visible base members diff --git a/test/IRGen/module_hash.swift b/test/IRGen/module_hash.swift index 63a3551770ada..9dc6825526713 100644 --- a/test/IRGen/module_hash.swift +++ b/test/IRGen/module_hash.swift @@ -60,7 +60,7 @@ // CHECK-DAG: simple.o: MD5=[[SIMPLE2_MD5:[0-9a-f]+]] // CHECK-DAG: simple.o: prev MD5=[[SIMPLE_MD5]] recompiling -// RUN: FileCheck %s < %t/log +// RUN: %FileCheck %s < %t/log // REQUIRES: asserts diff --git a/test/IRGen/multithread_module.swift b/test/IRGen/multithread_module.swift index ac075c61a1985..bb78b608057f8 100644 --- a/test/IRGen/multithread_module.swift +++ b/test/IRGen/multithread_module.swift @@ -1,12 +1,12 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-swift-frontend %S/Inputs/multithread_module/main.swift -emit-ir -o %t/main.ll %s -o %t/mt_module.ll -num-threads 2 -O -g -module-name test -// RUN: FileCheck --check-prefix=CHECK-MAINLL %s <%t/main.ll -// RUN: FileCheck --check-prefix=CHECK-MODULELL %s <%t/mt_module.ll +// RUN: %FileCheck --check-prefix=CHECK-MAINLL %s <%t/main.ll +// RUN: %FileCheck --check-prefix=CHECK-MODULELL %s <%t/mt_module.ll // RUN: %target-swift-frontend -c %S/Inputs/multithread_module/main.swift -o %t/main.o %s -o %t/mt_module.o -num-threads 2 -O -g -module-name test // RUN: %target-build-swift %t/main.o %t/mt_module.o -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test diff --git a/test/IRGen/nested_types.sil b/test/IRGen/nested_types.sil index 1c92b1957f105..c34c3e36047d9 100644 --- a/test/IRGen/nested_types.sil +++ b/test/IRGen/nested_types.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s sil_stage canonical diff --git a/test/IRGen/newtype.swift b/test/IRGen/newtype.swift index a6d2446f7e2a3..a84aa97a860d7 100644 --- a/test/IRGen/newtype.swift +++ b/test/IRGen/newtype.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t -I %S/../IDE/Inputs/custom-modules) %s -emit-ir -enable-swift-newtype | FileCheck %s -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t -I %S/../IDE/Inputs/custom-modules) %s -emit-ir -enable-swift-newtype -O | FileCheck %s -check-prefix=OPT +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t -I %S/../IDE/Inputs/custom-modules) %s -emit-ir -enable-swift-newtype | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t -I %S/../IDE/Inputs/custom-modules) %s -emit-ir -enable-swift-newtype -O | %FileCheck %s -check-prefix=OPT import CoreFoundation import Foundation import Newtype diff --git a/test/IRGen/noinline.swift b/test/IRGen/noinline.swift index 47280e5c4e022..cd17fdbf3c04f 100644 --- a/test/IRGen/noinline.swift +++ b/test/IRGen/noinline.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -O -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -O -emit-ir | %FileCheck %s public var x = 0 diff --git a/test/IRGen/nominal-type-section.swift b/test/IRGen/nominal-type-section.swift index 37815c9899ce6..ee573f651c56b 100644 --- a/test/IRGen/nominal-type-section.swift +++ b/test/IRGen/nominal-type-section.swift @@ -1,6 +1,6 @@ -// RUN: %swift -target x86_64-apple-macosx10.10 -emit-ir -parse-stdlib -primary-file %s -module-name main -o - | FileCheck %s -check-prefix CHECK-MACHO -// RUN: %swift -target x86_64-unknown-linux-gnu -emit-ir -parse-stdlib -primary-file %s -module-name main -o - | FileCheck %s -check-prefix CHECK-ELF -// RUN: %swift -target x86_64-unknown-windows-itanium -emit-ir -parse-stdlib -primary-file %s -module-name main -o - | FileCheck %s -check-prefix CHECK-COFF +// RUN: %swift -target x86_64-apple-macosx10.10 -emit-ir -parse-stdlib -primary-file %s -module-name main -o - | %FileCheck %s -check-prefix CHECK-MACHO +// RUN: %swift -target x86_64-unknown-linux-gnu -emit-ir -parse-stdlib -primary-file %s -module-name main -o - | %FileCheck %s -check-prefix CHECK-ELF +// RUN: %swift -target x86_64-unknown-windows-itanium -emit-ir -parse-stdlib -primary-file %s -module-name main -o - | %FileCheck %s -check-prefix CHECK-COFF // CHECK-MACHO: @_TMnV4main1s = constant {{.*}}, section "__TEXT,__const" // CHECK-ELF: @_TMnV4main1s = {{.*}}constant {{.*}}, section ".rodata" diff --git a/test/IRGen/nonatomic_reference_counting.sil b/test/IRGen/nonatomic_reference_counting.sil index f208c3c839f82..160cb25721e62 100644 --- a/test/IRGen/nonatomic_reference_counting.sil +++ b/test/IRGen/nonatomic_reference_counting.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -disable-sil-perf-optzns -O -Xllvm -swiftmergefunc-threshold=0 -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -disable-sil-perf-optzns -O -Xllvm -swiftmergefunc-threshold=0 -emit-ir %s | %FileCheck %s // Check that IRGen lowers non-atomic reference counting instructions to // proper runtime calls. diff --git a/test/IRGen/nondominant.sil b/test/IRGen/nondominant.sil index 18b82bbfc3896..15304852bc742 100644 --- a/test/IRGen/nondominant.sil +++ b/test/IRGen/nondominant.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/objc.swift b/test/IRGen/objc.swift index 3e8d0557b451e..4883bbdab8447 100644 --- a/test/IRGen/objc.swift +++ b/test/IRGen/objc.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_attr_NSManaged.sil b/test/IRGen/objc_attr_NSManaged.sil index c51e70487b050..ed4a7b824ff38 100644 --- a/test/IRGen/objc_attr_NSManaged.sil +++ b/test/IRGen/objc_attr_NSManaged.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_block.sil b/test/IRGen/objc_block.sil index a0fe906cb39fd..1e5dd8ff6b92a 100644 --- a/test/IRGen/objc_block.sil +++ b/test/IRGen/objc_block.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/objc_block_storage.sil b/test/IRGen/objc_block_storage.sil index dbd1f69967c9c..c62f116385fbc 100644 --- a/test/IRGen/objc_block_storage.sil +++ b/test/IRGen/objc_block_storage.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -gnone -sdk %S/Inputs %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -gnone -sdk %S/Inputs %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_bridge.swift b/test/IRGen/objc_bridge.swift index 721f5f18cee3d..25851bdabeab4 100644 --- a/test/IRGen/objc_bridge.swift +++ b/test/IRGen/objc_bridge.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-ir -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-ir -primary-file %s | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_casts.sil b/test/IRGen/objc_casts.sil index aecad644d5518..ac6d21e6ead36 100644 --- a/test/IRGen/objc_casts.sil +++ b/test/IRGen/objc_casts.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize %s // REQUIRES: objc_interop diff --git a/test/IRGen/objc_class_empty_fields.swift b/test/IRGen/objc_class_empty_fields.swift index cddbb7d3d66a6..3e163c37d5f9a 100644 --- a/test/IRGen/objc_class_empty_fields.swift +++ b/test/IRGen/objc_class_empty_fields.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-frontend -primary-file %s -emit-ir | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop diff --git a/test/IRGen/objc_class_export.swift b/test/IRGen/objc_class_export.swift index 46a14070d7e7d..81958599db35b 100644 --- a/test/IRGen/objc_class_export.swift +++ b/test/IRGen/objc_class_export.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend -sdk %S/Inputs -I %t -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %t -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_class_property.swift b/test/IRGen/objc_class_property.swift index 3c6fa650f4c80..4708f71130810 100644 --- a/test/IRGen/objc_class_property.swift +++ b/test/IRGen/objc_class_property.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_dealloc.sil b/test/IRGen/objc_dealloc.sil index e2fe978156bfc..23e374a03b555 100644 --- a/test/IRGen/objc_dealloc.sil +++ b/test/IRGen/objc_dealloc.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_enum_multi_file.swift b/test/IRGen/objc_enum_multi_file.swift index 7c02477f2652f..29b0e234c2d9e 100644 --- a/test/IRGen/objc_enum_multi_file.swift +++ b/test/IRGen/objc_enum_multi_file.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t && mkdir %t -// RUN: %target-swift-frontend -module-name main -primary-file %s %S/Inputs/objc_enum_multi_file_helper.swift -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -module-name main -primary-file %s %S/Inputs/objc_enum_multi_file_helper.swift -emit-ir | %FileCheck %s // RUN: %target-swift-frontend -disable-objc-attr-requires-foundation-module -emit-module %S/Inputs/objc_enum_multi_file_helper.swift -o %t -// RUN: %target-swift-frontend -module-name main -primary-file %s -I %t -DIMPORT -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -module-name main -primary-file %s -I %t -DIMPORT -emit-ir | %FileCheck %s #if IMPORT import objc_enum_multi_file_helper diff --git a/test/IRGen/objc_errors.sil b/test/IRGen/objc_errors.sil index 051eb4ac580d8..e98d1de9c2664 100644 --- a/test/IRGen/objc_errors.sil +++ b/test/IRGen/objc_errors.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/objc_extensions.swift b/test/IRGen/objc_extensions.swift index 760427beb2c9d..7f36594a73d6f 100644 --- a/test/IRGen/objc_extensions.swift +++ b/test/IRGen/objc_extensions.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays // RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -disable-objc-attr-requires-foundation-module -emit-module %S/Inputs/objc_extension_base.swift -o %t -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_factory_method.sil b/test/IRGen/objc_factory_method.sil index 766c515fbc65d..289fa3395f331 100644 --- a/test/IRGen/objc_factory_method.sil +++ b/test/IRGen/objc_factory_method.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_generic_class_convention.sil b/test/IRGen/objc_generic_class_convention.sil index 6873ebaf5c9d2..6abb329119c77 100644 --- a/test/IRGen/objc_generic_class_convention.sil +++ b/test/IRGen/objc_generic_class_convention.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/objc_generic_class_metadata.sil b/test/IRGen/objc_generic_class_metadata.sil index ef52b7726de14..69fdf07b351d9 100644 --- a/test/IRGen/objc_generic_class_metadata.sil +++ b/test/IRGen/objc_generic_class_metadata.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/objc_globals.swift b/test/IRGen/objc_globals.swift index 6d26e1f49ca1e..89aa3696615ad 100644 --- a/test/IRGen/objc_globals.swift +++ b/test/IRGen/objc_globals.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/abi %s -whole-module-optimization -emit-ir %s | FileCheck %s -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/abi %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/abi %s -whole-module-optimization -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/abi %s -emit-ir | %FileCheck %s // // REQUIRES: objc_interop diff --git a/test/IRGen/objc_implicit_with.sil b/test/IRGen/objc_implicit_with.sil index bbe5074f36cb2..3c60f39cbbaf2 100644 --- a/test/IRGen/objc_implicit_with.sil +++ b/test/IRGen/objc_implicit_with.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_int_encoding.sil b/test/IRGen/objc_int_encoding.sil index 4ac19ee3f8fe0..51eebbc8e2ee9 100644 --- a/test/IRGen/objc_int_encoding.sil +++ b/test/IRGen/objc_int_encoding.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // CHECK: [[SELECTOR:@.*]] = private global {{.*}} c"fooWithX:\00" diff --git a/test/IRGen/objc_local.swift b/test/IRGen/objc_local.swift index 779adb685f524..c1cc6ad1a2d88 100644 --- a/test/IRGen/objc_local.swift +++ b/test/IRGen/objc_local.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/objc_methods.swift b/test/IRGen/objc_methods.swift index 2912fbb886bc6..4e6c3c2714f5e 100644 --- a/test/IRGen/objc_methods.swift +++ b/test/IRGen/objc_methods.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-os %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-os %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_ns_enum.swift b/test/IRGen/objc_ns_enum.swift index eeefe6caef9d2..dd5bf3a59c195 100644 --- a/test/IRGen/objc_ns_enum.swift +++ b/test/IRGen/objc_ns_enum.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_pointers.swift b/test/IRGen/objc_pointers.swift index 766a0fda75c48..759b9a86da724 100644 --- a/test/IRGen/objc_pointers.swift +++ b/test/IRGen/objc_pointers.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_properties.swift b/test/IRGen/objc_properties.swift index bf6d02539aa44..98cb6e4190616 100644 --- a/test/IRGen/objc_properties.swift +++ b/test/IRGen/objc_properties.swift @@ -1,7 +1,7 @@ // This file is also used by objc_properties_ios.swift. -// RUN: %swift -target x86_64-apple-macosx10.11 %s -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck -check-prefix=CHECK -check-prefix=CHECK-NEW %s -// RUN: %swift -target x86_64-apple-macosx10.10 %s -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck -check-prefix=CHECK -check-prefix=CHECK-OLD %s +// RUN: %swift -target x86_64-apple-macosx10.11 %s -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-NEW %s +// RUN: %swift -target x86_64-apple-macosx10.10 %s -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-OLD %s // REQUIRES: OS=macosx // REQUIRES: objc_interop diff --git a/test/IRGen/objc_properties_imported.swift b/test/IRGen/objc_properties_imported.swift index 8639b067201c6..7210c64721615 100644 --- a/test/IRGen/objc_properties_imported.swift +++ b/test/IRGen/objc_properties_imported.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-source-import -emit-ir -o - -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-source-import -emit-ir -o - -primary-file %s | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_properties_ios.swift b/test/IRGen/objc_properties_ios.swift index eb626e72d1d3d..33fa41ee0ba9f 100644 --- a/test/IRGen/objc_properties_ios.swift +++ b/test/IRGen/objc_properties_ios.swift @@ -1,5 +1,5 @@ -// RUN: %swift -target x86_64-apple-ios9 %S/objc_properties.swift -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck -check-prefix=CHECK -check-prefix=CHECK-NEW %S/objc_properties.swift -// RUN: %swift -target x86_64-apple-ios8 %S/objc_properties.swift -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck -check-prefix=CHECK -check-prefix=CHECK-OLD %S/objc_properties.swift +// RUN: %swift -target x86_64-apple-ios9 %S/objc_properties.swift -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-NEW %S/objc_properties.swift +// RUN: %swift -target x86_64-apple-ios8 %S/objc_properties.swift -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-OLD %S/objc_properties.swift // REQUIRES: OS=ios // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/objc_properties_jit.swift b/test/IRGen/objc_properties_jit.swift index b48eaff136962..d7bb2b3b7c1bd 100644 --- a/test/IRGen/objc_properties_jit.swift +++ b/test/IRGen/objc_properties_jit.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir -disable-objc-attr-requires-foundation-module -use-jit | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir -disable-objc-attr-requires-foundation-module -use-jit | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/objc_property_attrs.swift b/test/IRGen/objc_property_attrs.swift index c0cd10bfaa40f..4ef182c8b2c4c 100644 --- a/test/IRGen/objc_property_attrs.swift +++ b/test/IRGen/objc_property_attrs.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_protocol_conversion.sil b/test/IRGen/objc_protocol_conversion.sil index 3c7866fcb8fe3..e61e4839eb395 100644 --- a/test/IRGen/objc_protocol_conversion.sil +++ b/test/IRGen/objc_protocol_conversion.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend -sdk %S/Inputs -I %t %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %t %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_protocol_extended_method_types.swift b/test/IRGen/objc_protocol_extended_method_types.swift index d656fdae0c941..e69879ac92b56 100644 --- a/test/IRGen/objc_protocol_extended_method_types.swift +++ b/test/IRGen/objc_protocol_extended_method_types.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_protocol_multi_file.swift b/test/IRGen/objc_protocol_multi_file.swift index 6427239e0dee5..12cf9de467060 100644 --- a/test/IRGen/objc_protocol_multi_file.swift +++ b/test/IRGen/objc_protocol_multi_file.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s %S/Inputs/objc_protocol_multi_file_helper.swift -g -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s %S/Inputs/objc_protocol_multi_file_helper.swift -g -emit-ir | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/objc_protocols.swift b/test/IRGen/objc_protocols.swift index 58de2e0d7b346..32c1e07c883fa 100644 --- a/test/IRGen/objc_protocols.swift +++ b/test/IRGen/objc_protocols.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays // RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-module -o %t %S/Inputs/objc_protocols_Bas.swift -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_protocols_jit.swift b/test/IRGen/objc_protocols_jit.swift index 36c11055c4720..440d79ce996c9 100644 --- a/test/IRGen/objc_protocols_jit.swift +++ b/test/IRGen/objc_protocols_jit.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/objc_protocols_Bas.swift -// RUN: %target-swift-frontend -sdk %S/Inputs -I %t -primary-file %s -use-jit -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %t -primary-file %s -use-jit -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/objc_remapped_inits.swift b/test/IRGen/objc_remapped_inits.swift index 487d8b12a3f73..437255c185711 100644 --- a/test/IRGen/objc_remapped_inits.swift +++ b/test/IRGen/objc_remapped_inits.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // FIXME: This test could use %clang-importer-sdk, but the compiler crashes. diff --git a/test/IRGen/objc_runtime_visible.sil b/test/IRGen/objc_runtime_visible.sil index 1b0c1186738b7..35a3f2da2ddda 100644 --- a/test/IRGen/objc_runtime_visible.sil +++ b/test/IRGen/objc_runtime_visible.sil @@ -1,6 +1,6 @@ // REQUIRES: objc_interop -// RUN: %target-swift-frontend -I %S/../Inputs/custom-modules %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -I %S/../Inputs/custom-modules %s -emit-ir | %FileCheck %s sil_stage raw diff --git a/test/IRGen/objc_selector.sil b/test/IRGen/objc_selector.sil index 34214e456653b..e283be3cfb18d 100644 --- a/test/IRGen/objc_selector.sil +++ b/test/IRGen/objc_selector.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/objc_simd.sil b/test/IRGen/objc_simd.sil index 676d2f7353783..c39894b8a343c 100644 --- a/test/IRGen/objc_simd.sil +++ b/test/IRGen/objc_simd.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir %s | FileCheck %s --check-prefix=%target-cpu +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir %s | %FileCheck %s --check-prefix=%target-cpu import Swift import simd diff --git a/test/IRGen/objc_structs.swift b/test/IRGen/objc_structs.swift index a8548016b3787..483aec38d11cd 100644 --- a/test/IRGen/objc_structs.swift +++ b/test/IRGen/objc_structs.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_subclass.swift b/test/IRGen/objc_subclass.swift index 8ee05d6ebeaf9..3426307df2bfc 100644 --- a/test/IRGen/objc_subclass.swift +++ b/test/IRGen/objc_subclass.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize %s // REQUIRES: objc_interop diff --git a/test/IRGen/objc_subscripts.swift b/test/IRGen/objc_subscripts.swift index e27dcdec056aa..0bbacb97a5a6b 100644 --- a/test/IRGen/objc_subscripts.swift +++ b/test/IRGen/objc_subscripts.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_super.swift b/test/IRGen/objc_super.swift index b77d52291638e..935b0a88e0701 100644 --- a/test/IRGen/objc_super.swift +++ b/test/IRGen/objc_super.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_type_encoding.swift b/test/IRGen/objc_type_encoding.swift index b52730a1a20b3..68503c482b7b9 100644 --- a/test/IRGen/objc_type_encoding.swift +++ b/test/IRGen/objc_type_encoding.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck %s -check-prefix=CHECK-%target-os +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s -check-prefix=CHECK-%target-os // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/optional_metatype.sil b/test/IRGen/optional_metatype.sil index 89abbf6e219a8..f26e520a1e3ec 100644 --- a/test/IRGen/optional_metatype.sil +++ b/test/IRGen/optional_metatype.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend -sdk %S/Inputs -I %t -emit-ir %s | FileCheck %s --check-prefix=%target-cpu +// RUN: %target-swift-frontend -sdk %S/Inputs -I %t -emit-ir %s | %FileCheck %s --check-prefix=%target-cpu // REQUIRES: objc_interop diff --git a/test/IRGen/ordering_aarch64.sil b/test/IRGen/ordering_aarch64.sil index 47972b0cde1a7..53eb531273567 100644 --- a/test/IRGen/ordering_aarch64.sil +++ b/test/IRGen/ordering_aarch64.sil @@ -1,4 +1,4 @@ -// RUN: %swift -target arm64-apple-ios7.1 %s -module-name main -emit-ir -o - | FileCheck %s +// RUN: %swift -target arm64-apple-ios7.1 %s -module-name main -emit-ir -o - | %FileCheck %s // REQUIRES: CODEGENERATOR=AArch64 diff --git a/test/IRGen/ordering_arm.sil b/test/IRGen/ordering_arm.sil index 9822af1798409..f24570be2d90c 100644 --- a/test/IRGen/ordering_arm.sil +++ b/test/IRGen/ordering_arm.sil @@ -1,4 +1,4 @@ -// RUN: %swift -target armv7-apple-ios7.1 %s -module-name main -emit-ir -o - | FileCheck %s +// RUN: %swift -target armv7-apple-ios7.1 %s -module-name main -emit-ir -o - | %FileCheck %s // REQUIRES: CODEGENERATOR=ARM diff --git a/test/IRGen/ordering_x86.sil b/test/IRGen/ordering_x86.sil index 33419e5cb7756..fd57c483d1ffa 100644 --- a/test/IRGen/ordering_x86.sil +++ b/test/IRGen/ordering_x86.sil @@ -1,7 +1,7 @@ -// RUN: %swift -target x86_64-apple-macosx10.9 -module-name main %s -emit-ir -o - | FileCheck %s -// RUN: %swift -target i386-apple-ios7.1 %s -module-name main -emit-ir -o - | FileCheck %s -// RUN: %swift -target x86_64-apple-ios7.1 %s -module-name main -emit-ir -o - | FileCheck %s -// RUN: %swift -target x86_64-unknown-linux-gnu -disable-objc-interop %s -module-name main -emit-ir -o - | FileCheck %s +// RUN: %swift -target x86_64-apple-macosx10.9 -module-name main %s -emit-ir -o - | %FileCheck %s +// RUN: %swift -target i386-apple-ios7.1 %s -module-name main -emit-ir -o - | %FileCheck %s +// RUN: %swift -target x86_64-apple-ios7.1 %s -module-name main -emit-ir -o - | %FileCheck %s +// RUN: %swift -target x86_64-unknown-linux-gnu -disable-objc-interop %s -module-name main -emit-ir -o - | %FileCheck %s // REQUIRES: CODEGENERATOR=X86 diff --git a/test/IRGen/osx-targets.swift b/test/IRGen/osx-targets.swift index 7c96218ebcb0a..11f4ec56e00d3 100644 --- a/test/IRGen/osx-targets.swift +++ b/test/IRGen/osx-targets.swift @@ -1,6 +1,6 @@ -// RUN: %swift %s -emit-ir | FileCheck %s -// RUN: %swift -target x86_64-apple-macosx10.12 %s -emit-ir | FileCheck -check-prefix=CHECK-SPECIFIC %s -// RUN: %swift -target x86_64-apple-darwin16 %s -emit-ir | FileCheck -check-prefix=CHECK-SPECIFIC %s +// RUN: %swift %s -emit-ir | %FileCheck %s +// RUN: %swift -target x86_64-apple-macosx10.12 %s -emit-ir | %FileCheck -check-prefix=CHECK-SPECIFIC %s +// RUN: %swift -target x86_64-apple-darwin16 %s -emit-ir | %FileCheck -check-prefix=CHECK-SPECIFIC %s // REQUIRES: OS=macosx diff --git a/test/IRGen/partial_apply.sil b/test/IRGen/partial_apply.sil index 971c96f0311e3..a78698cfe9c9d 100644 --- a/test/IRGen/partial_apply.sil +++ b/test/IRGen/partial_apply.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/partial_apply_forwarder.sil b/test/IRGen/partial_apply_forwarder.sil index 9060489143c53..1090f49621e48 100644 --- a/test/IRGen/partial_apply_forwarder.sil +++ b/test/IRGen/partial_apply_forwarder.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir | %FileCheck %s sil_stage canonical public protocol P {} diff --git a/test/IRGen/partial_apply_generic.swift b/test/IRGen/partial_apply_generic.swift index ac9b09d605a5c..ebe388e56bafa 100644 --- a/test/IRGen/partial_apply_generic.swift +++ b/test/IRGen/partial_apply_generic.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/pic.swift b/test/IRGen/pic.swift index 9140ff5585f25..4fe4487066db3 100644 --- a/test/IRGen/pic.swift +++ b/test/IRGen/pic.swift @@ -1,7 +1,7 @@ // Check that we always use PIC relocations on all // platforms. -// RUN: %target-swift-frontend %s -module-name main -S -o - | FileCheck -check-prefix=%target-cpu %s +// RUN: %target-swift-frontend %s -module-name main -S -o - | %FileCheck -check-prefix=%target-cpu %s // XFAIL: linux diff --git a/test/IRGen/playground.swift b/test/IRGen/playground.swift index 19a4f1db6e516..8666ac8d0c688 100644 --- a/test/IRGen/playground.swift +++ b/test/IRGen/playground.swift @@ -1,5 +1,5 @@ // RUN: rm -rf %t -// RUN: %target-swift-frontend -use-jit -playground -parse-stdlib %s -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -use-jit -playground -parse-stdlib %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: OS=macosx // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/protocol_conformance_records.swift b/test/IRGen/protocol_conformance_records.swift index 43e14bce46282..eccf7afc7cce6 100644 --- a/test/IRGen/protocol_conformance_records.swift +++ b/test/IRGen/protocol_conformance_records.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -enable-resilience -enable-source-import -I %S/../Inputs | FileCheck %s -// RUN: %target-swift-frontend %s -emit-ir -num-threads 8 -enable-resilience -enable-source-import -I %S/../Inputs | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -enable-resilience -enable-source-import -I %S/../Inputs | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -num-threads 8 -enable-resilience -enable-source-import -I %S/../Inputs | %FileCheck %s import resilient_struct diff --git a/test/IRGen/protocol_conformance_records_objc.swift b/test/IRGen/protocol_conformance_records_objc.swift index f64946825a4c0..5603be23f06fc 100644 --- a/test/IRGen/protocol_conformance_records_objc.swift +++ b/test/IRGen/protocol_conformance_records_objc.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays // RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-module -o %t %S/Inputs/objc_protocols_Bas.swift -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | FileCheck %s -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir -num-threads 8 | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir -num-threads 8 | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/protocol_extensions.sil b/test/IRGen/protocol_extensions.sil index 45b1edc1db224..c57f32636ce01 100644 --- a/test/IRGen/protocol_extensions.sil +++ b/test/IRGen/protocol_extensions.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/protocol_extensions_constrain.swift b/test/IRGen/protocol_extensions_constrain.swift index d5ff56478d9ed..e96e437362de9 100644 --- a/test/IRGen/protocol_extensions_constrain.swift +++ b/test/IRGen/protocol_extensions_constrain.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // rdar://20532214 -- Wrong code for witness method lookup lets executable crash diff --git a/test/IRGen/protocol_metadata.swift b/test/IRGen/protocol_metadata.swift index 9a939bfe06c29..ff4a7d9cd1761 100644 --- a/test/IRGen/protocol_metadata.swift +++ b/test/IRGen/protocol_metadata.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/protocol_resilience.sil b/test/IRGen/protocol_resilience.sil index b39a8223f8f36..a5a7781757bf5 100644 --- a/test/IRGen/protocol_resilience.sil +++ b/test/IRGen/protocol_resilience.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-ir -enable-resilience %s | FileCheck %s +// RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-ir -enable-resilience %s | %FileCheck %s // RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-ir -enable-resilience -O %s sil_stage canonical diff --git a/test/IRGen/rdar15304329.swift b/test/IRGen/rdar15304329.swift index 807f761220534..601edd6a41fe3 100644 --- a/test/IRGen/rdar15304329.swift +++ b/test/IRGen/rdar15304329.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/readonly.sil b/test/IRGen/readonly.sil index 66540d128118d..b96647e50bd2c 100644 --- a/test/IRGen/readonly.sil +++ b/test/IRGen/readonly.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s //sil_stage canonical import Builtin diff --git a/test/IRGen/reflection_metadata.swift b/test/IRGen/reflection_metadata.swift index 214749e991b25..1decf78f7875e 100644 --- a/test/IRGen/reflection_metadata.swift +++ b/test/IRGen/reflection_metadata.swift @@ -1,6 +1,6 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s -// RUN: %target-swift-frontend -disable-reflection-names -emit-ir %s | FileCheck %s --check-prefix=STRIP_REFLECTION_NAMES -// RUN: %target-swift-frontend -disable-reflection-metadata -emit-ir %s | FileCheck %s --check-prefix=STRIP_REFLECTION_METADATA +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -disable-reflection-names -emit-ir %s | %FileCheck %s --check-prefix=STRIP_REFLECTION_NAMES +// RUN: %target-swift-frontend -disable-reflection-metadata -emit-ir %s | %FileCheck %s --check-prefix=STRIP_REFLECTION_METADATA // STRIP_REFLECTION_NAMES_DAG: {{.*}}swift3_reflect // STRIP_REFLECTION_NAMES_DAG: {{.*}}swift3_fieldmd diff --git a/test/IRGen/runtime_calling_conventions.swift b/test/IRGen/runtime_calling_conventions.swift index ddb7b123a2faa..07f511edc0c3a 100644 --- a/test/IRGen/runtime_calling_conventions.swift +++ b/test/IRGen/runtime_calling_conventions.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -parse-as-library -emit-ir %s | FileCheck %s -// RUN: %target-swift-frontend -parse-as-library -O -emit-ir %s | FileCheck --check-prefix=OPT-CHECK %s +// RUN: %target-swift-frontend -parse-as-library -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -O -emit-ir %s | %FileCheck --check-prefix=OPT-CHECK %s // Test that runtime functions are invoked using the new calling convention. // Test that wrappers are used to invoked them. diff --git a/test/IRGen/same_type_constraints.swift b/test/IRGen/same_type_constraints.swift index fc17ae177c2de..53c14afbc3fc7 100644 --- a/test/IRGen/same_type_constraints.swift +++ b/test/IRGen/same_type_constraints.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir -primary-file %s -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -emit-ir -primary-file %s -disable-objc-attr-requires-foundation-module | %FileCheck %s // IRGen crash with protocol extension involving same-type constraint to X public struct DefaultFoo { diff --git a/test/IRGen/sanitize_coverage.swift b/test/IRGen/sanitize_coverage.swift index 766b1c3a0e7c0..da38a3f7c489a 100644 --- a/test/IRGen/sanitize_coverage.swift +++ b/test/IRGen/sanitize_coverage.swift @@ -1,11 +1,11 @@ // XFAIL: linux -// RUN: %target-swift-frontend -emit-ir -sanitize=address -sanitize-coverage=func %s | FileCheck %s -check-prefix=SANCOV -// RUN: %target-swift-frontend -emit-ir -sanitize=address -sanitize-coverage=bb %s | FileCheck %s -check-prefix=SANCOV -// RUN: %target-swift-frontend -emit-ir -sanitize=address -sanitize-coverage=edge %s | FileCheck %s -check-prefix=SANCOV -// RUN: %target-swift-frontend -emit-ir -sanitize=address -sanitize-coverage=edge,trace-cmp %s | FileCheck %s -check-prefix=SANCOV -check-prefix=SANCOV_TRACE_CMP -// RUN: %target-swift-frontend -emit-ir -sanitize=address -sanitize-coverage=edge,trace-bb %s | FileCheck %s -check-prefix=SANCOV -check-prefix=SANCOV_TRACE_BB -// RUN: %target-swift-frontend -emit-ir -sanitize=address -sanitize-coverage=edge,indirect-calls %s | FileCheck %s -check-prefix=SANCOV -check-prefix=SANCOV_INDIRECT_CALLS -// RUN: %target-swift-frontend -emit-ir -sanitize=address -sanitize-coverage=edge,8bit-counters %s | FileCheck %s -check-prefix=SANCOV -check-prefix=SANCOV_8BIT_COUNTERS +// RUN: %target-swift-frontend -emit-ir -sanitize=address -sanitize-coverage=func %s | %FileCheck %s -check-prefix=SANCOV +// RUN: %target-swift-frontend -emit-ir -sanitize=address -sanitize-coverage=bb %s | %FileCheck %s -check-prefix=SANCOV +// RUN: %target-swift-frontend -emit-ir -sanitize=address -sanitize-coverage=edge %s | %FileCheck %s -check-prefix=SANCOV +// RUN: %target-swift-frontend -emit-ir -sanitize=address -sanitize-coverage=edge,trace-cmp %s | %FileCheck %s -check-prefix=SANCOV -check-prefix=SANCOV_TRACE_CMP +// RUN: %target-swift-frontend -emit-ir -sanitize=address -sanitize-coverage=edge,trace-bb %s | %FileCheck %s -check-prefix=SANCOV -check-prefix=SANCOV_TRACE_BB +// RUN: %target-swift-frontend -emit-ir -sanitize=address -sanitize-coverage=edge,indirect-calls %s | %FileCheck %s -check-prefix=SANCOV -check-prefix=SANCOV_INDIRECT_CALLS +// RUN: %target-swift-frontend -emit-ir -sanitize=address -sanitize-coverage=edge,8bit-counters %s | %FileCheck %s -check-prefix=SANCOV -check-prefix=SANCOV_8BIT_COUNTERS import Darwin diff --git a/test/IRGen/select_enum.sil b/test/IRGen/select_enum.sil index aab1c02641071..c3225fe078af9 100644 --- a/test/IRGen/select_enum.sil +++ b/test/IRGen/select_enum.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -gnone -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -gnone -emit-ir %s | %FileCheck %s import Builtin diff --git a/test/IRGen/select_enum_optimized.swift b/test/IRGen/select_enum_optimized.swift index c2dbdebbc5a08..7ecf77b89630b 100644 --- a/test/IRGen/select_enum_optimized.swift +++ b/test/IRGen/select_enum_optimized.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -O -disable-llvm-optzns -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -O -disable-llvm-optzns -emit-ir | %FileCheck %s enum NoPayload { case E0 diff --git a/test/IRGen/select_enum_single_payload.sil b/test/IRGen/select_enum_single_payload.sil index 29a4e121dd18d..8ec45bf475d81 100644 --- a/test/IRGen/select_enum_single_payload.sil +++ b/test/IRGen/select_enum_single_payload.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s sil_stage canonical import Builtin diff --git a/test/IRGen/sil_generic_witness_methods.swift b/test/IRGen/sil_generic_witness_methods.swift index e1befcbf602d0..60a545f624fda 100644 --- a/test/IRGen/sil_generic_witness_methods.swift +++ b/test/IRGen/sil_generic_witness_methods.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/sil_generic_witness_methods_objc.swift b/test/IRGen/sil_generic_witness_methods_objc.swift index e5bba74da6996..0656e08373729 100644 --- a/test/IRGen/sil_generic_witness_methods_objc.swift +++ b/test/IRGen/sil_generic_witness_methods_objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/sil_linkage.sil b/test/IRGen/sil_linkage.sil index 64f3b2823ee57..87bdf9c260e02 100644 --- a/test/IRGen/sil_linkage.sil +++ b/test/IRGen/sil_linkage.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-disable-pass="External Defs To Decls" -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-disable-pass="External Defs To Decls" -emit-ir %s | %FileCheck %s sil_stage canonical diff --git a/test/IRGen/sil_witness_methods.sil b/test/IRGen/sil_witness_methods.sil index bd35163ce3d7e..8a7e2c2fe2db3 100644 --- a/test/IRGen/sil_witness_methods.sil +++ b/test/IRGen/sil_witness_methods.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/sil_witness_tables.swift b/test/IRGen/sil_witness_tables.swift index 8d73f7254c54d..099fa1681054d 100644 --- a/test/IRGen/sil_witness_tables.swift +++ b/test/IRGen/sil_witness_tables.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend -emit-module -o %t %S/sil_witness_tables_external_conformance.swift -// RUN: %target-swift-frontend -I %t -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -I %t -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/sil_witness_tables_external_witnesstable.swift b/test/IRGen/sil_witness_tables_external_witnesstable.swift index 136f8c03c771d..b29ba8453afbe 100644 --- a/test/IRGen/sil_witness_tables_external_witnesstable.swift +++ b/test/IRGen/sil_witness_tables_external_witnesstable.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module %S/Inputs/sil_witness_tables_external_input.swift -o %t/Swift.swiftmodule -parse-stdlib -parse-as-library -module-name Swift -sil-serialize-all -module-link-name swiftCore -// RUN: %target-swift-frontend -I %t -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -I %t -primary-file %s -emit-ir | %FileCheck %s import Swift diff --git a/test/IRGen/sil_witness_tables_inherited_conformance.swift b/test/IRGen/sil_witness_tables_inherited_conformance.swift index d8b69dd070ec6..acf28a459cf4d 100644 --- a/test/IRGen/sil_witness_tables_inherited_conformance.swift +++ b/test/IRGen/sil_witness_tables_inherited_conformance.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s // rdar://problem/20628295 diff --git a/test/IRGen/special_protocols.sil b/test/IRGen/special_protocols.sil index 8d73104fa88c5..ce31cb32c49ea 100644 --- a/test/IRGen/special_protocols.sil +++ b/test/IRGen/special_protocols.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -parse-stdlib -module-name Swift | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-frontend %s -emit-ir -parse-stdlib -module-name Swift | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize public protocol AnyObject: class {} // CHECK-LABEL: @_TMps9AnyObject = {{(protected )?}}constant %swift.protocol { diff --git a/test/IRGen/static_initializer.sil b/test/IRGen/static_initializer.sil index d71d3c2758cb9..b3acd0bf871d1 100644 --- a/test/IRGen/static_initializer.sil +++ b/test/IRGen/static_initializer.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/struct_layout.sil b/test/IRGen/struct_layout.sil index 1accf689d61e9..a08ca696fb015 100644 --- a/test/IRGen/struct_layout.sil +++ b/test/IRGen/struct_layout.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -module-name main -emit-ir -o - | FileCheck -check-prefix=%target-ptrsize %s +// RUN: %target-swift-frontend %s -module-name main -emit-ir -o - | %FileCheck -check-prefix=%target-ptrsize %s import Builtin import Swift diff --git a/test/IRGen/struct_resilience.swift b/test/IRGen/struct_resilience.swift index 656d3add79335..43f2aed1f45ac 100644 --- a/test/IRGen/struct_resilience.swift +++ b/test/IRGen/struct_resilience.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-ir -enable-resilience %s | FileCheck %s +// RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-ir -enable-resilience %s | %FileCheck %s // RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-ir -enable-resilience -O %s import resilient_struct diff --git a/test/IRGen/subclass.swift b/test/IRGen/subclass.swift index 10a080a388572..c8911dd647279 100644 --- a/test/IRGen/subclass.swift +++ b/test/IRGen/subclass.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/super.sil b/test/IRGen/super.sil index f7d9966a85e67..66080f1e8312b 100644 --- a/test/IRGen/super.sil +++ b/test/IRGen/super.sil @@ -2,7 +2,7 @@ // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -enable-resilience -I %t -module-name resilient_struct -o %t %S/../Inputs/resilient_struct.swift // RUN: %target-swift-frontend -emit-module -enable-resilience -I %t -module-name resilient_class -o %t %S/../Inputs/resilient_class.swift -// RUN: %target-swift-frontend -enable-resilience -parse-sil -parse-as-library -emit-ir -I %t %s | FileCheck %s +// RUN: %target-swift-frontend -enable-resilience -parse-sil -parse-as-library -emit-ir -I %t %s | %FileCheck %s sil_stage canonical diff --git a/test/IRGen/swift3-metadata-coff.swift b/test/IRGen/swift3-metadata-coff.swift index dc76a4cb10d6a..d6b45788c95ff 100644 --- a/test/IRGen/swift3-metadata-coff.swift +++ b/test/IRGen/swift3-metadata-coff.swift @@ -1,4 +1,4 @@ -// RUN: %swift -target thumbv7--windows-itanium -parse-stdlib -parse-as-library -module-name Swift -O -emit-ir %s -o - | FileCheck %s +// RUN: %swift -target thumbv7--windows-itanium -parse-stdlib -parse-as-library -module-name Swift -O -emit-ir %s -o - | %FileCheck %s // REQUIRES: CODEGENERATOR=ARM diff --git a/test/IRGen/swift_native_objc_runtime_base.sil b/test/IRGen/swift_native_objc_runtime_base.sil index aadc59c35b318..798b7b64bd6a7 100644 --- a/test/IRGen/swift_native_objc_runtime_base.sil +++ b/test/IRGen/swift_native_objc_runtime_base.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // REQUIRES: objc_interop // CHECK-LABEL: @_TMmC30swift_native_objc_runtime_base1C = hidden global %objc_class { diff --git a/test/IRGen/tsan-attributes.swift b/test/IRGen/tsan-attributes.swift index 20e934dc4268c..2a22807a030bb 100644 --- a/test/IRGen/tsan-attributes.swift +++ b/test/IRGen/tsan-attributes.swift @@ -1,6 +1,6 @@ // This test verifies that we add the function attributes used by TSan. -// RUN: %target-swift-frontend -emit-ir -sanitize=thread %s | FileCheck %s -check-prefix=TSAN +// RUN: %target-swift-frontend -emit-ir -sanitize=thread %s | %FileCheck %s -check-prefix=TSAN // TSan is currently only supported on 64 bit mac and simulators. // (We do not test the simulators here.) diff --git a/test/IRGen/type_layout.swift b/test/IRGen/type_layout.swift index 586900ca45b9f..363ea15c39c55 100644 --- a/test/IRGen/type_layout.swift +++ b/test/IRGen/type_layout.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize class C {} diff --git a/test/IRGen/type_layout_objc.swift b/test/IRGen/type_layout_objc.swift index c45540ebdd46d..e4c0285f254ed 100644 --- a/test/IRGen/type_layout_objc.swift +++ b/test/IRGen/type_layout_objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir %s | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop import Foundation diff --git a/test/IRGen/type_layout_reference_storage.swift b/test/IRGen/type_layout_reference_storage.swift index 2a1a6f1afff02..3396e14b5d6c4 100644 --- a/test/IRGen/type_layout_reference_storage.swift +++ b/test/IRGen/type_layout_reference_storage.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK class C {} protocol P: class {} diff --git a/test/IRGen/type_layout_reference_storage_objc.swift b/test/IRGen/type_layout_reference_storage_objc.swift index 51041073df32a..23a6ad65d7cbe 100644 --- a/test/IRGen/type_layout_reference_storage_objc.swift +++ b/test/IRGen/type_layout_reference_storage_objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir %s | %FileCheck %s // REQUIRES: objc_interop import Foundation diff --git a/test/IRGen/typed_boxes.sil b/test/IRGen/typed_boxes.sil index a7abe345dc832..ae7c860f7f447 100644 --- a/test/IRGen/typed_boxes.sil +++ b/test/IRGen/typed_boxes.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize sil_stage canonical import Builtin diff --git a/test/IRGen/typemetadata.sil b/test/IRGen/typemetadata.sil index 5435a0cfd92c9..fcdcbd64830ff 100644 --- a/test/IRGen/typemetadata.sil +++ b/test/IRGen/typemetadata.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // REQUIRES: CPU=x86_64 // XFAIL: linux diff --git a/test/IRGen/unconditional_checked_cast.sil b/test/IRGen/unconditional_checked_cast.sil index 9eb37f8afd4a9..33cd62e4a25fd 100644 --- a/test/IRGen/unconditional_checked_cast.sil +++ b/test/IRGen/unconditional_checked_cast.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/undef.sil b/test/IRGen/undef.sil index f105eba6ed287..359f030fe4a7f 100644 --- a/test/IRGen/undef.sil +++ b/test/IRGen/undef.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/unowned.sil b/test/IRGen/unowned.sil index 9c6eb34fa42f0..05af7d1826324 100644 --- a/test/IRGen/unowned.sil +++ b/test/IRGen/unowned.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -disable-objc-interop -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -disable-objc-interop -emit-ir %s | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/unowned_objc.sil b/test/IRGen/unowned_objc.sil index 97dc095d27df4..f6d646bb55cf9 100644 --- a/test/IRGen/unowned_objc.sil +++ b/test/IRGen/unowned_objc.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // REQUIRES: CPU=x86_64 // XFAIL: linux diff --git a/test/IRGen/unused.sil b/test/IRGen/unused.sil index e72a75c5fb589..24ceafa2b9810 100644 --- a/test/IRGen/unused.sil +++ b/test/IRGen/unused.sil @@ -1,6 +1,6 @@ // RUN: %target-swift-frontend -primary-file %s -emit-ir > %t -// RUN: FileCheck %s --check-prefix=CHECK-%target-object-format --check-prefix=CHECK < %t -// RUN: FileCheck -check-prefix=NEGATIVE %s < %t +// RUN: %FileCheck %s --check-prefix=CHECK-%target-object-format --check-prefix=CHECK < %t +// RUN: %FileCheck -check-prefix=NEGATIVE %s < %t // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/upcast.sil b/test/IRGen/upcast.sil index 3b85b47f73445..e292a1d0fd6ad 100644 --- a/test/IRGen/upcast.sil +++ b/test/IRGen/upcast.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s // Make sure that we are able to lower upcast addresses. diff --git a/test/IRGen/value_buffers.sil b/test/IRGen/value_buffers.sil index 36df17b21d678..1bb90a1ecf759 100644 --- a/test/IRGen/value_buffers.sil +++ b/test/IRGen/value_buffers.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/vector_reduction.swift b/test/IRGen/vector_reduction.swift index 49b0484678dd3..0da5b4e669478 100644 --- a/test/IRGen/vector_reduction.swift +++ b/test/IRGen/vector_reduction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Ounchecked %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -Ounchecked %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/vtable.sil b/test/IRGen/vtable.sil index bf085f935019c..4fd9545dae3c9 100644 --- a/test/IRGen/vtable.sil +++ b/test/IRGen/vtable.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime // REQUIRES: executable_test // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/vtable_multi_file.swift b/test/IRGen/vtable_multi_file.swift index 18b7c2b4cc5ac..76026640e4b2d 100644 --- a/test/IRGen/vtable_multi_file.swift +++ b/test/IRGen/vtable_multi_file.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s %S/Inputs/vtable_multi_file_helper.swift -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s %S/Inputs/vtable_multi_file_helper.swift -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/weak.sil b/test/IRGen/weak.sil index 7a6de6c06ca40..08e0e9b182b6a 100644 --- a/test/IRGen/weak.sil +++ b/test/IRGen/weak.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // REQUIRES: CPU=x86_64 // XFAIL: linux diff --git a/test/IRGen/weak_class_protocol.sil b/test/IRGen/weak_class_protocol.sil index df1aabff96084..be1fcca520f3d 100644 --- a/test/IRGen/weak_class_protocol.sil +++ b/test/IRGen/weak_class_protocol.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/weak_import.swift b/test/IRGen/weak_import.swift index a347c87d9787f..edff1dcca80b3 100644 --- a/test/IRGen/weak_import.swift +++ b/test/IRGen/weak_import.swift @@ -4,8 +4,8 @@ // Specify explicit target triples for the deployment target to test weak // linking for a symbol introduced in OS X 10.51. // -// RUN: %target-swift-frontend(mock-sdk: -target x86_64-apple-macosx10.50 -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | FileCheck -check-prefix=CHECK-10_50 %s -// RUN: %target-swift-frontend(mock-sdk: -target x86_64-apple-macosx10.51 -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | FileCheck -check-prefix=CHECK-10_51 %s +// RUN: %target-swift-frontend(mock-sdk: -target x86_64-apple-macosx10.50 -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck -check-prefix=CHECK-10_50 %s +// RUN: %target-swift-frontend(mock-sdk: -target x86_64-apple-macosx10.51 -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck -check-prefix=CHECK-10_51 %s // REQUIRES: OS=macosx // REQUIRES: objc_interop diff --git a/test/IRGen/weak_value_witnesses.sil b/test/IRGen/weak_value_witnesses.sil index ed32ce8871ca7..f0ea58aa8db0e 100644 --- a/test/IRGen/weak_value_witnesses.sil +++ b/test/IRGen/weak_value_witnesses.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/witness_method.sil b/test/IRGen/witness_method.sil index bc8dddda58b71..bc7a26b7989f7 100644 --- a/test/IRGen/witness_method.sil +++ b/test/IRGen/witness_method.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir | FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-cpu %s +// RUN: %target-swift-frontend %s -emit-ir | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-cpu %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/witness_method_phi.sil b/test/IRGen/witness_method_phi.sil index 5d926e58fe6f4..9db61eb508508 100644 --- a/test/IRGen/witness_method_phi.sil +++ b/test/IRGen/witness_method_phi.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s sil_stage canonical diff --git a/test/IRGen/witness_table_multifile.swift b/test/IRGen/witness_table_multifile.swift index 832e10d0eca25..9108945c6f962 100644 --- a/test/IRGen/witness_table_multifile.swift +++ b/test/IRGen/witness_table_multifile.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s %S/Inputs/witness_table_multifile_2.swift -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s %S/Inputs/witness_table_multifile_2.swift -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // CHECK: [[P_WITNESS_TABLE:%[A-Za-z0-9_]+]] = type { [{{24|12}} x i8], %swift.type*, i8** } diff --git a/test/IRGen/witness_table_objc_associated_type.swift b/test/IRGen/witness_table_objc_associated_type.swift index 32c08750543be..d6a741fd179f6 100644 --- a/test/IRGen/witness_table_objc_associated_type.swift +++ b/test/IRGen/witness_table_objc_associated_type.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s protocol A {} diff --git a/test/IRGen/zombies.swift b/test/IRGen/zombies.swift index aaaf778b1a555..3373aed06d671 100644 --- a/test/IRGen/zombies.swift +++ b/test/IRGen/zombies.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -O -emit-ir | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -O -emit-ir | %FileCheck %s // rdar://24121475 // Ideally, these wouldn't be in the v-table at all; but as long as they diff --git a/test/Interpreter/RosettaCode.swift b/test/Interpreter/RosettaCode.swift index 8c37874ee6125..d62bc1ba7d3d6 100644 --- a/test/Interpreter/RosettaCode.swift +++ b/test/Interpreter/RosettaCode.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // From http://rosettacode.org/wiki/Factorial diff --git a/test/Interpreter/SDK/AnyObject_native_interop.swift b/test/Interpreter/SDK/AnyObject_native_interop.swift index 36e6afd78a2c8..88e315764c45e 100644 --- a/test/Interpreter/SDK/AnyObject_native_interop.swift +++ b/test/Interpreter/SDK/AnyObject_native_interop.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/CALayer.swift b/test/Interpreter/SDK/CALayer.swift index 60360cc5ceb09..de9278604ac2d 100644 --- a/test/Interpreter/SDK/CALayer.swift +++ b/test/Interpreter/SDK/CALayer.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // // REQUIRES: OS=macosx diff --git a/test/Interpreter/SDK/CGImportAsMember.swift b/test/Interpreter/SDK/CGImportAsMember.swift index 51f5313641108..e829d6e7db785 100644 --- a/test/Interpreter/SDK/CGImportAsMember.swift +++ b/test/Interpreter/SDK/CGImportAsMember.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: OS=macosx diff --git a/test/Interpreter/SDK/Cocoa_enums.swift b/test/Interpreter/SDK/Cocoa_enums.swift index 0256ad16c4984..3f376a6e3b20d 100644 --- a/test/Interpreter/SDK/Cocoa_enums.swift +++ b/test/Interpreter/SDK/Cocoa_enums.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/Cocoa_repl.swift b/test/Interpreter/SDK/Cocoa_repl.swift index 9a0f7b14dfeff..de3464521f863 100644 --- a/test/Interpreter/SDK/Cocoa_repl.swift +++ b/test/Interpreter/SDK/Cocoa_repl.swift @@ -1,4 +1,4 @@ -// RUN: %target-repl-run-simple-swift | FileCheck %s +// RUN: %target-repl-run-simple-swift | %FileCheck %s // REQUIRES: objc_interop // REQUIRES: swift_repl diff --git a/test/Interpreter/SDK/CoreFoundation_casting.swift b/test/Interpreter/SDK/CoreFoundation_casting.swift index 6c0715031a276..41bb74d03835b 100644 --- a/test/Interpreter/SDK/CoreFoundation_casting.swift +++ b/test/Interpreter/SDK/CoreFoundation_casting.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/CoreImage_without_Foundation.swift b/test/Interpreter/SDK/CoreImage_without_Foundation.swift index e83ce1fc3d915..48e07e0099153 100644 --- a/test/Interpreter/SDK/CoreImage_without_Foundation.swift +++ b/test/Interpreter/SDK/CoreImage_without_Foundation.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/Foundation_CFString.swift b/test/Interpreter/SDK/Foundation_CFString.swift index 563b7681fbce7..e1485f81ff374 100644 --- a/test/Interpreter/SDK/Foundation_CFString.swift +++ b/test/Interpreter/SDK/Foundation_CFString.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/Foundation_NSExpression.swift b/test/Interpreter/SDK/Foundation_NSExpression.swift index b06730f198386..7ecf9d5292f11 100644 --- a/test/Interpreter/SDK/Foundation_NSExpression.swift +++ b/test/Interpreter/SDK/Foundation_NSExpression.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // rdar://16726530 diff --git a/test/Interpreter/SDK/Foundation_NSLocalizedString.swift b/test/Interpreter/SDK/Foundation_NSLocalizedString.swift index a6681b26a038d..4e4df80a643f2 100644 --- a/test/Interpreter/SDK/Foundation_NSLocalizedString.swift +++ b/test/Interpreter/SDK/Foundation_NSLocalizedString.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/Foundation_NSLog.swift b/test/Interpreter/SDK/Foundation_NSLog.swift index d95de4041a46b..7be29e511d143 100644 --- a/test/Interpreter/SDK/Foundation_NSLog.swift +++ b/test/Interpreter/SDK/Foundation_NSLog.swift @@ -5,7 +5,7 @@ // RUN: %target-build-swift %s %t/NSLogIsWorking.o -import-objc-header %t/NSLogIsWorking.h -o %t/main // RUN: %target-run %t/main 2>%t/output.txt -// RUN: (FileCheck %s < %t/output.txt) || (not FileCheck -check-prefix=CHECK-WORKING %s < %t/output.txt) +// RUN: %FileCheck %s < %t/output.txt // REQUIRES: executable_test // REQUIRES: objc_interop @@ -13,7 +13,6 @@ import Foundation // CHECK: working -// CHECK-WORKING: working testNSLog() // CHECK: 1 is the loneliest number that you'll ever do diff --git a/test/Interpreter/SDK/Foundation_NSPredicate.swift b/test/Interpreter/SDK/Foundation_NSPredicate.swift index 0910a91870fa8..4cbea64a5724b 100644 --- a/test/Interpreter/SDK/Foundation_NSPredicate.swift +++ b/test/Interpreter/SDK/Foundation_NSPredicate.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // rdar://16726530 diff --git a/test/Interpreter/SDK/Foundation_NSRect.swift b/test/Interpreter/SDK/Foundation_NSRect.swift index 5913dd89ac7ec..fbea20b257399 100644 --- a/test/Interpreter/SDK/Foundation_NSRect.swift +++ b/test/Interpreter/SDK/Foundation_NSRect.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // iOS doesn't have NSRect. iOS and OS X CGRect is tested elsewhere. diff --git a/test/Interpreter/SDK/Foundation_NSString.swift b/test/Interpreter/SDK/Foundation_NSString.swift index 2f48f2babff21..1522f3a59292e 100644 --- a/test/Interpreter/SDK/Foundation_NSString.swift +++ b/test/Interpreter/SDK/Foundation_NSString.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/Foundation_bridge.swift b/test/Interpreter/SDK/Foundation_bridge.swift index 4653347da6ac2..199bb98555efe 100644 --- a/test/Interpreter/SDK/Foundation_bridge.swift +++ b/test/Interpreter/SDK/Foundation_bridge.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-build-swift %s -import-objc-header %S/Inputs/Foundation_bridge.h -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/GLKit.swift b/test/Interpreter/SDK/GLKit.swift index 356c053c1f07d..6147b2fd01083 100644 --- a/test/Interpreter/SDK/GLKit.swift +++ b/test/Interpreter/SDK/GLKit.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // NOTE: Clang used to miscompile GLKit functions on i386. rdar://problem/19184403 diff --git a/test/Interpreter/SDK/GLKit_jit.swift b/test/Interpreter/SDK/GLKit_jit.swift index 0e04dab31cbeb..7144c84017c82 100644 --- a/test/Interpreter/SDK/GLKit_jit.swift +++ b/test/Interpreter/SDK/GLKit_jit.swift @@ -1,6 +1,6 @@ // Test GLKit.swift in JIT mode. // -module-name is necessary because of rdar://problem/14483032 -// RUN: %target-jit-run -module-name=main %S/GLKit.swift | FileCheck %S/GLKit.swift +// RUN: %target-jit-run -module-name=main %S/GLKit.swift | %FileCheck %S/GLKit.swift // REQUIRES: objc_interop // REQUIRES: swift_interpreter diff --git a/test/Interpreter/SDK/KVO.swift b/test/Interpreter/SDK/KVO.swift index 37eabbe06abbd..ea3500b546d77 100644 --- a/test/Interpreter/SDK/KVO.swift +++ b/test/Interpreter/SDK/KVO.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/NSDecimal.swift b/test/Interpreter/SDK/NSDecimal.swift index aa58698799161..f14530c3a9432 100644 --- a/test/Interpreter/SDK/NSDecimal.swift +++ b/test/Interpreter/SDK/NSDecimal.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/OS_objects.swift b/test/Interpreter/SDK/OS_objects.swift index 902a2b515ba4c..cf4af931f424e 100644 --- a/test/Interpreter/SDK/OS_objects.swift +++ b/test/Interpreter/SDK/OS_objects.swift @@ -3,7 +3,7 @@ // // RUN: cp %s %t/main.swift // RUN: %target-build-swift %t/main.swift -I %S/Inputs/custom-modules/ -o %t/OS_objects -Xfrontend -disable-access-control -// RUN: %target-run %t/OS_objects 2>&1 | FileCheck %s +// RUN: %target-run %t/OS_objects 2>&1 | %FileCheck %s // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/test/Interpreter/SDK/Quartz_without_Foundation.swift b/test/Interpreter/SDK/Quartz_without_Foundation.swift index 42c49e2cb3ac9..446ae40163355 100644 --- a/test/Interpreter/SDK/Quartz_without_Foundation.swift +++ b/test/Interpreter/SDK/Quartz_without_Foundation.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: OS=macosx diff --git a/test/Interpreter/SDK/Reflection_KVO.swift b/test/Interpreter/SDK/Reflection_KVO.swift index ff775e7f3b458..78e93dcd0119c 100644 --- a/test/Interpreter/SDK/Reflection_KVO.swift +++ b/test/Interpreter/SDK/Reflection_KVO.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/UIActionSheetHack.swift b/test/Interpreter/SDK/UIActionSheetHack.swift index 8b52aa8d1cfeb..442ff55d494a7 100644 --- a/test/Interpreter/SDK/UIActionSheetHack.swift +++ b/test/Interpreter/SDK/UIActionSheetHack.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: OS=ios diff --git a/test/Interpreter/SDK/UIApplicationMain.swift b/test/Interpreter/SDK/UIApplicationMain.swift index ffd0c615a39b3..64ff6e72f4fd8 100644 --- a/test/Interpreter/SDK/UIApplicationMain.swift +++ b/test/Interpreter/SDK/UIApplicationMain.swift @@ -3,7 +3,7 @@ // We aren't yet able to run tests that require a UI context, so just try // building with the real SDK for now. -// DISABLED: %target-run %t/main | FileCheck %s +// DISABLED: %target-run %t/main | %FileCheck %s // REQUIRES: OS=ios diff --git a/test/Interpreter/SDK/archiving_generic_swift_class.swift b/test/Interpreter/SDK/archiving_generic_swift_class.swift index 2d071fbc1afbd..8d6c24c4f6ebe 100644 --- a/test/Interpreter/SDK/archiving_generic_swift_class.swift +++ b/test/Interpreter/SDK/archiving_generic_swift_class.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop // UNSUPPORTED: OS=tvos diff --git a/test/Interpreter/SDK/autorelease.swift b/test/Interpreter/SDK/autorelease.swift index 9ded228d4ae0f..b85f6769269fd 100644 --- a/test/Interpreter/SDK/autorelease.swift +++ b/test/Interpreter/SDK/autorelease.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift foo | FileCheck %s +// RUN: %target-run-simple-swift foo | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/block_calls.swift b/test/Interpreter/SDK/block_calls.swift index f3d3dc37f8fce..161c56a55c04e 100644 --- a/test/Interpreter/SDK/block_calls.swift +++ b/test/Interpreter/SDK/block_calls.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/c_pointers.swift b/test/Interpreter/SDK/c_pointers.swift index 3e577b35d54f1..74f6ea46b70ce 100644 --- a/test/Interpreter/SDK/c_pointers.swift +++ b/test/Interpreter/SDK/c_pointers.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-build-swift %s -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/class_as_object.swift b/test/Interpreter/SDK/class_as_object.swift index f55775d5aac62..7acaab16c06e7 100644 --- a/test/Interpreter/SDK/class_as_object.swift +++ b/test/Interpreter/SDK/class_as_object.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-build-swift %s -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/dictionary_pattern_matching.swift b/test/Interpreter/SDK/dictionary_pattern_matching.swift index 91d03e0288377..8380fcf9212ac 100644 --- a/test/Interpreter/SDK/dictionary_pattern_matching.swift +++ b/test/Interpreter/SDK/dictionary_pattern_matching.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/equatable_hashable.swift b/test/Interpreter/SDK/equatable_hashable.swift index 498949d48b77b..e33e3d8c8d7c2 100644 --- a/test/Interpreter/SDK/equatable_hashable.swift +++ b/test/Interpreter/SDK/equatable_hashable.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/glob.swift b/test/Interpreter/SDK/glob.swift index 846fd05464d53..71ac5756953dd 100644 --- a/test/Interpreter/SDK/glob.swift +++ b/test/Interpreter/SDK/glob.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/header_static.swift b/test/Interpreter/SDK/header_static.swift index d80f532f29aef..78f9c5551a2ff 100644 --- a/test/Interpreter/SDK/header_static.swift +++ b/test/Interpreter/SDK/header_static.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/interpret_with_options.swift b/test/Interpreter/SDK/interpret_with_options.swift index fdbff58bea628..39b524b32a7ae 100644 --- a/test/Interpreter/SDK/interpret_with_options.swift +++ b/test/Interpreter/SDK/interpret_with_options.swift @@ -1,8 +1,8 @@ -// RUN: %swift_driver -sdk %sdk %s | FileCheck -check-prefix=WITHOUT-LIB %s -// RUN: %swift_driver -sdk %sdk -L %S/Inputs/ -lTestLoad %s | FileCheck -check-prefix=WITH-LIB %s -// RUN: %swift_driver -sdk %sdk -L %S/Inputs/ -llibTestLoad.dylib %s | FileCheck -check-prefix=WITH-LIB %s -// RUN: %swift_driver -sdk %sdk -l%S/Inputs/libTestLoad.dylib %s | FileCheck -check-prefix=WITH-LIB %s -// RUN: cd %S && %swift_driver -sdk %sdk -lInputs/libTestLoad.dylib %s | FileCheck -check-prefix=WITH-LIB %s +// RUN: %swift_driver -sdk %sdk %s | %FileCheck -check-prefix=WITHOUT-LIB %s +// RUN: %swift_driver -sdk %sdk -L %S/Inputs/ -lTestLoad %s | %FileCheck -check-prefix=WITH-LIB %s +// RUN: %swift_driver -sdk %sdk -L %S/Inputs/ -llibTestLoad.dylib %s | %FileCheck -check-prefix=WITH-LIB %s +// RUN: %swift_driver -sdk %sdk -l%S/Inputs/libTestLoad.dylib %s | %FileCheck -check-prefix=WITH-LIB %s +// RUN: cd %S && %swift_driver -sdk %sdk -lInputs/libTestLoad.dylib %s | %FileCheck -check-prefix=WITH-LIB %s // REQUIRES: OS=macosx import ObjectiveC diff --git a/test/Interpreter/SDK/libc.swift b/test/Interpreter/SDK/libc.swift index 506918cf46193..2325fc04a38ce 100644 --- a/test/Interpreter/SDK/libc.swift +++ b/test/Interpreter/SDK/libc.swift @@ -2,7 +2,7 @@ // Do not edit the line above. // RUN: rm -rf %t && mkdir -p %t -// RUN: %target-run-simple-swift %s %t | FileCheck %s +// RUN: %target-run-simple-swift %s %t | %FileCheck %s // rdar://26960623 // REQUIRES: disabled // REQUIRES: executable_test diff --git a/test/Interpreter/SDK/mapkit_header_static.swift b/test/Interpreter/SDK/mapkit_header_static.swift index e5667db5ecdce..48a3189641e01 100644 --- a/test/Interpreter/SDK/mapkit_header_static.swift +++ b/test/Interpreter/SDK/mapkit_header_static.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/missing_imports_repl.swift b/test/Interpreter/SDK/missing_imports_repl.swift index 944f28941293f..9e22dfb34f6bb 100644 --- a/test/Interpreter/SDK/missing_imports_repl.swift +++ b/test/Interpreter/SDK/missing_imports_repl.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir %t // RUN: touch %t/Corrupted_Module.swiftmodule -// RUN: not %target-repl-run-simple-swift -I %t 2> %t/stderr.txt | FileCheck %s -// RUN: FileCheck -check-prefix CHECK-ERROR %s < %t/stderr.txt +// RUN: not %target-repl-run-simple-swift -I %t 2> %t/stderr.txt | %FileCheck %s +// RUN: %FileCheck -check-prefix CHECK-ERROR %s < %t/stderr.txt // REQUIRES: objc_interop // REQUIRES: swift_repl diff --git a/test/Interpreter/SDK/multi-file-imported-enum.swift b/test/Interpreter/SDK/multi-file-imported-enum.swift index 02407d6bccd08..aefa17fd6bc24 100644 --- a/test/Interpreter/SDK/multi-file-imported-enum.swift +++ b/test/Interpreter/SDK/multi-file-imported-enum.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-build-swift -module-name test -whole-module-optimization %s %S/Inputs/multi-file-imported-enum/main.swift -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test // XFAIL: linux diff --git a/test/Interpreter/SDK/objc_block_generic.swift b/test/Interpreter/SDK/objc_block_generic.swift index aac10759d0243..5f967ee06a7af 100644 --- a/test/Interpreter/SDK/objc_block_generic.swift +++ b/test/Interpreter/SDK/objc_block_generic.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/objc_bridge.swift b/test/Interpreter/SDK/objc_bridge.swift index 2513321036c03..79824bb28d27f 100644 --- a/test/Interpreter/SDK/objc_bridge.swift +++ b/test/Interpreter/SDK/objc_bridge.swift @@ -9,7 +9,7 @@ // RUN: %target-build-swift -c -parse-as-library -I %S/../../Inputs/ObjCBridging %S/../../Inputs/ObjCBridging/Appliances.swift -module-name Appliances -o %t/AppliancesSwift.o // RUN: %target-build-swift -I %t -I %S/../../Inputs/ObjCBridging %s %t/AppliancesSwift.o %t/AppliancesObjC.o -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/objc_bridge_cast.swift b/test/Interpreter/SDK/objc_bridge_cast.swift index de30f544aff3f..5eb1e0cd8be31 100644 --- a/test/Interpreter/SDK/objc_bridge_cast.swift +++ b/test/Interpreter/SDK/objc_bridge_cast.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/objc_cast.swift b/test/Interpreter/SDK/objc_cast.swift index 3ee96f3239bce..2786902058511 100644 --- a/test/Interpreter/SDK/objc_cast.swift +++ b/test/Interpreter/SDK/objc_cast.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // rdar://problem/27616753 diff --git a/test/Interpreter/SDK/objc_currying.swift b/test/Interpreter/SDK/objc_currying.swift index ca502e33aa619..6c8cb5e2e7781 100644 --- a/test/Interpreter/SDK/objc_currying.swift +++ b/test/Interpreter/SDK/objc_currying.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/objc_dealloc.swift b/test/Interpreter/SDK/objc_dealloc.swift index 1193f5f082319..9e30d171238dd 100644 --- a/test/Interpreter/SDK/objc_dealloc.swift +++ b/test/Interpreter/SDK/objc_dealloc.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/objc_dynamic_lookup.swift b/test/Interpreter/SDK/objc_dynamic_lookup.swift index 72ee148ef5924..2d74305095788 100644 --- a/test/Interpreter/SDK/objc_dynamic_lookup.swift +++ b/test/Interpreter/SDK/objc_dynamic_lookup.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/objc_extensions.swift b/test/Interpreter/SDK/objc_extensions.swift index f528fb6064a4c..4088e337b3cc0 100644 --- a/test/Interpreter/SDK/objc_extensions.swift +++ b/test/Interpreter/SDK/objc_extensions.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/objc_factory_method.swift b/test/Interpreter/SDK/objc_factory_method.swift index 9405b93d15ed2..6a8db764ae60c 100644 --- a/test/Interpreter/SDK/objc_factory_method.swift +++ b/test/Interpreter/SDK/objc_factory_method.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-build-swift -module-name FactoryTest %s -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test // REQUIRES: OS=macosx diff --git a/test/Interpreter/SDK/objc_fast_enumeration.swift b/test/Interpreter/SDK/objc_fast_enumeration.swift index fba5d7ddd369b..72a1668cb4cb0 100644 --- a/test/Interpreter/SDK/objc_fast_enumeration.swift +++ b/test/Interpreter/SDK/objc_fast_enumeration.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/objc_inner_pointer.swift b/test/Interpreter/SDK/objc_inner_pointer.swift index 288a74ebb27dd..44f893b3fecf6 100644 --- a/test/Interpreter/SDK/objc_inner_pointer.swift +++ b/test/Interpreter/SDK/objc_inner_pointer.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/objc_keypath.swift b/test/Interpreter/SDK/objc_keypath.swift index bd7b0d2940730..5a7c6d757bbfb 100644 --- a/test/Interpreter/SDK/objc_keypath.swift +++ b/test/Interpreter/SDK/objc_keypath.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/objc_mangling.swift b/test/Interpreter/SDK/objc_mangling.swift index 331e6ebe7aded..3a4406006730f 100644 --- a/test/Interpreter/SDK/objc_mangling.swift +++ b/test/Interpreter/SDK/objc_mangling.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-build-swift -module-name MangleTest %s -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/objc_nil.swift b/test/Interpreter/SDK/objc_nil.swift index 1a3f5dd2688c2..a2d90276904b3 100644 --- a/test/Interpreter/SDK/objc_nil.swift +++ b/test/Interpreter/SDK/objc_nil.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/objc_nsstring_bridge.swift b/test/Interpreter/SDK/objc_nsstring_bridge.swift index ec4c4b87ec489..3fa0be9bda198 100644 --- a/test/Interpreter/SDK/objc_nsstring_bridge.swift +++ b/test/Interpreter/SDK/objc_nsstring_bridge.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/objc_protocol_lookup.swift b/test/Interpreter/SDK/objc_protocol_lookup.swift index 16684643fb8ab..ff76a2e97fdfa 100644 --- a/test/Interpreter/SDK/objc_protocol_lookup.swift +++ b/test/Interpreter/SDK/objc_protocol_lookup.swift @@ -1,5 +1,5 @@ // Check JIT mode -// RUN: %target-jit-run %s | FileCheck %s +// RUN: %target-jit-run %s | %FileCheck %s // REQUIRES: swift_interpreter // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/objc_protocol_lookup_jit.swift b/test/Interpreter/SDK/objc_protocol_lookup_jit.swift index ce7418fa61185..ef07162b0fcfd 100644 --- a/test/Interpreter/SDK/objc_protocol_lookup_jit.swift +++ b/test/Interpreter/SDK/objc_protocol_lookup_jit.swift @@ -1,5 +1,5 @@ // Test objc_protocol_lookup.swift in JIT mode. -// RUN: %target-jit-run %S/objc_protocol_lookup.swift | FileCheck %S/objc_protocol_lookup.swift +// RUN: %target-jit-run %S/objc_protocol_lookup.swift | %FileCheck %S/objc_protocol_lookup.swift // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/objc_subclass.swift b/test/Interpreter/SDK/objc_subclass.swift index b73916599ba7d..4aa7aed14f0c5 100644 --- a/test/Interpreter/SDK/objc_subclass.swift +++ b/test/Interpreter/SDK/objc_subclass.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift foo | FileCheck %s +// RUN: %target-run-simple-swift foo | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/objc_switch.swift b/test/Interpreter/SDK/objc_switch.swift index 55426e9dbfeb7..6e6be8aecdf47 100644 --- a/test/Interpreter/SDK/objc_switch.swift +++ b/test/Interpreter/SDK/objc_switch.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/objc_unowned.swift b/test/Interpreter/SDK/objc_unowned.swift index ca4d9f5d136f0..fc75dc0ca0b3b 100644 --- a/test/Interpreter/SDK/objc_unowned.swift +++ b/test/Interpreter/SDK/objc_unowned.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/objc_witness_to_swift_protocol.swift b/test/Interpreter/SDK/objc_witness_to_swift_protocol.swift index c23025fefe3ef..bf677bba6dd61 100644 --- a/test/Interpreter/SDK/objc_witness_to_swift_protocol.swift +++ b/test/Interpreter/SDK/objc_witness_to_swift_protocol.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/protocol_lookup_foreign.swift b/test/Interpreter/SDK/protocol_lookup_foreign.swift index 66ab529d573a3..df51586223776 100644 --- a/test/Interpreter/SDK/protocol_lookup_foreign.swift +++ b/test/Interpreter/SDK/protocol_lookup_foreign.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/SDK/weak_objc_interop.swift b/test/Interpreter/SDK/weak_objc_interop.swift index 026b79d3d7a18..f2598ab36a376 100644 --- a/test/Interpreter/SDK/weak_objc_interop.swift +++ b/test/Interpreter/SDK/weak_objc_interop.swift @@ -4,7 +4,7 @@ // RUN: cp %s %t/main.swift // RUN: %target-clang -fobjc-arc %S/Inputs/ObjCWeak/ObjCWeak.m -c -o %t/ObjCWeak.o // RUN: %target-build-swift %t/main.swift -I %S/Inputs/ObjCWeak/ -Xlinker %t/ObjCWeak.o -o %t/weak_objc_interop -Xfrontend -disable-access-control -// RUN: %target-run %t/weak_objc_interop 2>&1 | FileCheck %s +// RUN: %target-run %t/weak_objc_interop 2>&1 | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/algorithms.swift b/test/Interpreter/algorithms.swift index 54a40ac10ded9..90d96a3e0ffb9 100644 --- a/test/Interpreter/algorithms.swift +++ b/test/Interpreter/algorithms.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test func fib() { diff --git a/test/Interpreter/archetype_casts.swift b/test/Interpreter/archetype_casts.swift index 289f453c7e6e3..213ad6794cf78 100644 --- a/test/Interpreter/archetype_casts.swift +++ b/test/Interpreter/archetype_casts.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test class C { diff --git a/test/Interpreter/array_of_optional.swift b/test/Interpreter/array_of_optional.swift index db3740b5cb28d..1860c61084c26 100644 --- a/test/Interpreter/array_of_optional.swift +++ b/test/Interpreter/array_of_optional.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // diff --git a/test/Interpreter/arrays.swift b/test/Interpreter/arrays.swift index ff94adbc535bf..b3a60b8f0447a 100644 --- a/test/Interpreter/arrays.swift +++ b/test/Interpreter/arrays.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // Create a new array diff --git a/test/Interpreter/availability_weak_linking.swift b/test/Interpreter/availability_weak_linking.swift index 7115b2e6d6805..35a7cd8b45ca6 100644 --- a/test/Interpreter/availability_weak_linking.swift +++ b/test/Interpreter/availability_weak_linking.swift @@ -12,8 +12,8 @@ // at run time. // RUN: mv %t/FakeUnavailableObjCFramework.framework %t/FakeUnavailableObjCFramework-MovedAside.framework -// RUN: %target-run %t/UseWeaklinkedUnavailableObjCFramework | FileCheck %s -// RUN: %target-run %t/UseWeaklinkedUnavailableObjCFramework.opt | FileCheck %s +// RUN: %target-run %t/UseWeaklinkedUnavailableObjCFramework | %FileCheck %s +// RUN: %target-run %t/UseWeaklinkedUnavailableObjCFramework.opt | %FileCheck %s // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/test/Interpreter/binary_operator_perf.swift b/test/Interpreter/binary_operator_perf.swift index 7b868c41b27d1..ad2bb04daa7fd 100644 --- a/test/Interpreter/binary_operator_perf.swift +++ b/test/Interpreter/binary_operator_perf.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test var test1 = diff --git a/test/Interpreter/bitvector.swift b/test/Interpreter/bitvector.swift index 700ec4373381e..82d3033e4a012 100644 --- a/test/Interpreter/bitvector.swift +++ b/test/Interpreter/bitvector.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test import Swift diff --git a/test/Interpreter/bool_as_generic.swift b/test/Interpreter/bool_as_generic.swift index 5febd582f4de9..f5b55daf379ee 100644 --- a/test/Interpreter/bool_as_generic.swift +++ b/test/Interpreter/bool_as_generic.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // Missing Bool metadata when Bool is used as a generic // parameter or existential value diff --git a/test/Interpreter/break_continue.swift b/test/Interpreter/break_continue.swift index 534b8a6021065..8b8be0ff2e812 100644 --- a/test/Interpreter/break_continue.swift +++ b/test/Interpreter/break_continue.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test func test4() { diff --git a/test/Interpreter/builtin.swift b/test/Interpreter/builtin.swift index 1fc35c4e48f5e..514b30cefc87a 100644 --- a/test/Interpreter/builtin.swift +++ b/test/Interpreter/builtin.swift @@ -1,6 +1,6 @@ // RUN: mkdir -p %t // RUN: %target-build-swift %s -parse-stdlib -Xfrontend -disable-access-control -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test import Swift diff --git a/test/Interpreter/builtin_bridge_object.swift b/test/Interpreter/builtin_bridge_object.swift index a993b02c4bcf6..6f4adeea052f2 100644 --- a/test/Interpreter/builtin_bridge_object.swift +++ b/test/Interpreter/builtin_bridge_object.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -parse-stdlib %s -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test // FIXME: rdar://problem/19648117 Needs splitting objc parts out diff --git a/test/Interpreter/capture_inout.swift b/test/Interpreter/capture_inout.swift index 60d69e8711b37..1b9d54dc44586 100644 --- a/test/Interpreter/capture_inout.swift +++ b/test/Interpreter/capture_inout.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test func foo(_ x: inout Int) { diff --git a/test/Interpreter/capture_top_level.swift b/test/Interpreter/capture_top_level.swift index d6fc5188ad251..732491ced326e 100644 --- a/test/Interpreter/capture_top_level.swift +++ b/test/Interpreter/capture_top_level.swift @@ -1,10 +1,10 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // RUN: %target-build-swift -DVAR %s -o %t-var -// RUN: %target-run %t-var | FileCheck %s +// RUN: %target-run %t-var | %FileCheck %s // RUN: %target-build-swift -DVAR_UPDATE %s -o %t-var -// RUN: %target-run %t-var | FileCheck %s +// RUN: %target-run %t-var | %FileCheck %s // REQUIRES: executable_test diff --git a/test/Interpreter/capture_unowned.swift b/test/Interpreter/capture_unowned.swift index 275b5add7ba8e..d0607a2ffad4e 100644 --- a/test/Interpreter/capture_unowned.swift +++ b/test/Interpreter/capture_unowned.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test class C { diff --git a/test/Interpreter/classes.swift b/test/Interpreter/classes.swift index c7042c689272c..81c86362c432d 100644 --- a/test/Interpreter/classes.swift +++ b/test/Interpreter/classes.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test class Interval { diff --git a/test/Interpreter/closures.swift b/test/Interpreter/closures.swift index d408604c93da1..33d5eb69a1b3a 100644 --- a/test/Interpreter/closures.swift +++ b/test/Interpreter/closures.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test func localFunc(_ x: Int) -> Int { diff --git a/test/Interpreter/collection_casts.swift b/test/Interpreter/collection_casts.swift index 3600f5706f3a9..7d1260c365d9d 100644 --- a/test/Interpreter/collection_casts.swift +++ b/test/Interpreter/collection_casts.swift @@ -2,8 +2,8 @@ // RUN: mkdir -p %t // RUN: %target-build-swift %s -Xfrontend -enable-experimental-collection-casts -o %t/main // RUN: %target-build-swift %s -Xfrontend -enable-experimental-collection-casts -o %t/main-optimized -// RUN: %target-run %t/main | FileCheck %s -// RUN: %target-run %t/main-optimized | FileCheck %s +// RUN: %target-run %t/main | %FileCheck %s +// RUN: %target-run %t/main-optimized | %FileCheck %s // REQUIRES: executable_test protocol Preening { diff --git a/test/Interpreter/constructor.swift b/test/Interpreter/constructor.swift index 24d415559bcc8..bb05e0ca51212 100644 --- a/test/Interpreter/constructor.swift +++ b/test/Interpreter/constructor.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test class A { diff --git a/test/Interpreter/conversions.swift b/test/Interpreter/conversions.swift index fa5afcc09879a..2fb757b987058 100644 --- a/test/Interpreter/conversions.swift +++ b/test/Interpreter/conversions.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test class B { func foo() { print("foo") } } diff --git a/test/Interpreter/currying_generics.swift b/test/Interpreter/currying_generics.swift index 4e3550391a3ac..9a606db3a6aae 100644 --- a/test/Interpreter/currying_generics.swift +++ b/test/Interpreter/currying_generics.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test func curry(_ f: @escaping (T, U) -> V) -> @escaping (T) -> @escaping (U) -> V { diff --git a/test/Interpreter/currying_protocols.swift b/test/Interpreter/currying_protocols.swift index 0ad9b016099a9..88f3ae4d6ff9f 100644 --- a/test/Interpreter/currying_protocols.swift +++ b/test/Interpreter/currying_protocols.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test enum Medal { diff --git a/test/Interpreter/defer.swift b/test/Interpreter/defer.swift index cd0c31128ce60..5e75a93c97ba6 100644 --- a/test/Interpreter/defer.swift +++ b/test/Interpreter/defer.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test do { diff --git a/test/Interpreter/destructors.swift b/test/Interpreter/destructors.swift index b3c1974c1e7ae..818d3c2186d25 100644 --- a/test/Interpreter/destructors.swift +++ b/test/Interpreter/destructors.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test class C { diff --git a/test/Interpreter/dynamic_lookup.swift b/test/Interpreter/dynamic_lookup.swift index 3b748f65d2ed4..e90793089c08b 100644 --- a/test/Interpreter/dynamic_lookup.swift +++ b/test/Interpreter/dynamic_lookup.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/dynamic_self.swift b/test/Interpreter/dynamic_self.swift index 27485979a314c..da526077b6780 100644 --- a/test/Interpreter/dynamic_self.swift +++ b/test/Interpreter/dynamic_self.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // Test IR generation via execution for Self. diff --git a/test/Interpreter/enum.swift b/test/Interpreter/enum.swift index adac8aef1297f..e7c8815493b4f 100644 --- a/test/Interpreter/enum.swift +++ b/test/Interpreter/enum.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-build-swift %s -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test enum Singleton { diff --git a/test/Interpreter/enum_runtime_alignment.swift b/test/Interpreter/enum_runtime_alignment.swift index 7d4123e511021..5602952ec201e 100644 --- a/test/Interpreter/enum_runtime_alignment.swift +++ b/test/Interpreter/enum_runtime_alignment.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test diff --git a/test/Interpreter/formal_access.swift b/test/Interpreter/formal_access.swift index 30420eba3b900..e101cf841a48d 100644 --- a/test/Interpreter/formal_access.swift +++ b/test/Interpreter/formal_access.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test class C: CustomStringConvertible { diff --git a/test/Interpreter/fractal.swift b/test/Interpreter/fractal.swift index 9434af2e5ea43..25ec37c071da4 100644 --- a/test/Interpreter/fractal.swift +++ b/test/Interpreter/fractal.swift @@ -1,5 +1,5 @@ // RUN: rm -rf %t && mkdir %t -// RUN: %target-jit-run %s -I %S -enable-source-import | FileCheck %s +// RUN: %target-jit-run %s -I %S -enable-source-import | %FileCheck %s // REQUIRES: executable_test // REQUIRES: swift_interpreter diff --git a/test/Interpreter/function_metatypes.swift b/test/Interpreter/function_metatypes.swift index fe3efed549bbd..87da20744bd05 100644 --- a/test/Interpreter/function_metatypes.swift +++ b/test/Interpreter/function_metatypes.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test protocol ProtocolHasInOut { diff --git a/test/Interpreter/functions.swift b/test/Interpreter/functions.swift index b7bc6f6d4aefc..891948b0f9355 100644 --- a/test/Interpreter/functions.swift +++ b/test/Interpreter/functions.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test func double(_ x: Int) -> Int { diff --git a/test/Interpreter/generic_casts.swift b/test/Interpreter/generic_casts.swift index 24e56e31cfa08..ce372972772e9 100644 --- a/test/Interpreter/generic_casts.swift +++ b/test/Interpreter/generic_casts.swift @@ -1,6 +1,6 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // RUN: %target-build-swift -O %s -o %t/a.out.optimized -// RUN: %target-run %t/a.out.optimized | FileCheck %s +// RUN: %target-run %t/a.out.optimized | %FileCheck %s // REQUIRES: executable_test // FIXME: rdar://problem/19648117 Needs splitting objc parts out diff --git a/test/Interpreter/generic_class.swift b/test/Interpreter/generic_class.swift index 27d2163dba754..b493f04b5a44e 100644 --- a/test/Interpreter/generic_class.swift +++ b/test/Interpreter/generic_class.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-build-swift %s -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test protocol MyPrintable { diff --git a/test/Interpreter/generic_implicit_closure.swift b/test/Interpreter/generic_implicit_closure.swift index e332954a2298d..8f47b5aa41607 100644 --- a/test/Interpreter/generic_implicit_closure.swift +++ b/test/Interpreter/generic_implicit_closure.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test protocol MyBoolean { diff --git a/test/Interpreter/generic_objc_subclass.swift b/test/Interpreter/generic_objc_subclass.swift index 8f164f4935142..d3cc6bdba1dff 100644 --- a/test/Interpreter/generic_objc_subclass.swift +++ b/test/Interpreter/generic_objc_subclass.swift @@ -3,7 +3,7 @@ // // RUN: %target-clang -fobjc-arc %S/Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o // RUN: %target-build-swift -I %S/Inputs/ObjCClasses/ -Xlinker %t/ObjCClasses.o %s -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/generic_ref_counts.swift b/test/Interpreter/generic_ref_counts.swift index f2abef236206d..ca88d4ff363de 100644 --- a/test/Interpreter/generic_ref_counts.swift +++ b/test/Interpreter/generic_ref_counts.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test import Swift diff --git a/test/Interpreter/generic_struct.swift b/test/Interpreter/generic_struct.swift index 163dfb27ba67c..2c132f76cc994 100644 --- a/test/Interpreter/generic_struct.swift +++ b/test/Interpreter/generic_struct.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-build-swift %s -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test protocol MyPrintable { diff --git a/test/Interpreter/generic_tuple.swift b/test/Interpreter/generic_tuple.swift index 2794c5becdc80..fdaba049a852d 100644 --- a/test/Interpreter/generic_tuple.swift +++ b/test/Interpreter/generic_tuple.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // We were using the wrong type metadata pointer for the empty diff --git a/test/Interpreter/generics.swift b/test/Interpreter/generics.swift index 1585a827e2629..7e4fd7f445d10 100644 --- a/test/Interpreter/generics.swift +++ b/test/Interpreter/generics.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test struct BigStruct { var a,b,c,d,e,f,g,h:Int } diff --git a/test/Interpreter/hello_func.swift b/test/Interpreter/hello_func.swift index 110d89fdccd9b..b311ca6ebd821 100644 --- a/test/Interpreter/hello_func.swift +++ b/test/Interpreter/hello_func.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // CHECK: Nice shoes diff --git a/test/Interpreter/hello_toplevel.swift b/test/Interpreter/hello_toplevel.swift index 820549cf50f74..48e332c95c614 100644 --- a/test/Interpreter/hello_toplevel.swift +++ b/test/Interpreter/hello_toplevel.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // CHECK: Hey I just met you and this is crazy diff --git a/test/Interpreter/if_expr.swift b/test/Interpreter/if_expr.swift index 1a0dcfa9c62c8..a419c85a27d02 100644 --- a/test/Interpreter/if_expr.swift +++ b/test/Interpreter/if_expr.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // CHECK: 1 diff --git a/test/Interpreter/import.swift b/test/Interpreter/import.swift index f449015fb3e56..3f9c9aef916de 100644 --- a/test/Interpreter/import.swift +++ b/test/Interpreter/import.swift @@ -1,4 +1,4 @@ -// RUN: %swift -interpret -I %S/Inputs -enable-source-import %s | FileCheck %s +// RUN: %swift -interpret -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: swift_interpreter // FIXME: This test uses IRGen with -enable-source-import; it may fail with -g. diff --git a/test/Interpreter/import_as_member.swift b/test/Interpreter/import_as_member.swift index 61d32e98b4152..79185222ff85b 100644 --- a/test/Interpreter/import_as_member.swift +++ b/test/Interpreter/import_as_member.swift @@ -2,7 +2,7 @@ // RUN: mkdir -p %t // RUN: %clang -isysroot %sdk %S/Inputs/ImportAsMember/IAMVec.c -c -o %t/IAMVec.o // RUN: %target-build-swift -I %S/Inputs/ImportAsMember/ -Xlinker %t/IAMVec.o %s -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: swift_interpreter // REQUIRES: OS=macosx diff --git a/test/Interpreter/initializers.swift b/test/Interpreter/initializers.swift index be54ba048f7ca..36bcb374de91a 100644 --- a/test/Interpreter/initializers.swift +++ b/test/Interpreter/initializers.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // Test initialization and initializer inheritance. diff --git a/test/Interpreter/interpolation.swift b/test/Interpreter/interpolation.swift index 88742d68c3a2e..e6f8f7b5aa8be 100644 --- a/test/Interpreter/interpolation.swift +++ b/test/Interpreter/interpolation.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // FIXME: rdar://16168414 big int interpolation isn't working on 32-bit diff --git a/test/Interpreter/interpret_load_framework.swift b/test/Interpreter/interpret_load_framework.swift index c3c4470f95465..d0df18702ff7d 100644 --- a/test/Interpreter/interpret_load_framework.swift +++ b/test/Interpreter/interpret_load_framework.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: cp -R %S/Inputs/VerySmallObjCFramework.framework %t // RUN: %clang -dynamiclib %S/Inputs/VerySmallObjCFramework.m -fmodules -F %t -o %t/VerySmallObjCFramework.framework/VerySmallObjCFramework -// RUN: %swift_driver -F %t %s | FileCheck %s +// RUN: %swift_driver -F %t %s | %FileCheck %s // REQUIRES: objc_interop // REQUIRES: swift_interpreter diff --git a/test/Interpreter/layout_reabstraction.swift b/test/Interpreter/layout_reabstraction.swift index 1772a0aaa8e2a..98a472dff9d9c 100644 --- a/test/Interpreter/layout_reabstraction.swift +++ b/test/Interpreter/layout_reabstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test struct S {} diff --git a/test/Interpreter/mandelbrot.swift b/test/Interpreter/mandelbrot.swift index 3f38b53a89e44..bd89e79d7987a 100644 --- a/test/Interpreter/mandelbrot.swift +++ b/test/Interpreter/mandelbrot.swift @@ -1,4 +1,4 @@ -// RUN: %target-jit-run -I %S -enable-source-import %s | FileCheck %s +// RUN: %target-jit-run -I %S -enable-source-import %s | %FileCheck %s // REQUIRES: executable_test // REQUIRES: swift_interpreter diff --git a/test/Interpreter/nested_generics.swift b/test/Interpreter/nested_generics.swift index 3af5558be42f0..8156f33e29979 100644 --- a/test/Interpreter/nested_generics.swift +++ b/test/Interpreter/nested_generics.swift @@ -1,6 +1,6 @@ // RUN: mkdir -p %t // RUN: %target-build-swift %s -Xfrontend -enable-experimental-nested-generic-types -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test protocol MyPrintable { diff --git a/test/Interpreter/objc_runtime_visible.swift b/test/Interpreter/objc_runtime_visible.swift index 82701c9af3626..9f11c31655fd4 100644 --- a/test/Interpreter/objc_runtime_visible.swift +++ b/test/Interpreter/objc_runtime_visible.swift @@ -2,7 +2,7 @@ // RUN: %clang %target-cc-options -isysroot %sdk -fobjc-arc %S/Inputs/objc_runtime_visible.m -fmodules -nodefaultlibs -lc -dynamiclib -o %t/libobjc_runtime_visible.dylib -install_name @executable_path/libobjc_runtime_visible.dylib // RUN: codesign -f -s - %t/libobjc_runtime_visible.dylib -// RUN: nm -g %t/libobjc_runtime_visible.dylib | FileCheck %s +// RUN: nm -g %t/libobjc_runtime_visible.dylib | %FileCheck %s // RUN: %target-build-swift -import-objc-header %S/Inputs/objc_runtime_visible.h %t/libobjc_runtime_visible.dylib %s -o %t/main // RUN: %target-run %t/main %t/libobjc_runtime_visible.dylib diff --git a/test/Interpreter/object.swift b/test/Interpreter/object.swift index f514f675f1449..ad7d3a8841a4c 100644 --- a/test/Interpreter/object.swift +++ b/test/Interpreter/object.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test func test() { diff --git a/test/Interpreter/optional.swift b/test/Interpreter/optional.swift index f24d41e9b93a5..ed3be1efbca12 100644 --- a/test/Interpreter/optional.swift +++ b/test/Interpreter/optional.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test class A { diff --git a/test/Interpreter/optional_lvalues.swift b/test/Interpreter/optional_lvalues.swift index 61b0871751ee9..49b8956bf183d 100644 --- a/test/Interpreter/optional_lvalues.swift +++ b/test/Interpreter/optional_lvalues.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test var x: Int! = 0 diff --git a/test/Interpreter/pinning.swift b/test/Interpreter/pinning.swift index a2ff27557b012..44fff0a13fc3f 100644 --- a/test/Interpreter/pinning.swift +++ b/test/Interpreter/pinning.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -parse-stdlib %s -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test import Swift diff --git a/test/Interpreter/process_arguments.swift b/test/Interpreter/process_arguments.swift index 65e8b6814f041..5be68551a0b51 100644 --- a/test/Interpreter/process_arguments.swift +++ b/test/Interpreter/process_arguments.swift @@ -1,7 +1,7 @@ -// RUN: %swift -interpret %s | FileCheck %s -check-prefix=CHECK-NONE -// RUN: %swift -interpret %s -Onone -g | FileCheck %s -check-prefix=CHECK-NONE -// RUN: %swift -interpret %s -Onone -g -- | FileCheck %s -check-prefix=CHECK-NONE -// RUN: %swift -interpret %s -Onone -g -- a b c | FileCheck %s -check-prefix=CHECK-THREE +// RUN: %swift -interpret %s | %FileCheck %s -check-prefix=CHECK-NONE +// RUN: %swift -interpret %s -Onone -g | %FileCheck %s -check-prefix=CHECK-NONE +// RUN: %swift -interpret %s -Onone -g -- | %FileCheck %s -check-prefix=CHECK-NONE +// RUN: %swift -interpret %s -Onone -g -- a b c | %FileCheck %s -check-prefix=CHECK-THREE // REQUIRES: swift_interpreter diff --git a/test/Interpreter/properties.swift b/test/Interpreter/properties.swift index d6b6a602bed6a..7b9ef291bb801 100644 --- a/test/Interpreter/properties.swift +++ b/test/Interpreter/properties.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test var foo: Int { diff --git a/test/Interpreter/protocol_extensions.swift b/test/Interpreter/protocol_extensions.swift index b02cbd480e3d4..c21a17c26ef5d 100644 --- a/test/Interpreter/protocol_extensions.swift +++ b/test/Interpreter/protocol_extensions.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // Extend a protocol with a property. diff --git a/test/Interpreter/protocol_lookup.swift b/test/Interpreter/protocol_lookup.swift index 2aaed0228f6f0..29042b1e71be6 100644 --- a/test/Interpreter/protocol_lookup.swift +++ b/test/Interpreter/protocol_lookup.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime +// RUN: %target-run-simple-swift | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime // REQUIRES: executable_test // Note: JIT mode is checked in Interpreter/protocol_lookup_jit.swift. diff --git a/test/Interpreter/protocol_lookup_jit.swift b/test/Interpreter/protocol_lookup_jit.swift index 33f63ea912498..365a706129c40 100644 --- a/test/Interpreter/protocol_lookup_jit.swift +++ b/test/Interpreter/protocol_lookup_jit.swift @@ -1,5 +1,5 @@ // Test protocol_lookup.swift in JIT mode. -// RUN: %swift -interpret %S/protocol_lookup.swift | FileCheck %S/protocol_lookup.swift --check-prefix=CHECK --check-prefix=CHECK-%target-runtime +// RUN: %swift -interpret %S/protocol_lookup.swift | %FileCheck %S/protocol_lookup.swift --check-prefix=CHECK --check-prefix=CHECK-%target-runtime // REQUIRES: executable_test // REQUIRES: swift_interpreter diff --git a/test/Interpreter/protocols.swift b/test/Interpreter/protocols.swift index 8dbc8ef32c208..5719ea21eee9f 100644 --- a/test/Interpreter/protocols.swift +++ b/test/Interpreter/protocols.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test protocol RollCallable { diff --git a/test/Interpreter/rdar15674812.swift b/test/Interpreter/rdar15674812.swift index c31b72bfad31b..f39749638bf6c 100644 --- a/test/Interpreter/rdar15674812.swift +++ b/test/Interpreter/rdar15674812.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test class HeapBuf {} diff --git a/test/Interpreter/recursive_generics.swift b/test/Interpreter/recursive_generics.swift index 266f1a65a441c..ef321fb2878ae 100644 --- a/test/Interpreter/recursive_generics.swift +++ b/test/Interpreter/recursive_generics.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // rdar://18067671 diff --git a/test/Interpreter/repl.swift b/test/Interpreter/repl.swift index 49dce6c36b9fc..996b865dff229 100644 --- a/test/Interpreter/repl.swift +++ b/test/Interpreter/repl.swift @@ -1,4 +1,4 @@ -// RUN: %target-repl-run-simple-swift | FileCheck %s +// RUN: %target-repl-run-simple-swift | %FileCheck %s // REQUIRES: swift_repl diff --git a/test/Interpreter/repl_13695499.swift b/test/Interpreter/repl_13695499.swift index d128f22a14ca0..69e9b637e4c84 100644 --- a/test/Interpreter/repl_13695499.swift +++ b/test/Interpreter/repl_13695499.swift @@ -1,4 +1,4 @@ -// RUN: %target-repl-run-simple-swift | FileCheck %s +// RUN: %target-repl-run-simple-swift | %FileCheck %s // REQUIRES: swift_repl diff --git a/test/Interpreter/repl_17597453.swift b/test/Interpreter/repl_17597453.swift index b20b42b2ac50d..0ff3ec06c8804 100644 --- a/test/Interpreter/repl_17597453.swift +++ b/test/Interpreter/repl_17597453.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: cp -R %S/Inputs/VerySmallObjCFramework.framework %t // RUN: %clang -dynamiclib %S/Inputs/VerySmallObjCFramework.m -fmodules -F %t -o %t/VerySmallObjCFramework.framework/VerySmallObjCFramework -// RUN: %target-repl-run-simple-swift -F %t | FileCheck %s +// RUN: %target-repl-run-simple-swift -F %t | %FileCheck %s // REQUIRES: swift_repl // REQUIRES: objc_interop diff --git a/test/Interpreter/repl_autolinking.swift b/test/Interpreter/repl_autolinking.swift index 5fc27b3fa4394..0702b8d043783 100644 --- a/test/Interpreter/repl_autolinking.swift +++ b/test/Interpreter/repl_autolinking.swift @@ -4,7 +4,7 @@ // RUN: sed -n -e '/REPL_START$/,/REPL_END$/ p' %s > %t/repl.swift // RUN: %target-swiftc_driver -emit-library %t/a.swift -I %t -L %t -emit-module-path %t/ModuleA.swiftmodule -autolink-force-load -module-link-name ModuleA -module-name ModuleA -o %t/libModuleA.dylib // RUN: %target-swiftc_driver -emit-library %t/b.swift -I %t -L %t -emit-module-path %t/ModuleB.swiftmodule -autolink-force-load -module-link-name ModuleB -module-name ModuleB -o %t/libModuleB.dylib -// RUN: %swift -repl -I %t -L %t < %t/repl.swift 2>&1 | FileCheck %s +// RUN: %swift -repl -I %t -L %t < %t/repl.swift 2>&1 | %FileCheck %s // REQUIRES: swift_repl // UNSUPPORTED: OS=linux-gnu diff --git a/test/Interpreter/repl_conformance_lookup.swift b/test/Interpreter/repl_conformance_lookup.swift index 25290a7fef205..a3192d543abd0 100644 --- a/test/Interpreter/repl_conformance_lookup.swift +++ b/test/Interpreter/repl_conformance_lookup.swift @@ -1,4 +1,4 @@ -// RUN: %target-repl-run-simple-swift | FileCheck %s +// RUN: %target-repl-run-simple-swift | %FileCheck %s // REQUIRES: swift_repl diff --git a/test/Interpreter/repl_diagnostics.swift b/test/Interpreter/repl_diagnostics.swift index 102e2fe9f4932..a996ae3777145 100644 --- a/test/Interpreter/repl_diagnostics.swift +++ b/test/Interpreter/repl_diagnostics.swift @@ -1,4 +1,4 @@ -// RUN: %target-repl-run-simple-swift | FileCheck %s +// RUN: %target-repl-run-simple-swift | %FileCheck %s // REQUIRES: swift_repl diff --git a/test/Interpreter/repl_hashbang.swift b/test/Interpreter/repl_hashbang.swift index 863d43fcddbf9..c9375118b7d17 100644 --- a/test/Interpreter/repl_hashbang.swift +++ b/test/Interpreter/repl_hashbang.swift @@ -1,7 +1,7 @@ #!/usr/bin/swift class Foo {} // Check that we diagnose and skip the hashbang in the REPL. -// RUN: %target-repl-run-simple-swift | FileCheck %s +// RUN: %target-repl-run-simple-swift | %FileCheck %s // REQUIRES: swift_repl diff --git a/test/Interpreter/return_from_main.swift b/test/Interpreter/return_from_main.swift index 27330c44be83b..09d6b08883dbd 100644 --- a/test/Interpreter/return_from_main.swift +++ b/test/Interpreter/return_from_main.swift @@ -1,5 +1,5 @@ // This test specifically exercises the interpreter's top-level error handler. -// RUN: not --crash %target-jit-run %s 2>&1 | FileCheck %s +// RUN: not --crash %target-jit-run %s 2>&1 | %FileCheck %s // REQUIRES: swift_interpreter // rdar://20809122 diff --git a/test/Interpreter/selector_arguments.swift b/test/Interpreter/selector_arguments.swift index f0edfac5ed94b..d544279069cf7 100644 --- a/test/Interpreter/selector_arguments.swift +++ b/test/Interpreter/selector_arguments.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test func divide(_ a: Int, byDividend b: Int) -> Int { return a / b } diff --git a/test/Interpreter/shebang-direct.swift b/test/Interpreter/shebang-direct.swift index 44f0c058b500a..cec0bb21344eb 100644 --- a/test/Interpreter/shebang-direct.swift +++ b/test/Interpreter/shebang-direct.swift @@ -2,8 +2,8 @@ // RUN: cat %S/shebang-env.swift >> %t.shebang.swift // RUN: chmod u+x %t.shebang.swift -// RUN: %t.shebang.swift | FileCheck -check-prefix=NONE %S/shebang-env.swift -// RUN: %t.shebang.swift a b c | FileCheck -check-prefix=THREE-ARGS %S/shebang-env.swift +// RUN: %t.shebang.swift | %FileCheck -check-prefix=NONE %S/shebang-env.swift +// RUN: %t.shebang.swift a b c | %FileCheck -check-prefix=THREE-ARGS %S/shebang-env.swift // REQUIRES: swift_interpreter // UNSUPPORTED: linux diff --git a/test/Interpreter/shebang-env.swift b/test/Interpreter/shebang-env.swift index f170431997329..62f32af2da984 100644 --- a/test/Interpreter/shebang-env.swift +++ b/test/Interpreter/shebang-env.swift @@ -4,8 +4,8 @@ // RUN: cat %s >> %t.shebang.swift // RUN: chmod u+x %t.shebang.swift -// RUN: env PATH=$(dirname %swift_driver_plain) %t.shebang.swift | FileCheck -check-prefix=NONE %s -// RUN: env PATH=$(dirname %swift_driver_plain) %t.shebang.swift a b c | FileCheck -check-prefix=THREE-ARGS %s +// RUN: env PATH=$(dirname %swift_driver_plain) %t.shebang.swift | %FileCheck -check-prefix=NONE %s +// RUN: env PATH=$(dirname %swift_driver_plain) %t.shebang.swift a b c | %FileCheck -check-prefix=THREE-ARGS %s // REQUIRES: swift_interpreter diff --git a/test/Interpreter/simple.swift b/test/Interpreter/simple.swift index cff5a8f4239ee..8faeba7dbc28b 100644 --- a/test/Interpreter/simple.swift +++ b/test/Interpreter/simple.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // CHECK: 123ABCD diff --git a/test/Interpreter/slices.swift b/test/Interpreter/slices.swift index fb0bc6c0f65ea..ce97ff54b0b58 100644 --- a/test/Interpreter/slices.swift +++ b/test/Interpreter/slices.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test protocol Showable { diff --git a/test/Interpreter/statements.swift b/test/Interpreter/statements.swift index e97cb48f237bf..30d3437c43955 100644 --- a/test/Interpreter/statements.swift +++ b/test/Interpreter/statements.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // Foreach loops diff --git a/test/Interpreter/static_objc_var.swift b/test/Interpreter/static_objc_var.swift index ea53bdfc0e04a..f51f5a246a54d 100644 --- a/test/Interpreter/static_objc_var.swift +++ b/test/Interpreter/static_objc_var.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/structs.swift b/test/Interpreter/structs.swift index b5734d76267df..8dd8e31a9b4ab 100644 --- a/test/Interpreter/structs.swift +++ b/test/Interpreter/structs.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test struct Interval { diff --git a/test/Interpreter/super_constructor.swift b/test/Interpreter/super_constructor.swift index c2fd2ffc9022b..fe83befd2f5c5 100644 --- a/test/Interpreter/super_constructor.swift +++ b/test/Interpreter/super_constructor.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test struct S { diff --git a/test/Interpreter/testability.swift b/test/Interpreter/testability.swift index 90608fbcd386d..24841d0337f49 100644 --- a/test/Interpreter/testability.swift +++ b/test/Interpreter/testability.swift @@ -2,7 +2,7 @@ // RUN: %target-build-swift -emit-library -c %S/Inputs/testability_helper.swift -enable-testing -force-single-frontend-invocation -o %t/testability_helper.o -emit-module // RUN: %target-build-swift %s -I %t -Xlinker %t/testability_helper.o -o %t/main -// RUN: %target-run %t/main | FileCheck %s +// RUN: %target-run %t/main | %FileCheck %s // REQUIRES: executable_test @testable import testability_helper diff --git a/test/Interpreter/tuples.swift b/test/Interpreter/tuples.swift index b53bee47ebea2..a325276fddc04 100644 --- a/test/Interpreter/tuples.swift +++ b/test/Interpreter/tuples.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test typealias Interval = (lo: Int, hi: Int) diff --git a/test/Interpreter/typeof.swift b/test/Interpreter/typeof.swift index 678517de0f8a0..72f8acb8e6c20 100644 --- a/test/Interpreter/typeof.swift +++ b/test/Interpreter/typeof.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test protocol Fooable { static func foo() } diff --git a/test/Interpreter/varargs.swift b/test/Interpreter/varargs.swift index b50e5809822bd..faf274662abea 100644 --- a/test/Interpreter/varargs.swift +++ b/test/Interpreter/varargs.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // XFAIL: linux diff --git a/test/Interpreter/weak.swift b/test/Interpreter/weak.swift index 6cfffaa61a5d6..c10883e05bc40 100644 --- a/test/Interpreter/weak.swift +++ b/test/Interpreter/weak.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test protocol Protocol : class { diff --git a/test/Interpreter/weak_objc.swift b/test/Interpreter/weak_objc.swift index bcf38bdc02283..54cfeda0f7f74 100644 --- a/test/Interpreter/weak_objc.swift +++ b/test/Interpreter/weak_objc.swift @@ -1,5 +1,5 @@ // RUN: %target-build-swift %s -Xfrontend -disable-objc-attr-requires-foundation-module -o %t-main -// RUN: %target-run %t-main | FileCheck %s +// RUN: %target-run %t-main | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/Interpreter/wildcard_dispatch_on_catch.swift b/test/Interpreter/wildcard_dispatch_on_catch.swift index b72e90685f05a..5555d2a8e9f0b 100644 --- a/test/Interpreter/wildcard_dispatch_on_catch.swift +++ b/test/Interpreter/wildcard_dispatch_on_catch.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-build-swift %s -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test enum testError: Error { diff --git a/test/Interpreter/writeback.swift b/test/Interpreter/writeback.swift index fe779ac336194..1a93db5affb81 100644 --- a/test/Interpreter/writeback.swift +++ b/test/Interpreter/writeback.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test struct Foo { diff --git a/test/LLVMPasses/allocation-deletion.ll b/test/LLVMPasses/allocation-deletion.ll index ab11212d7572a..e4bf53c3e130c 100644 --- a/test/LLVMPasses/allocation-deletion.ll +++ b/test/LLVMPasses/allocation-deletion.ll @@ -1,4 +1,4 @@ -; RUN: %swift-llvm-opt -swift-llvm-arc-optimize %s | FileCheck %s +; RUN: %swift-llvm-opt -swift-llvm-arc-optimize %s | %FileCheck %s target datalayout = "e-p:64:64:64-S128-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f16:16:16-f32:32:32-f64:64:64-f128:128:128-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" target triple = "x86_64-apple-macosx10.9" diff --git a/test/LLVMPasses/basic.ll b/test/LLVMPasses/basic.ll index 31b7b7d8c37cc..7946dbb71eb1c 100644 --- a/test/LLVMPasses/basic.ll +++ b/test/LLVMPasses/basic.ll @@ -1,4 +1,4 @@ -; RUN: %swift-llvm-opt -swift-llvm-arc-optimize %s | FileCheck %s +; RUN: %swift-llvm-opt -swift-llvm-arc-optimize %s | %FileCheck %s target datalayout = "e-p:64:64:64-S128-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f16:16:16-f32:32:32-f64:64:64-f128:128:128-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" target triple = "x86_64-apple-macosx10.9" diff --git a/test/LLVMPasses/contract.ll b/test/LLVMPasses/contract.ll index 27bbc24d45a9f..b3220ba6fb40f 100644 --- a/test/LLVMPasses/contract.ll +++ b/test/LLVMPasses/contract.ll @@ -1,4 +1,4 @@ -; RUN: %swift-llvm-opt -swift-arc-contract %s | FileCheck %s +; RUN: %swift-llvm-opt -swift-arc-contract %s | %FileCheck %s target datalayout = "e-p:64:64:64-S128-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f16:16:16-f32:32:32-f64:64:64-f128:128:128-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" target triple = "x86_64-apple-macosx10.9" diff --git a/test/LLVMPasses/llvm-aa.ll b/test/LLVMPasses/llvm-aa.ll index cf903735fadf3..e8944ae8ddba2 100644 --- a/test/LLVMPasses/llvm-aa.ll +++ b/test/LLVMPasses/llvm-aa.ll @@ -1,4 +1,4 @@ -; RUN: %swift-llvm-opt -swift-aa -gvn %s | FileCheck %s +; RUN: %swift-llvm-opt -swift-aa -gvn %s | %FileCheck %s target datalayout = "e-p:64:64:64-S128-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f16:16:16-f32:32:32-f64:64:64-f128:128:128-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" target triple = "x86_64-apple-macosx10.9" diff --git a/test/LLVMPasses/merge_func.ll b/test/LLVMPasses/merge_func.ll index 708911e64522e..37b4948912440 100644 --- a/test/LLVMPasses/merge_func.ll +++ b/test/LLVMPasses/merge_func.ll @@ -1,4 +1,4 @@ -; RUN: %swift-llvm-opt -swift-merge-functions -swiftmergefunc-threshold=4 %s | FileCheck %s +; RUN: %swift-llvm-opt -swift-merge-functions -swiftmergefunc-threshold=4 %s | %FileCheck %s @g1 = external global i32 @g2 = external global i32 diff --git a/test/LLVMPasses/stack_promotion.ll b/test/LLVMPasses/stack_promotion.ll index 28f155209d15a..62d489b8c198d 100644 --- a/test/LLVMPasses/stack_promotion.ll +++ b/test/LLVMPasses/stack_promotion.ll @@ -1,4 +1,4 @@ -; RUN: %swift-llvm-opt -swift-stack-promotion -stack-promotion-limit=100 %s | FileCheck %s +; RUN: %swift-llvm-opt -swift-stack-promotion -stack-promotion-limit=100 %s | %FileCheck %s target datalayout = "e-p:64:64:64-S128-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f16:16:16-f32:32:32-f64:64:64-f128:128:128-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" target triple = "x86_64-apple-macosx10.9" diff --git a/test/Misc/fatal_error.swift b/test/Misc/fatal_error.swift index e16d136c86013..24af0560823ee 100644 --- a/test/Misc/fatal_error.swift +++ b/test/Misc/fatal_error.swift @@ -1,5 +1,5 @@ -// RUN: not %target-swift-frontend -parse %s -sdk "" 2>&1 | FileCheck -check-prefix=CHECK -check-prefix=NO-MODULE %s -// RUN: not %target-swift-frontend -parse %s -resource-dir / 2>&1 | FileCheck -check-prefix=CHECK -check-prefix=NO-STDLIB %s +// RUN: not %target-swift-frontend -parse %s -sdk "" 2>&1 | %FileCheck -check-prefix=CHECK -check-prefix=NO-MODULE %s +// RUN: not %target-swift-frontend -parse %s -resource-dir / 2>&1 | %FileCheck -check-prefix=CHECK -check-prefix=NO-STDLIB %s // NO-MODULE: error: no such module 'NonExistent' diff --git a/test/Misc/opt-debug-forbid-typecheck-prefix.swift b/test/Misc/opt-debug-forbid-typecheck-prefix.swift index 0afc2b975defc..f1c6e498df075 100644 --- a/test/Misc/opt-debug-forbid-typecheck-prefix.swift +++ b/test/Misc/opt-debug-forbid-typecheck-prefix.swift @@ -1,21 +1,21 @@ // This makes sure -debug-forbid-typecheck-prefix works as expected. // RUN: not %target-swift-frontend -parse %s -D TRY1 -debug-forbid-typecheck-prefix FORBID_ 2> %t.txt -// RUN: FileCheck -check-prefix=CHECK1 -input-file %t.txt %s +// RUN: %FileCheck -check-prefix=CHECK1 -input-file %t.txt %s #if TRY1 // CHECK1: LLVM ERROR: forbidden typecheck occurred: FORBID_global var FORBID_global = 0 #endif // RUN: not %target-swift-frontend -parse %s -D TRY2 -debug-forbid-typecheck-prefix FORBID_ 2> %t.txt -// RUN: FileCheck -check-prefix=CHECK2 -input-file %t.txt %s +// RUN: %FileCheck -check-prefix=CHECK2 -input-file %t.txt %s #if TRY2 // CHECK2: LLVM ERROR: forbidden typecheck occurred: FORBID_class class FORBID_class {} #endif // RUN: not %target-swift-frontend -parse %s -D TRY3 -debug-forbid-typecheck-prefix FORBID_ 2> %t.txt -// RUN: FileCheck -check-prefix=CHECK3 -input-file %t.txt %s +// RUN: %FileCheck -check-prefix=CHECK3 -input-file %t.txt %s #if TRY3 class C { // CHECK3: LLVM ERROR: forbidden typecheck occurred: FORBID_member @@ -24,7 +24,7 @@ class C { #endif // RUN: not %target-swift-frontend -parse %s -D TRY4 -debug-forbid-typecheck-prefix FORBID_ 2> %t.txt -// RUN: FileCheck -check-prefix=CHECK4 -input-file %t.txt %s +// RUN: %FileCheck -check-prefix=CHECK4 -input-file %t.txt %s #if TRY4 class C { // CHECK4: LLVM ERROR: forbidden typecheck occurred: FORBID_memberFunc @@ -33,14 +33,14 @@ class C { #endif // RUN: not %target-swift-frontend -parse %s -D TRY5 -debug-forbid-typecheck-prefix FORBID_ 2> %t.txt -// RUN: FileCheck -check-prefix=CHECK5 -input-file %t.txt %s +// RUN: %FileCheck -check-prefix=CHECK5 -input-file %t.txt %s #if TRY5 // CHECK5: LLVM ERROR: forbidden typecheck occurred: FORBID_func func FORBID_func() {} #endif // RUN: not %target-swift-frontend -parse %s -D TRY6 -debug-forbid-typecheck-prefix FORBID_ 2> %t.txt -// RUN: FileCheck -check-prefix=CHECK6 -input-file %t.txt %s +// RUN: %FileCheck -check-prefix=CHECK6 -input-file %t.txt %s #if TRY6 // CHECK6: LLVM ERROR: forbidden typecheck occurred: FORBID_local func globalFunc() { @@ -49,14 +49,14 @@ func globalFunc() { #endif // RUN: not %target-swift-frontend -parse %s -D TRY7 -debug-forbid-typecheck-prefix FORBID_ 2> %t.txt -// RUN: FileCheck -check-prefix=CHECK7 -input-file %t.txt %s +// RUN: %FileCheck -check-prefix=CHECK7 -input-file %t.txt %s #if TRY7 // CHECK7: LLVM ERROR: forbidden typecheck occurred: FORBID_ref var global = FORBID_ref #endif // RUN: not %target-swift-frontend -parse %s -D TRY8 -debug-forbid-typecheck-prefix FORBID_ 2> %t.txt -// RUN: FileCheck -check-prefix=CHECK8 -input-file %t.txt %s +// RUN: %FileCheck -check-prefix=CHECK8 -input-file %t.txt %s #if TRY8 class C { // CHECK8: LLVM ERROR: forbidden typecheck occurred: FORBID_ref diff --git a/test/Misc/serialized-diagnostics.swift b/test/Misc/serialized-diagnostics.swift index b1bd61357159b..9145efd3b6312 100644 --- a/test/Misc/serialized-diagnostics.swift +++ b/test/Misc/serialized-diagnostics.swift @@ -3,12 +3,12 @@ // Test swift executable // RUN: %target-swift-frontend -parse -serialize-diagnostics-path %t.dia %s -verify // RUN: c-index-test -read-diagnostics %t.dia > %t.deserialized_diagnostics.txt 2>&1 -// RUN: FileCheck --input-file=%t.deserialized_diagnostics.txt %s +// RUN: %FileCheck --input-file=%t.deserialized_diagnostics.txt %s // Test swift_driver integrated frontend // RUN: %target-swift-frontend -parse -serialize-diagnostics -serialize-diagnostics-path %t.integrated_frontend.dia %s -verify // RUN: c-index-test -read-diagnostics %t.integrated_frontend.dia > %t.integrated_frontend.deserialized_diagnostics.txt 2>&1 -// RUN: FileCheck --input-file=%t.integrated_frontend.deserialized_diagnostics.txt %s +// RUN: %FileCheck --input-file=%t.integrated_frontend.deserialized_diagnostics.txt %s var x = 1 x = 2 // expected-error {{consecutive statements on a line must be separated by ';'}} {{10-10=;}} var z : Int // expected-note {{previously declared here}} diff --git a/test/Misc/target-cpu.swift b/test/Misc/target-cpu.swift index 124eb6b8a28d0..6addecf6ca906 100644 --- a/test/Misc/target-cpu.swift +++ b/test/Misc/target-cpu.swift @@ -1,39 +1,39 @@ -// RUN: not %swift -parse -target arm64-apple-ios7 -Xcc -### %s 2>&1 | FileCheck -check-prefix=TARGETCPU1 %s +// RUN: not %swift -parse -target arm64-apple-ios7 -Xcc -### %s 2>&1 | %FileCheck -check-prefix=TARGETCPU1 %s // TARGETCPU1: "-target-cpu" "cyclone" -// RUN: not %swift -parse -target arm64-apple-tvos9 -Xcc -### %s 2>&1 | FileCheck -check-prefix=APPLETVTARGETCPU1 %s +// RUN: not %swift -parse -target arm64-apple-tvos9 -Xcc -### %s 2>&1 | %FileCheck -check-prefix=APPLETVTARGETCPU1 %s // APPLETVTARGETCPU1: "-target-cpu" "cyclone" -// RUN: not %swift -parse -target armv7s-apple-tvos9 -Xcc -### %s 2>&1 | FileCheck -check-prefix=APPLETVTARGETCPU2 %s +// RUN: not %swift -parse -target armv7s-apple-tvos9 -Xcc -### %s 2>&1 | %FileCheck -check-prefix=APPLETVTARGETCPU2 %s // APPLETVTARGETCPU2: "-target-cpu" "swift" -// RUN: not %swift -parse -target armv7-apple-tvos9 -Xcc -### %s 2>&1 | FileCheck -check-prefix=APPLETVTARGETCPU3 %s +// RUN: not %swift -parse -target armv7-apple-tvos9 -Xcc -### %s 2>&1 | %FileCheck -check-prefix=APPLETVTARGETCPU3 %s // APPLETVTARGETCPU3: "-target-cpu" "cortex-a8" -// RUN: not %swift -parse -target armv7k-apple-watchos2 -Xcc -### %s 2>&1 | FileCheck -check-prefix=WATCHTARGETCPU1 %s +// RUN: not %swift -parse -target armv7k-apple-watchos2 -Xcc -### %s 2>&1 | %FileCheck -check-prefix=WATCHTARGETCPU1 %s // WATCHTARGETCPU1: "-target-cpu" "cortex-a7" -// RUN: not %swift -parse -target arm64-apple-watchos2 -Xcc -### %s 2>&1 | FileCheck -check-prefix=WATCHTARGETCPU2 %s +// RUN: not %swift -parse -target arm64-apple-watchos2 -Xcc -### %s 2>&1 | %FileCheck -check-prefix=WATCHTARGETCPU2 %s // WATCHTARGETCPU2: "-target-cpu" "cyclone" -// RUN: not %swift -parse -target armv7s-apple-ios7 -Xcc -### %s 2>&1 | FileCheck -check-prefix=TARGETCPU2 %s +// RUN: not %swift -parse -target armv7s-apple-ios7 -Xcc -### %s 2>&1 | %FileCheck -check-prefix=TARGETCPU2 %s // TARGETCPU2: "-target-cpu" "swift" -// RUN: not %swift -parse -target armv7-apple-ios7 -Xcc -### %s 2>&1 | FileCheck -check-prefix=TARGETCPU3 %s +// RUN: not %swift -parse -target armv7-apple-ios7 -Xcc -### %s 2>&1 | %FileCheck -check-prefix=TARGETCPU3 %s // TARGETCPU3: "-target-cpu" "cortex-a8" -// RUN: not %swift -parse -target i386-apple-ios7 -Xcc -### %s 2>&1 | FileCheck -check-prefix=SIMULATOR_CPU %s +// RUN: not %swift -parse -target i386-apple-ios7 -Xcc -### %s 2>&1 | %FileCheck -check-prefix=SIMULATOR_CPU %s // SIMULATOR_CPU: "-target-cpu" "yonah" -// RUN: not %swift -parse -target i386-apple-watchos2 -Xcc -### %s 2>&1 | FileCheck -check-prefix=WATCHSIMULATOR_CPU %s +// RUN: not %swift -parse -target i386-apple-watchos2 -Xcc -### %s 2>&1 | %FileCheck -check-prefix=WATCHSIMULATOR_CPU %s // WATCHSIMULATOR_CPU: "-target-cpu" "yonah" -// RUN: not %swift -parse -target x86_64-apple-ios7 -Xcc -### %s 2>&1 | FileCheck -check-prefix=SIMULATOR64_CPU %s +// RUN: not %swift -parse -target x86_64-apple-ios7 -Xcc -### %s 2>&1 | %FileCheck -check-prefix=SIMULATOR64_CPU %s // SIMULATOR64_CPU: "-target-cpu" "core2" -// RUN: not %swift -parse -target x86_64-apple-tvos9 -Xcc -### %s 2>&1 | FileCheck -check-prefix=APPLETVSIMULATOR64_CPU %s +// RUN: not %swift -parse -target x86_64-apple-tvos9 -Xcc -### %s 2>&1 | %FileCheck -check-prefix=APPLETVSIMULATOR64_CPU %s // APPLETVSIMULATOR64_CPU: "-target-cpu" "core2" -// RUN: not %swift -parse -target x86_64-apple-watchos2 -Xcc -### %s 2>&1 | FileCheck -check-prefix=WATCHSIMULATOR64_CPU %s +// RUN: not %swift -parse -target x86_64-apple-watchos2 -Xcc -### %s 2>&1 | %FileCheck -check-prefix=WATCHSIMULATOR64_CPU %s // WATCHSIMULATOR64_CPU: "-target-cpu" "core2" diff --git a/test/Misc/tbi.swift b/test/Misc/tbi.swift index df3a20f577629..6eae2445b967b 100644 --- a/test/Misc/tbi.swift +++ b/test/Misc/tbi.swift @@ -1,10 +1,10 @@ // RUN: %target-build-swift -target arm64-apple-ios8.0 -target-cpu cyclone \ // RUN: -O -S %s -parse-as-library -parse-stdlib | \ -// RUN: FileCheck --check-prefix=TBI %s +// RUN: %FileCheck --check-prefix=TBI %s // RUN: %target-build-swift -target arm64-apple-ios7.0 -target-cpu cyclone \ // RUN: -O -S %s -parse-as-library -parse-stdlib | \ -// RUN: FileCheck --check-prefix=NO_TBI %s +// RUN: %FileCheck --check-prefix=NO_TBI %s // REQUIRES: CPU=arm64, OS=ios diff --git a/test/NameBinding/accessibility.swift b/test/NameBinding/accessibility.swift index fbba954a34a20..67870c7e0677d 100644 --- a/test/NameBinding/accessibility.swift +++ b/test/NameBinding/accessibility.swift @@ -7,7 +7,7 @@ // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/has_accessibility.swift -D DEFINE_VAR_FOR_SCOPED_IMPORT -enable-testing // RUN: %target-swift-frontend -parse -primary-file %t/main.swift %S/Inputs/accessibility_other.swift -module-name accessibility -I %t -sdk "" -enable-access-control -verify // RUN: %target-swift-frontend -parse -primary-file %t/main.swift %S/Inputs/accessibility_other.swift -module-name accessibility -I %t -sdk "" -disable-access-control -D ACCESS_DISABLED -// RUN: not %target-swift-frontend -parse -primary-file %t/main.swift %S/Inputs/accessibility_other.swift -module-name accessibility -I %t -sdk "" -D TESTABLE 2>&1 | FileCheck -check-prefix=TESTABLE %s +// RUN: not %target-swift-frontend -parse -primary-file %t/main.swift %S/Inputs/accessibility_other.swift -module-name accessibility -I %t -sdk "" -D TESTABLE 2>&1 | %FileCheck -check-prefix=TESTABLE %s #if TESTABLE @testable import has_accessibility diff --git a/test/NameBinding/debug-client-discriminator.swift b/test/NameBinding/debug-client-discriminator.swift index b4f6f933d3d6b..114bb3b3e02ec 100644 --- a/test/NameBinding/debug-client-discriminator.swift +++ b/test/NameBinding/debug-client-discriminator.swift @@ -1,9 +1,9 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-swift-frontend -emit-module -o %t -module-name HasPrivateAccess %S/Inputs/HasPrivateAccess1.swift %S/Inputs/HasPrivateAccess2.swift -// RUN: %target-swift-ide-test -print-ast-typechecked -source-filename %s -I %t -sdk "" -disable-access-control 2>&1 | FileCheck -check-prefix=CHECK-ERROR %s -// RUN: %target-swift-ide-test -print-ast-typechecked -source-filename %s -I %t -sdk "" -disable-access-control -explode-pattern-binding-decls -debug-client-discriminator _5AB3F657DD2A7E5E793501C5FA480C3D | FileCheck -check-prefix=CHECK-INT %s -// RUN: %target-swift-ide-test -print-ast-typechecked -source-filename %s -I %t -sdk "" -disable-access-control -explode-pattern-binding-decls -debug-client-discriminator _0D6EC78101B0986747C7103C2739A767 | FileCheck -check-prefix=CHECK-STRING %s +// RUN: %target-swift-ide-test -print-ast-typechecked -source-filename %s -I %t -sdk "" -disable-access-control 2>&1 | %FileCheck -check-prefix=CHECK-ERROR %s +// RUN: %target-swift-ide-test -print-ast-typechecked -source-filename %s -I %t -sdk "" -disable-access-control -explode-pattern-binding-decls -debug-client-discriminator _5AB3F657DD2A7E5E793501C5FA480C3D | %FileCheck -check-prefix=CHECK-INT %s +// RUN: %target-swift-ide-test -print-ast-typechecked -source-filename %s -I %t -sdk "" -disable-access-control -explode-pattern-binding-decls -debug-client-discriminator _0D6EC78101B0986747C7103C2739A767 | %FileCheck -check-prefix=CHECK-STRING %s import HasPrivateAccess diff --git a/test/NameBinding/import-command-line.swift b/test/NameBinding/import-command-line.swift index dd3097aef3d25..c4a8cf92b96cf 100644 --- a/test/NameBinding/import-command-line.swift +++ b/test/NameBinding/import-command-line.swift @@ -1,10 +1,10 @@ // RUN: %target-swift-frontend -parse %s -enable-source-import -I %S/Inputs -sdk "" -verify // RUN: %target-swift-frontend -parse %s -enable-source-import -I %S/Inputs -sdk "" -import-module abcde -// RUN: not %target-swift-frontend -parse %s -enable-source-import -I %S/Inputs -sdk "" -import-module 3333 2>&1 | FileCheck -check-prefix=NON-IDENT %s +// RUN: not %target-swift-frontend -parse %s -enable-source-import -I %S/Inputs -sdk "" -import-module 3333 2>&1 | %FileCheck -check-prefix=NON-IDENT %s // NON-IDENT: error: module name "3333" is not a valid identifier -// RUN: not %target-swift-frontend -parse %s -enable-source-import -I %S/Inputs -sdk "" -import-module NON_EXISTENT 2>&1 | FileCheck -check-prefix=NON-EXISTENT %s +// RUN: not %target-swift-frontend -parse %s -enable-source-import -I %S/Inputs -sdk "" -import-module NON_EXISTENT 2>&1 | %FileCheck -check-prefix=NON-EXISTENT %s // NON-EXISTENT: error: no such module 'NON_EXISTENT' var a: A? // expected-error {{use of undeclared type 'A'}} diff --git a/test/NameBinding/import-multiple-command-line.swift b/test/NameBinding/import-multiple-command-line.swift index 1155857b74463..86b860b15d7a0 100644 --- a/test/NameBinding/import-multiple-command-line.swift +++ b/test/NameBinding/import-multiple-command-line.swift @@ -1,7 +1,7 @@ // RUN: %target-swift-frontend -parse %s -enable-source-import -I %S/Inputs -sdk "" -verify // RUN: %target-swift-frontend -parse %s -enable-source-import -I %S/Inputs -sdk "" -import-module abcde -import-module aeiou -// RUN: not %target-swift-frontend -parse %s -enable-source-import -I %S/Inputs -sdk "" -import-module abcde -import-module aeiou -import-module 3333 2>&1 | FileCheck -check-prefix=NON-IDENT %s +// RUN: not %target-swift-frontend -parse %s -enable-source-import -I %S/Inputs -sdk "" -import-module abcde -import-module aeiou -import-module 3333 2>&1 | %FileCheck -check-prefix=NON-IDENT %s // NON-IDENT: error: module name "3333" is not a valid identifier diff --git a/test/NameBinding/import-resolution-overload.swift b/test/NameBinding/import-resolution-overload.swift index 47c09ba3a5397..1de86ae258bf7 100644 --- a/test/NameBinding/import-resolution-overload.swift +++ b/test/NameBinding/import-resolution-overload.swift @@ -6,7 +6,7 @@ // RUN: %target-swift-frontend -parse %s -I %t -sdk "" -verify // RUN: not %target-swift-frontend -dump-ast %s -I %t -sdk "" > %t.astdump 2>&1 -// RUN: FileCheck %s < %t.astdump +// RUN: %FileCheck %s < %t.astdump import overload_intFunctions import overload_boolFunctions diff --git a/test/NameBinding/import-resolution.swift b/test/NameBinding/import-resolution.swift index aff9ee92a4642..fa5c42b0ac401 100644 --- a/test/NameBinding/import-resolution.swift +++ b/test/NameBinding/import-resolution.swift @@ -2,7 +2,7 @@ // RUN: mkdir -p %t // RUN: %target-swift-frontend -parse %s -enable-source-import -I %S/Inputs -sdk "" -verify -show-diagnostics-after-fatal -// RUN: not %target-swift-frontend -parse %s -I %S/Inputs -sdk "" -show-diagnostics-after-fatal 2>&1 | FileCheck %s -check-prefix=CHECK-NO-SOURCE-IMPORT +// RUN: not %target-swift-frontend -parse %s -I %S/Inputs -sdk "" -show-diagnostics-after-fatal 2>&1 | %FileCheck %s -check-prefix=CHECK-NO-SOURCE-IMPORT // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/abcde.swift // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/aeiou.swift @@ -10,7 +10,7 @@ // RUN: %target-swift-frontend -emit-module -o %t -I %t %S/Inputs/letters.swift // RUN: %target-swift-frontend -parse %s -I %t -sdk "" -verify -show-diagnostics-after-fatal -// RUN: %target-swift-ide-test -source-filename %s -print-module-imports -module-to-print=letters -I %t | FileCheck %s -check-prefix=CHECK-IMPORTS +// RUN: %target-swift-ide-test -source-filename %s -print-module-imports -module-to-print=letters -I %t | %FileCheck %s -check-prefix=CHECK-IMPORTS // CHECK-NO-SOURCE-IMPORT: no such module 'letters' // CHECK-NO-SOURCE-IMPORT: no such module 'abcde' diff --git a/test/NameBinding/import-specific-decl.swift b/test/NameBinding/import-specific-decl.swift index 6911919b58e64..6a11f98aa93a9 100644 --- a/test/NameBinding/import-specific-decl.swift +++ b/test/NameBinding/import-specific-decl.swift @@ -4,7 +4,7 @@ // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/abcde.swift // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/aeiou.swift // RUN: %target-swift-frontend -parse %s -I %t -sdk "" -verify -// RUN: not %target-swift-frontend -parse %s -I %t -sdk "" 2>&1 | FileCheck %s +// RUN: not %target-swift-frontend -parse %s -I %t -sdk "" 2>&1 | %FileCheck %s import struct aeiou.U import struct aeiou.E diff --git a/test/NameBinding/import-specific-fixits.swift b/test/NameBinding/import-specific-fixits.swift index ede774afc29b1..a8a4f65c671d4 100644 --- a/test/NameBinding/import-specific-fixits.swift +++ b/test/NameBinding/import-specific-fixits.swift @@ -8,7 +8,7 @@ // RUN: echo "public var x = Int()" | %target-swift-frontend -module-name FooBar -emit-module -o %t - // RUN: %target-swift-frontend -parse -I %t -serialize-diagnostics-path %t.dia %s -verify // RUN: c-index-test -read-diagnostics %t.dia > %t.deserialized_diagnostics.txt 2>&1 -// RUN: FileCheck --input-file=%t.deserialized_diagnostics.txt %s +// RUN: %FileCheck --input-file=%t.deserialized_diagnostics.txt %s import typealias Swift.Int import struct Swift.Int diff --git a/test/NameBinding/reference-dependencies-dynamic-lookup.swift b/test/NameBinding/reference-dependencies-dynamic-lookup.swift index 47ccaa9a2018b..604203717ecc0 100644 --- a/test/NameBinding/reference-dependencies-dynamic-lookup.swift +++ b/test/NameBinding/reference-dependencies-dynamic-lookup.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t && mkdir %t // RUN: cp %s %t/main.swift // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse -primary-file %t/main.swift -emit-reference-dependencies-path - > %t.swiftdeps -// RUN: FileCheck %s < %t.swiftdeps -// RUN: FileCheck -check-prefix=NEGATIVE %s < %t.swiftdeps +// RUN: %FileCheck %s < %t.swiftdeps +// RUN: %FileCheck -check-prefix=NEGATIVE %s < %t.swiftdeps // REQUIRES: objc_interop diff --git a/test/NameBinding/reference-dependencies-members.swift b/test/NameBinding/reference-dependencies-members.swift index 95c05142e8fcd..7b386ebf19f56 100644 --- a/test/NameBinding/reference-dependencies-members.swift +++ b/test/NameBinding/reference-dependencies-members.swift @@ -2,14 +2,14 @@ // RUN: cp %s %t/main.swift // RUN: %target-swift-frontend -parse -primary-file %t/main.swift %S/Inputs/reference-dependencies-members-helper.swift -emit-reference-dependencies-path - > %t.swiftdeps -// RUN: FileCheck -check-prefix=PROVIDES-NOMINAL %s < %t.swiftdeps -// RUN: FileCheck -check-prefix=PROVIDES-NOMINAL-NEGATIVE %s < %t.swiftdeps -// RUN: FileCheck -check-prefix=PROVIDES-MEMBER %s < %t.swiftdeps -// RUN: FileCheck -check-prefix=PROVIDES-MEMBER-NEGATIVE %s < %t.swiftdeps -// RUN: FileCheck -check-prefix=DEPENDS-NOMINAL %s < %t.swiftdeps -// RUN: FileCheck -check-prefix=DEPENDS-NOMINAL-NEGATIVE %s < %t.swiftdeps -// RUN: FileCheck -check-prefix=DEPENDS-MEMBER %s < %t.swiftdeps -// RUN: FileCheck -check-prefix=DEPENDS-MEMBER-NEGATIVE %s < %t.swiftdeps +// RUN: %FileCheck -check-prefix=PROVIDES-NOMINAL %s < %t.swiftdeps +// RUN: %FileCheck -check-prefix=PROVIDES-NOMINAL-NEGATIVE %s < %t.swiftdeps +// RUN: %FileCheck -check-prefix=PROVIDES-MEMBER %s < %t.swiftdeps +// RUN: %FileCheck -check-prefix=PROVIDES-MEMBER-NEGATIVE %s < %t.swiftdeps +// RUN: %FileCheck -check-prefix=DEPENDS-NOMINAL %s < %t.swiftdeps +// RUN: %FileCheck -check-prefix=DEPENDS-NOMINAL-NEGATIVE %s < %t.swiftdeps +// RUN: %FileCheck -check-prefix=DEPENDS-MEMBER %s < %t.swiftdeps +// RUN: %FileCheck -check-prefix=DEPENDS-MEMBER-NEGATIVE %s < %t.swiftdeps // PROVIDES-NOMINAL-LABEL: {{^provides-nominal:$}} diff --git a/test/NameBinding/reference-dependencies.swift b/test/NameBinding/reference-dependencies.swift index b8435a22c8dc6..5a2774098176f 100644 --- a/test/NameBinding/reference-dependencies.swift +++ b/test/NameBinding/reference-dependencies.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t && mkdir %t // RUN: cp %s %t/main.swift // RUN: %target-swift-frontend -parse -primary-file %t/main.swift %S/Inputs/reference-dependencies-helper.swift -emit-reference-dependencies-path - > %t.swiftdeps -// RUN: FileCheck %s < %t.swiftdeps -// RUN: FileCheck -check-prefix=NEGATIVE %s < %t.swiftdeps +// RUN: %FileCheck %s < %t.swiftdeps +// RUN: %FileCheck -check-prefix=NEGATIVE %s < %t.swiftdeps // CHECK-LABEL: {{^provides-top-level:$}} // CHECK-NEXT: "IntWrapper" diff --git a/test/Parse/diagnostic_points_to_first_bad_token.swift b/test/Parse/diagnostic_points_to_first_bad_token.swift index 3d478c1d5060e..f26e9db785f92 100644 --- a/test/Parse/diagnostic_points_to_first_bad_token.swift +++ b/test/Parse/diagnostic_points_to_first_bad_token.swift @@ -1,4 +1,4 @@ -// RUN: not %target-swift-frontend -parse %s 2>&1 | FileCheck -strict-whitespace %s +// RUN: not %target-swift-frontend -parse %s 2>&1 | %FileCheck -strict-whitespace %s // Test the diagnostic option 'PointsToFirstBadToken'. diff --git a/test/Parse/if_expr.swift b/test/Parse/if_expr.swift index 76fed602b2eaf..aa20ad4a0047f 100644 --- a/test/Parse/if_expr.swift +++ b/test/Parse/if_expr.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -dump-ast %s 2>&1 | FileCheck %s +// RUN: %target-swift-frontend -dump-ast %s 2>&1 | %FileCheck %s // CHECK: (func_decl "r13756261(_:_:)" func r13756261(_ x: Bool, _ y: Int) -> Int { diff --git a/test/PlaygroundTransform/array.swift b/test/PlaygroundTransform/array.swift index 345a8d405fe89..152852f060a4e 100644 --- a/test/PlaygroundTransform/array.swift +++ b/test/PlaygroundTransform/array.swift @@ -2,7 +2,7 @@ // RUN: mkdir %t // RUN: cp %s %t/main.swift // RUN: %target-build-swift -Xfrontend -playground -Xfrontend -debugger-support -o %t/main %S/Inputs/PlaygroundsRuntime.swift %t/main.swift -// RUN: %target-run %t/main | FileCheck %s +// RUN: %target-run %t/main | %FileCheck %s // REQUIRES: executable_test var foo = [true, false] diff --git a/test/PlaygroundTransform/array_did_set.swift b/test/PlaygroundTransform/array_did_set.swift index dc46e8a38c932..e32da8fb019a9 100644 --- a/test/PlaygroundTransform/array_did_set.swift +++ b/test/PlaygroundTransform/array_did_set.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir %t // RUN: cp %s %t/main.swift // RUN: %target-build-swift -Xfrontend -playground -Xfrontend -debugger-support -o %t/main %S/Inputs/PlaygroundsRuntime.swift %t/main.swift -// RUN: %target-run %t/main | FileCheck %s +// RUN: %target-run %t/main | %FileCheck %s // REQUIRES: executable_test struct S { var a : [Int] = [] { diff --git a/test/PlaygroundTransform/array_in_struct.swift b/test/PlaygroundTransform/array_in_struct.swift index bc8c63def9a2c..a1d6e70385503 100644 --- a/test/PlaygroundTransform/array_in_struct.swift +++ b/test/PlaygroundTransform/array_in_struct.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir %t // RUN: cp %s %t/main.swift // RUN: %target-build-swift -Xfrontend -playground -Xfrontend -debugger-support -o %t/main %S/Inputs/PlaygroundsRuntime.swift %t/main.swift -// RUN: %target-run %t/main | FileCheck %s +// RUN: %target-run %t/main | %FileCheck %s // REQUIRES: executable_test // FIXME: We need to instrument mutations of objects that are accessed in diff --git a/test/PlaygroundTransform/bare_value.swift b/test/PlaygroundTransform/bare_value.swift index 6fee1647f0b68..3c0f281dabb63 100644 --- a/test/PlaygroundTransform/bare_value.swift +++ b/test/PlaygroundTransform/bare_value.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir %t // RUN: cp %s %t/main.swift // RUN: %target-build-swift -Xfrontend -playground -Xfrontend -debugger-support -o %t/main %S/Inputs/PlaygroundsRuntime.swift %t/main.swift -// RUN: %target-run %t/main | FileCheck %s +// RUN: %target-run %t/main | %FileCheck %s // REQUIRES: executable_test 1 diff --git a/test/PlaygroundTransform/control-flow.swift b/test/PlaygroundTransform/control-flow.swift index e7eaa24195a31..8c35d73486449 100644 --- a/test/PlaygroundTransform/control-flow.swift +++ b/test/PlaygroundTransform/control-flow.swift @@ -2,7 +2,7 @@ // RUN: mkdir %t // RUN: cp %s %t/main.swift // RUN: %target-build-swift -Xfrontend -playground -Xfrontend -debugger-support -o %t/main %S/Inputs/PlaygroundsRuntime.swift %t/main.swift -// RUN: %target-run %t/main | FileCheck %s +// RUN: %target-run %t/main | %FileCheck %s // REQUIRES: executable_test var a = true diff --git a/test/PlaygroundTransform/declarations.swift b/test/PlaygroundTransform/declarations.swift index e6da660b8b810..376123abc53cb 100644 --- a/test/PlaygroundTransform/declarations.swift +++ b/test/PlaygroundTransform/declarations.swift @@ -2,7 +2,7 @@ // RUN: mkdir %t // RUN: cp %s %t/main.swift // RUN: %target-build-swift -Xfrontend -playground -Xfrontend -debugger-support -o %t/main %S/Inputs/PlaygroundsRuntime.swift %t/main.swift -// RUN: %target-run %t/main | FileCheck %s +// RUN: %target-run %t/main | %FileCheck %s // REQUIRES: executable_test var a = 2 diff --git a/test/PlaygroundTransform/declarations_error.swift b/test/PlaygroundTransform/declarations_error.swift index ef91418064f43..a1cc15a97219c 100644 --- a/test/PlaygroundTransform/declarations_error.swift +++ b/test/PlaygroundTransform/declarations_error.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: cp %s %t/main.swift -// RUN: not %target-swift-frontend -parse -playground %t/main.swift 2>&1 | FileCheck %s +// RUN: not %target-swift-frontend -parse -playground %t/main.swift 2>&1 | %FileCheck %s // CHECK: error: no such module import Nonexistent_Module diff --git a/test/PlaygroundTransform/disable_transform_only.swift b/test/PlaygroundTransform/disable_transform_only.swift index b6723f399e211..15f035bd4f49c 100644 --- a/test/PlaygroundTransform/disable_transform_only.swift +++ b/test/PlaygroundTransform/disable_transform_only.swift @@ -2,7 +2,7 @@ // RUN: mkdir %t // RUN: cp %s %t/main.swift // RUN: %target-build-swift -Xfrontend -playground -Xfrontend -disable-playground-transform -Xfrontend -debugger-support -o %t/main %S/Inputs/PlaygroundsRuntime.swift %t/main.swift -// RUN: %target-run %t/main | FileCheck %s -allow-empty +// RUN: %target-run %t/main | %FileCheck %s -allow-empty // REQUIRES: executable_test var a = 2 diff --git a/test/PlaygroundTransform/do-catch.swift b/test/PlaygroundTransform/do-catch.swift index cf3096fb71eef..8f5c71042eb50 100644 --- a/test/PlaygroundTransform/do-catch.swift +++ b/test/PlaygroundTransform/do-catch.swift @@ -2,7 +2,7 @@ // RUN: mkdir %t // RUN: cp %s %t/main.swift // RUN: %target-build-swift -Xfrontend -playground -Xfrontend -debugger-support -o %t/main %S/Inputs/PlaygroundsRuntime.swift %t/main.swift -// RUN: %target-run %t/main | FileCheck %s +// RUN: %target-run %t/main | %FileCheck %s // REQUIRES: executable_test func doSomething() throws -> Int { return 5 } diff --git a/test/PlaygroundTransform/do.swift b/test/PlaygroundTransform/do.swift index ffd389a04056b..ad3051f1ffb97 100644 --- a/test/PlaygroundTransform/do.swift +++ b/test/PlaygroundTransform/do.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir %t // RUN: cp %s %t/main.swift // RUN: %target-build-swift -Xfrontend -playground -Xfrontend -debugger-support -o %t/main %S/Inputs/PlaygroundsRuntime.swift %t/main.swift -// RUN: %target-run %t/main | FileCheck %s +// RUN: %target-run %t/main | %FileCheck %s // REQUIRES: executable_test do { 1 diff --git a/test/PlaygroundTransform/high_performance.swift b/test/PlaygroundTransform/high_performance.swift index 261b411ec606a..788a1a71ad822 100644 --- a/test/PlaygroundTransform/high_performance.swift +++ b/test/PlaygroundTransform/high_performance.swift @@ -2,7 +2,7 @@ // RUN: mkdir %t // RUN: cp %s %t/main.swift // RUN: %target-build-swift -Xfrontend -playground -Xfrontend -playground-high-performance -Xfrontend -debugger-support -o %t/main %S/Inputs/PlaygroundsRuntime.swift %t/main.swift -// RUN: %target-run %t/main | FileCheck %s +// RUN: %target-run %t/main | %FileCheck %s // REQUIRES: executable_test var a = true diff --git a/test/PlaygroundTransform/init.swift b/test/PlaygroundTransform/init.swift index 8804e5ea72091..856f2fe668e43 100644 --- a/test/PlaygroundTransform/init.swift +++ b/test/PlaygroundTransform/init.swift @@ -2,7 +2,7 @@ // RUN: mkdir %t // RUN: cp %s %t/main.swift // RUN: %target-build-swift -Xfrontend -playground -Xfrontend -debugger-support -o %t/main %S/Inputs/PlaygroundsRuntime.swift %t/main.swift -// RUN: %target-run %t/main | FileCheck %s +// RUN: %target-run %t/main | %FileCheck %s // REQUIRES: executable_test class B { diff --git a/test/PlaygroundTransform/mutation.swift b/test/PlaygroundTransform/mutation.swift index 5e6c7a17434bc..d2ba28cbe2c1d 100644 --- a/test/PlaygroundTransform/mutation.swift +++ b/test/PlaygroundTransform/mutation.swift @@ -2,7 +2,7 @@ // RUN: mkdir %t // RUN: cp %s %t/main.swift // RUN: %target-build-swift -Xfrontend -playground -Xfrontend -debugger-support -o %t/main %S/Inputs/PlaygroundsRuntime.swift %t/main.swift -// RUN: %target-run %t/main | FileCheck %s +// RUN: %target-run %t/main | %FileCheck %s // REQUIRES: executable_test class A { diff --git a/test/PlaygroundTransform/placeholder.swift b/test/PlaygroundTransform/placeholder.swift index c6ac7711d8e52..fb332115c0763 100644 --- a/test/PlaygroundTransform/placeholder.swift +++ b/test/PlaygroundTransform/placeholder.swift @@ -2,8 +2,8 @@ // RUN: mkdir %t // RUN: cp %s %t/main.swift // RUN: %target-build-swift -Xfrontend -playground -Xfrontend -disable-playground-transform -o %t/main %t/main.swift -// RUN: %target-run %t/main | FileCheck %s -// RUN: ! %target-run %t/main --crash 2>&1 | FileCheck -check-prefix=CRASH-CHECK %s +// RUN: %target-run %t/main | %FileCheck %s +// RUN: ! %target-run %t/main --crash 2>&1 | %FileCheck -check-prefix=CRASH-CHECK %s // REQUIRES: executable_test // NOTE: "!" is used above instead of "not --crash" because simctl's exit diff --git a/test/PlaygroundTransform/print.swift b/test/PlaygroundTransform/print.swift index fc394a1884d2a..165f7ae61523b 100644 --- a/test/PlaygroundTransform/print.swift +++ b/test/PlaygroundTransform/print.swift @@ -2,7 +2,7 @@ // RUN: mkdir %t // RUN: cp %s %t/main.swift // RUN: %target-build-swift -Xfrontend -playground -Xfrontend -debugger-support -o %t/main %S/Inputs/PlaygroundsRuntime.swift %t/main.swift -// RUN: %target-run %t/main | FileCheck %s +// RUN: %target-run %t/main | %FileCheck %s // REQUIRES: executable_test var str : String = "" diff --git a/test/PrintAsObjC/accessibility.swift b/test/PrintAsObjC/accessibility.swift index 740999e0c0e9d..5f34e4c4e99c7 100644 --- a/test/PrintAsObjC/accessibility.swift +++ b/test/PrintAsObjC/accessibility.swift @@ -1,22 +1,22 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend -parse-as-library %s -parse -emit-objc-header-path %t/accessibility.h -disable-objc-attr-requires-foundation-module -// RUN: FileCheck -check-prefix=CHECK -check-prefix=CHECK-PUBLIC %s < %t/accessibility.h +// RUN: %FileCheck -check-prefix=CHECK -check-prefix=CHECK-PUBLIC %s < %t/accessibility.h // RUN: %check-in-clang %t/accessibility.h // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -parse -emit-objc-header-path %t/accessibility-internal.h -disable-objc-attr-requires-foundation-module -// RUN: FileCheck -check-prefix=CHECK -check-prefix=CHECK-INTERNAL %s < %t/accessibility-internal.h +// RUN: %FileCheck -check-prefix=CHECK -check-prefix=CHECK-INTERNAL %s < %t/accessibility-internal.h // RUN: %check-in-clang %t/accessibility-internal.h // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse-as-library %s -parse -import-objc-header %S/../Inputs/empty.h -emit-objc-header-path %t/accessibility-imported-header.h -disable-objc-attr-requires-foundation-module -// RUN: FileCheck -check-prefix=CHECK -check-prefix=CHECK-INTERNAL %s < %t/accessibility-imported-header.h +// RUN: %FileCheck -check-prefix=CHECK -check-prefix=CHECK-INTERNAL %s < %t/accessibility-imported-header.h // RUN: %check-in-clang %t/accessibility-imported-header.h // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse-as-library %s -parse -DMAIN -emit-objc-header-path %t/accessibility-main.h -disable-objc-attr-requires-foundation-module -// RUN: FileCheck -check-prefix=CHECK -check-prefix=CHECK-INTERNAL %s < %t/accessibility-main.h +// RUN: %FileCheck -check-prefix=CHECK -check-prefix=CHECK-INTERNAL %s < %t/accessibility-main.h // RUN: %check-in-clang %t/accessibility-main.h // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse-as-library %s -parse -application-extension -emit-objc-header-path %t/accessibility-appext.h -disable-objc-attr-requires-foundation-module -// RUN: FileCheck -check-prefix=CHECK -check-prefix=CHECK-INTERNAL %s < %t/accessibility-appext.h +// RUN: %FileCheck -check-prefix=CHECK -check-prefix=CHECK-INTERNAL %s < %t/accessibility-appext.h // RUN: %check-in-clang %t/accessibility-appext.h // REQUIRES: objc_interop diff --git a/test/PrintAsObjC/any_as_id.swift b/test/PrintAsObjC/any_as_id.swift index 42f9078bc7a30..380da89ef10db 100644 --- a/test/PrintAsObjC/any_as_id.swift +++ b/test/PrintAsObjC/any_as_id.swift @@ -13,7 +13,7 @@ // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -enable-id-as-any -emit-module -o %t %s // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -enable-id-as-any -parse-as-library %t/any_as_id.swiftmodule -parse -emit-objc-header-path %t/any_as_id.h -// RUN: FileCheck %s < %t/any_as_id.h +// RUN: %FileCheck %s < %t/any_as_id.h // RUN: %check-in-clang %t/any_as_id.h diff --git a/test/PrintAsObjC/arc-conventions.swift b/test/PrintAsObjC/arc-conventions.swift index 3085a23958a21..f32474e6aa6f4 100644 --- a/test/PrintAsObjC/arc-conventions.swift +++ b/test/PrintAsObjC/arc-conventions.swift @@ -3,11 +3,11 @@ // RUN: %target-clang -c -Weverything -Werror -Wno-unused-macros -Wno-incomplete-module -fobjc-arc -fmodules %S/Inputs/arc-conventions.m -o %t/main.o -I %t // RUN: %target-build-swift %t/swift.o %t/main.o -o %t/main -// RUN: %target-run %t/main | FileCheck %S/Inputs/arc-conventions.m +// RUN: %target-run %t/main | %FileCheck %S/Inputs/arc-conventions.m // RUN: %target-clang -c -Weverything -Werror -Wno-unused-macros -Wno-incomplete-module -fno-objc-arc -fmodules %S/Inputs/arc-conventions.m -o %t/main.o -I %t // RUN: %target-build-swift %t/swift.o %t/main.o -o %t/main -// RUN: %target-run %t/main | FileCheck %S/Inputs/arc-conventions.m +// RUN: %target-run %t/main | %FileCheck %S/Inputs/arc-conventions.m // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/test/PrintAsObjC/blocks.swift b/test/PrintAsObjC/blocks.swift index aaef5b426647e..290878696fb8c 100644 --- a/test/PrintAsObjC/blocks.swift +++ b/test/PrintAsObjC/blocks.swift @@ -4,7 +4,7 @@ // RUN: mkdir %t // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module -o %t %s -disable-objc-attr-requires-foundation-module // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse-as-library %t/blocks.swiftmodule -parse -emit-objc-header-path %t/blocks.h -import-objc-header %S/../Inputs/empty.h -disable-objc-attr-requires-foundation-module -// RUN: FileCheck %s < %t/blocks.h +// RUN: %FileCheck %s < %t/blocks.h // RUN: %check-in-clang %t/blocks.h // REQUIRES: objc_interop diff --git a/test/PrintAsObjC/cdecl.swift b/test/PrintAsObjC/cdecl.swift index 6d50a44d342b2..41dcf8398d77b 100644 --- a/test/PrintAsObjC/cdecl.swift +++ b/test/PrintAsObjC/cdecl.swift @@ -2,7 +2,7 @@ // RUN: mkdir %t // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-source-import -emit-module -emit-module-doc -o %t %s -disable-objc-attr-requires-foundation-module // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse-as-library %t/cdecl.swiftmodule -parse -emit-objc-header-path %t/cdecl.h -import-objc-header %S/../Inputs/empty.h -disable-objc-attr-requires-foundation-module -// RUN: FileCheck %s < %t/cdecl.h +// RUN: %FileCheck %s < %t/cdecl.h // RUN: %check-in-clang %t/cdecl.h // RUN: %check-in-clang -fno-modules -Qunused-arguments %t/cdecl.h -include Foundation.h -include ctypes.h -include CoreFoundation.h diff --git a/test/PrintAsObjC/circularity-errors.swift b/test/PrintAsObjC/circularity-errors.swift index 5774663ed9ef2..1bc4d7b554fdb 100644 --- a/test/PrintAsObjC/circularity-errors.swift +++ b/test/PrintAsObjC/circularity-errors.swift @@ -13,7 +13,7 @@ // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -import-objc-header %S/Inputs/circularity.h -emit-module -o %t %s // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -import-objc-header %S/Inputs/circularity.h -parse-as-library %t/circularity-errors.swiftmodule -parse -emit-objc-header-path %t/circularity-errors.h -// RUN: FileCheck %s < %t/circularity-errors.h +// RUN: %FileCheck %s < %t/circularity-errors.h // RUN: not %check-in-clang %t/circularity-errors.h import Foundation diff --git a/test/PrintAsObjC/circularity.swift b/test/PrintAsObjC/circularity.swift index 2e08e360c68e6..5f07991396f0a 100644 --- a/test/PrintAsObjC/circularity.swift +++ b/test/PrintAsObjC/circularity.swift @@ -13,7 +13,7 @@ // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -import-objc-header %S/Inputs/circularity.h -emit-module -o %t %s // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -import-objc-header %S/Inputs/circularity.h -parse-as-library %t/circularity.swiftmodule -parse -emit-objc-header-path %t/circularity.h -// RUN: FileCheck %s < %t/circularity.h +// RUN: %FileCheck %s < %t/circularity.h // RUN: %check-in-clang %t/circularity.h // RUN: %check-in-clang -fno-modules -Qunused-arguments %t/circularity.h diff --git a/test/PrintAsObjC/classes.swift b/test/PrintAsObjC/classes.swift index bee800e621451..6e600ea1c2791 100644 --- a/test/PrintAsObjC/classes.swift +++ b/test/PrintAsObjC/classes.swift @@ -15,8 +15,8 @@ // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -emit-module -o %t %s -disable-objc-attr-requires-foundation-module // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -parse-as-library %t/classes.swiftmodule -parse -emit-objc-header-path %t/classes.h -import-objc-header %S/../Inputs/empty.h -disable-objc-attr-requires-foundation-module -// RUN: FileCheck %s < %t/classes.h -// RUN: FileCheck --check-prefix=NEGATIVE %s < %t/classes.h +// RUN: %FileCheck %s < %t/classes.h +// RUN: %FileCheck --check-prefix=NEGATIVE %s < %t/classes.h // RUN: %check-in-clang %t/classes.h // RUN: not %check-in-clang -fno-modules -Qunused-arguments %t/classes.h // RUN: %check-in-clang -fno-modules -Qunused-arguments %t/classes.h -include Foundation.h -include CoreFoundation.h -include objc_generics.h diff --git a/test/PrintAsObjC/empty.swift b/test/PrintAsObjC/empty.swift index d14f908583961..e22224df5e63e 100644 --- a/test/PrintAsObjC/empty.swift +++ b/test/PrintAsObjC/empty.swift @@ -1,10 +1,10 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -parse -emit-objc-header-path %t/empty.h -// RUN: FileCheck %s < %t/empty.h +// RUN: %FileCheck %s < %t/empty.h // RUN: %check-in-clang -std=c99 %t/empty.h // RUN: %check-in-clang -std=c99 -fno-modules -Qunused-arguments %t/empty.h -// RUN: not %check-in-clang -I %S/Inputs/clang-headers %t/empty.h 2>&1 | FileCheck %s --check-prefix=CUSTOM-OBJC-PROLOGUE +// RUN: not %check-in-clang -I %S/Inputs/clang-headers %t/empty.h 2>&1 | %FileCheck %s --check-prefix=CUSTOM-OBJC-PROLOGUE // Make sure we can handle two bridging headers. rdar://problem/22702104 // RUN: %check-in-clang -include %t/empty.h -std=c99 -fno-modules -Qunused-arguments %t/empty.h diff --git a/test/PrintAsObjC/enums.swift b/test/PrintAsObjC/enums.swift index cd532c6eef730..63a3e9448e13b 100644 --- a/test/PrintAsObjC/enums.swift +++ b/test/PrintAsObjC/enums.swift @@ -2,8 +2,8 @@ // RUN: mkdir %t // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-source-import -emit-module -emit-module-doc -o %t %s -import-objc-header %S/Inputs/enums.h -disable-objc-attr-requires-foundation-module // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse-as-library %t/enums.swiftmodule -parse -emit-objc-header-path %t/enums.h -import-objc-header %S/Inputs/enums.h -disable-objc-attr-requires-foundation-module -// RUN: FileCheck %s < %t/enums.h -// RUN: FileCheck -check-prefix=NEGATIVE %s < %t/enums.h +// RUN: %FileCheck %s < %t/enums.h +// RUN: %FileCheck -check-prefix=NEGATIVE %s < %t/enums.h // RUN: %check-in-clang %t/enums.h // RUN: %check-in-clang -fno-modules -Qunused-arguments %t/enums.h -include Foundation.h -include ctypes.h -include CoreFoundation.h diff --git a/test/PrintAsObjC/error-delegate.swift b/test/PrintAsObjC/error-delegate.swift index 36f47ea26651e..1e03b6cae56a6 100644 --- a/test/PrintAsObjC/error-delegate.swift +++ b/test/PrintAsObjC/error-delegate.swift @@ -13,7 +13,7 @@ // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -import-objc-header %S/Inputs/error-delegate.h -emit-module -o %t %s // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -import-objc-header %S/Inputs/error-delegate.h -parse-as-library %t/error-delegate.swiftmodule -parse -emit-objc-header-path %t/error-delegate.h -// RUN: FileCheck %s < %t/error-delegate.h +// RUN: %FileCheck %s < %t/error-delegate.h // RUN: %check-in-clang %t/error-delegate.h import Foundation diff --git a/test/PrintAsObjC/extensions.swift b/test/PrintAsObjC/extensions.swift index 7adb84d355cc1..bb19ef58151ab 100644 --- a/test/PrintAsObjC/extensions.swift +++ b/test/PrintAsObjC/extensions.swift @@ -4,8 +4,8 @@ // RUN: mkdir %t // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module -o %t %s -disable-objc-attr-requires-foundation-module // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse-as-library %t/extensions.swiftmodule -parse -emit-objc-header-path %t/extensions.h -import-objc-header %S/../Inputs/empty.h -disable-objc-attr-requires-foundation-module -// RUN: FileCheck %s < %t/extensions.h -// RUN: FileCheck --check-prefix=NEGATIVE %s < %t/extensions.h +// RUN: %FileCheck %s < %t/extensions.h +// RUN: %FileCheck --check-prefix=NEGATIVE %s < %t/extensions.h // RUN: %check-in-clang %t/extensions.h // REQUIRES: objc_interop diff --git a/test/PrintAsObjC/generic-ancestry.swift b/test/PrintAsObjC/generic-ancestry.swift index 862c26981ab86..a84ec93dce292 100644 --- a/test/PrintAsObjC/generic-ancestry.swift +++ b/test/PrintAsObjC/generic-ancestry.swift @@ -4,8 +4,8 @@ // RUN: mkdir %t // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module -o %t %s -module-name generic -disable-objc-attr-requires-foundation-module // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse-as-library %t/generic.swiftmodule -parse -emit-objc-header-path %t/generic.h -import-objc-header %S/../Inputs/empty.h -disable-objc-attr-requires-foundation-module -// RUN: FileCheck %s < %t/generic.h -// RUN: FileCheck -check-prefix=NEGATIVE %s < %t/generic.h +// RUN: %FileCheck %s < %t/generic.h +// RUN: %FileCheck -check-prefix=NEGATIVE %s < %t/generic.h // RUN: %check-in-clang %t/generic.h // REQUIRES: objc_interop diff --git a/test/PrintAsObjC/imports.swift b/test/PrintAsObjC/imports.swift index 2c8e5cd125073..ff2037dbeac43 100644 --- a/test/PrintAsObjC/imports.swift +++ b/test/PrintAsObjC/imports.swift @@ -4,8 +4,8 @@ // RUN: mkdir %t // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules/ -emit-module -o %t %s -disable-objc-attr-requires-foundation-module // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules/ -parse-as-library %t/imports.swiftmodule -parse -emit-objc-header-path %t/imports.h -import-objc-header %S/../Inputs/empty.h -disable-objc-attr-requires-foundation-module -// RUN: FileCheck %s < %t/imports.h -// RUN: FileCheck -check-prefix=NEGATIVE %s < %t/imports.h +// RUN: %FileCheck %s < %t/imports.h +// RUN: %FileCheck -check-prefix=NEGATIVE %s < %t/imports.h // RUN: %check-in-clang %t/imports.h -I %S/Inputs/custom-modules/ // REQUIRES: objc_interop diff --git a/test/PrintAsObjC/local-types.swift b/test/PrintAsObjC/local-types.swift index ca2729b56f5ad..77bb5e56f9d9d 100644 --- a/test/PrintAsObjC/local-types.swift +++ b/test/PrintAsObjC/local-types.swift @@ -4,7 +4,7 @@ // RUN: mkdir %t // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module -o %t %s -module-name local -disable-objc-attr-requires-foundation-module // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse-as-library %t/local.swiftmodule -parse -emit-objc-header-path %t/local.h -import-objc-header %S/../Inputs/empty.h -disable-objc-attr-requires-foundation-module -// RUN: FileCheck %s < %t/local.h +// RUN: %FileCheck %s < %t/local.h // RUN: %check-in-clang %t/local.h // REQUIRES: objc_interop diff --git a/test/PrintAsObjC/mixed-framework-fwd.swift b/test/PrintAsObjC/mixed-framework-fwd.swift index 91b232b621eb5..d2b148efee346 100644 --- a/test/PrintAsObjC/mixed-framework-fwd.swift +++ b/test/PrintAsObjC/mixed-framework-fwd.swift @@ -1,18 +1,18 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -F %S/Inputs/ -module-name Mixed -import-underlying-module %s -parse -emit-objc-header-path %t/mixed.h -// RUN: FileCheck -check-prefix=CHECK -check-prefix=NO-IMPORT %s < %t/mixed.h +// RUN: %FileCheck -check-prefix=CHECK -check-prefix=NO-IMPORT %s < %t/mixed.h // RUN: %check-in-clang -F %S/Inputs/ %t/mixed.h // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -module-name Mixed -import-objc-header %S/Inputs/Mixed.framework/Headers/Mixed.h %s -parse -emit-objc-header-path %t/mixed-header.h -// RUN: FileCheck -check-prefix=CHECK -check-prefix=NO-IMPORT %s < %t/mixed-header.h +// RUN: %FileCheck -check-prefix=CHECK -check-prefix=NO-IMPORT %s < %t/mixed-header.h // RUN: %check-in-clang -include %S/Inputs/Mixed.framework/Headers/Mixed.h %t/mixed-header.h // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -F %S/Inputs/ -module-name Mixed -import-underlying-module %s -parse -emit-objc-header-path %t/mixed-proto.h -DREQUIRE -// RUN: FileCheck -check-prefix=CHECK -check-prefix=FRAMEWORK %s < %t/mixed-proto.h +// RUN: %FileCheck -check-prefix=CHECK -check-prefix=FRAMEWORK %s < %t/mixed-proto.h // RUN: %check-in-clang -F %S/Inputs/ %t/mixed-proto.h // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -module-name Mixed -import-objc-header %S/Inputs/Mixed.framework/Headers/Mixed.h %s -parse -emit-objc-header-path %t/mixed-header-proto.h -DREQUIRE -// RUN: FileCheck -check-prefix=CHECK -check-prefix=HEADER %s < %t/mixed-header-proto.h +// RUN: %FileCheck -check-prefix=CHECK -check-prefix=HEADER %s < %t/mixed-header-proto.h // RUN: %check-in-clang -include %S/Inputs/Mixed.framework/Headers/Mixed.h %t/mixed-header-proto.h // REQUIRES: objc_interop diff --git a/test/PrintAsObjC/mixed-framework.swift b/test/PrintAsObjC/mixed-framework.swift index a79d695f3ca2f..712c3f9508b38 100644 --- a/test/PrintAsObjC/mixed-framework.swift +++ b/test/PrintAsObjC/mixed-framework.swift @@ -1,10 +1,10 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -F %S/Inputs/ -module-name Mixed -import-underlying-module -parse-as-library %s -parse -emit-objc-header-path %t/mixed.h -// RUN: FileCheck -check-prefix=CHECK -check-prefix=FRAMEWORK %s < %t/mixed.h +// RUN: %FileCheck -check-prefix=CHECK -check-prefix=FRAMEWORK %s < %t/mixed.h // RUN: %check-in-clang -F %S/Inputs/ %t/mixed.h // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -module-name Mixed -import-objc-header %S/Inputs/Mixed.framework/Headers/Mixed.h %s -parse -emit-objc-header-path %t/mixed-header.h -// RUN: FileCheck -check-prefix=CHECK -check-prefix=HEADER %s < %t/mixed-header.h +// RUN: %FileCheck -check-prefix=CHECK -check-prefix=HEADER %s < %t/mixed-header.h // RUN: %check-in-clang -include %S/Inputs/Mixed.framework/Headers/Mixed.h %t/mixed-header.h // REQUIRES: objc_interop diff --git a/test/PrintAsObjC/newtype.swift b/test/PrintAsObjC/newtype.swift index f7dbd751733e0..ce09ddb411f46 100644 --- a/test/PrintAsObjC/newtype.swift +++ b/test/PrintAsObjC/newtype.swift @@ -13,7 +13,7 @@ // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -import-objc-header %S/Inputs/newtype.h -enable-swift-newtype -emit-module -o %t %s // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -import-objc-header %S/Inputs/newtype.h -enable-swift-newtype -parse-as-library %t/newtype.swiftmodule -parse -emit-objc-header-path %t/newtype.h -// RUN: FileCheck %s < %t/newtype.h +// RUN: %FileCheck %s < %t/newtype.h // RUN: %check-in-clang %t/newtype.h // RUN: %check-in-clang -fno-modules -Qunused-arguments %t/newtype.h diff --git a/test/PrintAsObjC/override.swift b/test/PrintAsObjC/override.swift index 77ab1adff68f6..c8cb90099ca2b 100644 --- a/test/PrintAsObjC/override.swift +++ b/test/PrintAsObjC/override.swift @@ -9,9 +9,9 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-module -I %S/Inputs/custom-modules -o %t %s // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -parse-as-library %t/override.swiftmodule -parse -emit-objc-header-path %t/override.h -// RUN: FileCheck %s < %t/override.h +// RUN: %FileCheck %s < %t/override.h // RUN: %check-in-clang %t/override.h -I %S/Inputs/custom-modules -Wno-super-class-method-mismatch -Wno-overriding-method-mismatch -// RUN: not %check-in-clang %t/override.h -Wno-super-class-method-mismatch -I %S/Inputs/custom-modules 2>&1 | FileCheck -check-prefix=CLANG %s +// RUN: not %check-in-clang %t/override.h -Wno-super-class-method-mismatch -I %S/Inputs/custom-modules 2>&1 | %FileCheck -check-prefix=CLANG %s // REQUIRES: objc_interop diff --git a/test/PrintAsObjC/pragma-clang.swift b/test/PrintAsObjC/pragma-clang.swift index 14e887e83e09b..c639a2dc573b1 100644 --- a/test/PrintAsObjC/pragma-clang.swift +++ b/test/PrintAsObjC/pragma-clang.swift @@ -9,7 +9,7 @@ // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) %s -import-objc-header %S/Inputs/bridging-header.h -parse -emit-objc-header-path %t/pragma-clang.h // RUN: %check-in-clang -fsyntax-only -Werror %t/pragma-clang.h -// RUN: FileCheck %s < %t/pragma-clang.h +// RUN: %FileCheck %s < %t/pragma-clang.h // REQUIRES: objc_interop diff --git a/test/PrintAsObjC/protocols.swift b/test/PrintAsObjC/protocols.swift index 8c637c1ffe078..f6c256d415a89 100644 --- a/test/PrintAsObjC/protocols.swift +++ b/test/PrintAsObjC/protocols.swift @@ -11,8 +11,8 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -I %t -emit-module -o %t %s -disable-objc-attr-requires-foundation-module // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -I %t -parse-as-library %t/protocols.swiftmodule -parse -emit-objc-header-path %t/protocols.h -import-objc-header %S/../Inputs/empty.h -disable-objc-attr-requires-foundation-module -// RUN: FileCheck %s < %t/protocols.h -// RUN: FileCheck --check-prefix=NEGATIVE %s < %t/protocols.h +// RUN: %FileCheck %s < %t/protocols.h +// RUN: %FileCheck --check-prefix=NEGATIVE %s < %t/protocols.h // RUN: %check-in-clang %t/protocols.h // REQUIRES: objc_interop diff --git a/test/PrintAsObjC/simd.swift b/test/PrintAsObjC/simd.swift index fc92b51fd6596..07ab341d032ad 100644 --- a/test/PrintAsObjC/simd.swift +++ b/test/PrintAsObjC/simd.swift @@ -10,7 +10,7 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-module -emit-module-doc -o %t -module-name simd_test %s // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -parse-as-library %t/simd_test.swiftmodule -parse -emit-objc-header-path %t/simd.h -import-objc-header %S/../Inputs/empty.h -disable-objc-attr-requires-foundation-module -// RUN: FileCheck %s < %t/simd.h +// RUN: %FileCheck %s < %t/simd.h // RUN: %check-in-clang %t/simd.h // RUN: %check-in-clang -fno-modules -Qunused-arguments %t/simd.h -include Foundation.h diff --git a/test/PrintAsObjC/swift_name.m b/test/PrintAsObjC/swift_name.m index a34cbae3900c2..fd2999a909883 100644 --- a/test/PrintAsObjC/swift_name.m +++ b/test/PrintAsObjC/swift_name.m @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %S/../Inputs/empty.swift -parse -emit-objc-header-path %t/empty.h -// RUN: %clang -E -fobjc-arc -fmodules -isysroot %clang-importer-sdk-path -I %t %s | FileCheck %s +// RUN: %clang -E -fobjc-arc -fmodules -isysroot %clang-importer-sdk-path -I %t %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/PrintAsObjC/swift_name.swift b/test/PrintAsObjC/swift_name.swift index 459f0fb01b574..86d29cdb2e29f 100644 --- a/test/PrintAsObjC/swift_name.swift +++ b/test/PrintAsObjC/swift_name.swift @@ -13,7 +13,7 @@ // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -import-objc-header %S/Inputs/swift_name.h -emit-module -o %t %s // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -import-objc-header %S/Inputs/swift_name.h -parse-as-library %t/swift_name.swiftmodule -parse -emit-objc-header-path %t/swift_name.h -// RUN: FileCheck %s < %t/swift_name.h +// RUN: %FileCheck %s < %t/swift_name.h // RUN: %check-in-clang %t/swift_name.h import Foundation diff --git a/test/Prototypes/GenericDispatch.swift b/test/Prototypes/GenericDispatch.swift index 96b6c7a21d640..cfd6d5fc146fe 100644 --- a/test/Prototypes/GenericDispatch.swift +++ b/test/Prototypes/GenericDispatch.swift @@ -15,7 +15,7 @@ // prototype to which we can refer when building the standard library. // //===----------------------------------------------------------------------===// -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // CHECK: testing... diff --git a/test/Prototypes/TextFormatting.swift b/test/Prototypes/TextFormatting.swift index 0df1cf32cb9fc..bbca1c6809089 100644 --- a/test/Prototypes/TextFormatting.swift +++ b/test/Prototypes/TextFormatting.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // Text Formatting Prototype diff --git a/test/Reflection/box_descriptors.sil b/test/Reflection/box_descriptors.sil index 7689111bc2c78..b9f01e1787a9a 100644 --- a/test/Reflection/box_descriptors.sil +++ b/test/Reflection/box_descriptors.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift %s -emit-module -emit-library -module-name capture_descriptors -o %t/capture_descriptors.%target-dylib-extension -// RUN: %target-swift-reflection-dump -binary-filename %t/capture_descriptors.%target-dylib-extension | FileCheck %s +// RUN: %target-swift-reflection-dump -binary-filename %t/capture_descriptors.%target-dylib-extension | %FileCheck %s sil_stage canonical diff --git a/test/Reflection/capture_descriptors.sil b/test/Reflection/capture_descriptors.sil index e0a4b08f716f7..7d35485abd2f1 100644 --- a/test/Reflection/capture_descriptors.sil +++ b/test/Reflection/capture_descriptors.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift %s -emit-module -emit-library -module-name capture_descriptors -o %t/capture_descriptors.%target-dylib-extension -// RUN: %target-swift-reflection-dump -binary-filename %t/capture_descriptors.%target-dylib-extension | FileCheck %s +// RUN: %target-swift-reflection-dump -binary-filename %t/capture_descriptors.%target-dylib-extension | %FileCheck %s sil_stage canonical diff --git a/test/Reflection/typeref_decoding.swift b/test/Reflection/typeref_decoding.swift index 8ebe0f83e9ac9..0f49048b3cd1b 100644 --- a/test/Reflection/typeref_decoding.swift +++ b/test/Reflection/typeref_decoding.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift %S/Inputs/ConcreteTypes.swift %S/Inputs/GenericTypes.swift %S/Inputs/Protocols.swift %S/Inputs/Extensions.swift %S/Inputs/Closures.swift -parse-as-library -emit-module -emit-library -module-name TypesToReflect -o %t/libTypesToReflect.%target-dylib-extension -// RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect.%target-dylib-extension | FileCheck %s +// RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect.%target-dylib-extension | %FileCheck %s // CHECK: FIELDS: // CHECK: ======= diff --git a/test/Reflection/typeref_decoding_imported.swift b/test/Reflection/typeref_decoding_imported.swift index 2850bbce8e908..2ccce7aa162ce 100644 --- a/test/Reflection/typeref_decoding_imported.swift +++ b/test/Reflection/typeref_decoding_imported.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift %S/Inputs/ImportedTypes.swift -parse-as-library -emit-module -emit-library -module-name TypesToReflect -o %t/libTypesToReflect.%target-dylib-extension -I %S/Inputs -// RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect.%target-dylib-extension | FileCheck %s --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-%target-cpu +// RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect.%target-dylib-extension | %FileCheck %s --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-%target-cpu // CHECK-32: FIELDS: // CHECK-32: ======= diff --git a/test/Reflection/typeref_decoding_objc.swift b/test/Reflection/typeref_decoding_objc.swift index 0bd724f7eb37e..75a958dae5cfa 100644 --- a/test/Reflection/typeref_decoding_objc.swift +++ b/test/Reflection/typeref_decoding_objc.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift %S/Inputs/ObjectiveCTypes.swift -parse-as-library -emit-module -emit-library -module-name TypesToReflect -o %t/libTypesToReflect.%target-dylib-extension -// RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect.%target-dylib-extension | FileCheck %s --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK +// RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect.%target-dylib-extension | %FileCheck %s --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK // REQUIRES: objc_interop // CHECK: FIELDS: diff --git a/test/Reflection/typeref_lowering.swift b/test/Reflection/typeref_lowering.swift index 5d7a4a24f1dd9..c2d721c825623 100644 --- a/test/Reflection/typeref_lowering.swift +++ b/test/Reflection/typeref_lowering.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift %S/Inputs/TypeLowering.swift -parse-as-library -emit-module -emit-library -module-name TypeLowering -o %t/libTypesToReflect.%target-dylib-extension -// RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect.%target-dylib-extension -binary-filename %platform-module-dir/libswiftCore.%target-dylib-extension -dump-type-lowering < %s | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect.%target-dylib-extension -binary-filename %platform-module-dir/libswiftCore.%target-dylib-extension -dump-type-lowering < %s | %FileCheck %s --check-prefix=CHECK-%target-ptrsize V12TypeLowering11BasicStruct // CHECK-64: (struct TypeLowering.BasicStruct) diff --git a/test/Reflection/typeref_lowering_imported.swift b/test/Reflection/typeref_lowering_imported.swift index e6e84304b10d6..27a9805eeab70 100644 --- a/test/Reflection/typeref_lowering_imported.swift +++ b/test/Reflection/typeref_lowering_imported.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift %S/Inputs/ImportedTypes.swift -parse-as-library -emit-module -emit-library -module-name TypeLowering -I %S/Inputs -o %t/libTypesToReflect -// RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect -binary-filename %platform-module-dir/libswiftCore.dylib -dump-type-lowering < %s | FileCheck %s +// RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect -binary-filename %platform-module-dir/libswiftCore.dylib -dump-type-lowering < %s | %FileCheck %s // REQUIRES: objc_interop // REQUIRES: CPU=x86_64 diff --git a/test/Reflection/typeref_lowering_objc.swift b/test/Reflection/typeref_lowering_objc.swift index 36f0fd4ebae18..fe1b2c83f7e4e 100644 --- a/test/Reflection/typeref_lowering_objc.swift +++ b/test/Reflection/typeref_lowering_objc.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift %S/Inputs/TypeLoweringObjectiveC.swift -parse-as-library -emit-module -emit-library -module-name TypeLowering -o %t/libTypesToReflect -// RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect -binary-filename %platform-module-dir/libswiftCore.dylib -dump-type-lowering < %s | FileCheck %s +// RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect -binary-filename %platform-module-dir/libswiftCore.dylib -dump-type-lowering < %s | %FileCheck %s // REQUIRES: objc_interop // REQUIRES: CPU=x86_64 diff --git a/test/RemoteAST/foreign_types.swift b/test/RemoteAST/foreign_types.swift index 7ee813591d868..358cf0a5f26e6 100644 --- a/test/RemoteAST/foreign_types.swift +++ b/test/RemoteAST/foreign_types.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-remoteast-test -sdk %S/../IRGen/Inputs %s | FileCheck %s +// RUN: %target-swift-remoteast-test -sdk %S/../IRGen/Inputs %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/RemoteAST/member_offsets.swift b/test/RemoteAST/member_offsets.swift index 77eafca651cd3..3b0566918aba8 100644 --- a/test/RemoteAST/member_offsets.swift +++ b/test/RemoteAST/member_offsets.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-remoteast-test %s | FileCheck %s +// RUN: %target-swift-remoteast-test %s | %FileCheck %s // REQUIRES: PTRSIZE=64 diff --git a/test/RemoteAST/nominal_types.swift b/test/RemoteAST/nominal_types.swift index 83de3147a878f..5bf7ed3cdaae8 100644 --- a/test/RemoteAST/nominal_types.swift +++ b/test/RemoteAST/nominal_types.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-remoteast-test %s | FileCheck %s +// RUN: %target-swift-remoteast-test %s | %FileCheck %s @_silgen_name("printMetadataType") func printType(_: Any.Type) diff --git a/test/RemoteAST/objc_classes.swift b/test/RemoteAST/objc_classes.swift index 32b1ee60dd161..0a3ce42637617 100644 --- a/test/RemoteAST/objc_classes.swift +++ b/test/RemoteAST/objc_classes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-remoteast-test-with-sdk %s | FileCheck %s +// RUN: %target-swift-remoteast-test-with-sdk %s | %FileCheck %s // REQUIRES: swift_interpreter // REQUIRES: objc_interop diff --git a/test/RemoteAST/structural_types.swift b/test/RemoteAST/structural_types.swift index 03670f1d35b83..980eb89e7a4ee 100644 --- a/test/RemoteAST/structural_types.swift +++ b/test/RemoteAST/structural_types.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-remoteast-test %s | FileCheck %s +// RUN: %target-swift-remoteast-test %s | %FileCheck %s @_silgen_name("printMetadataType") func printType(_: Any.Type) diff --git a/test/SIL/Parser/apply_with_conformance.sil b/test/SIL/Parser/apply_with_conformance.sil index 02a03919f3836..2354073df4d8d 100644 --- a/test/SIL/Parser/apply_with_conformance.sil +++ b/test/SIL/Parser/apply_with_conformance.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s // radar://16375832 sil_stage raw diff --git a/test/SIL/Parser/apply_with_substitution.sil b/test/SIL/Parser/apply_with_substitution.sil index 8a050753381ff..6cf6f3ecaaa25 100644 --- a/test/SIL/Parser/apply_with_substitution.sil +++ b/test/SIL/Parser/apply_with_substitution.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen | %FileCheck %s // rdar://14443287 sil_stage raw diff --git a/test/SIL/Parser/attributes.sil b/test/SIL/Parser/attributes.sil index c3aad2f791574..6db8bc3ad145d 100644 --- a/test/SIL/Parser/attributes.sil +++ b/test/SIL/Parser/attributes.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s | FileCheck %s +// RUN: %target-sil-opt %s | %FileCheck %s // CHECK-LABEL: sil [_semantics "123"] [_semantics "456"] @foo : $@convention(thin) () -> () { sil [_semantics "123"] [_semantics "456"] @foo : $@convention(thin) () -> () { diff --git a/test/SIL/Parser/available.sil b/test/SIL/Parser/available.sil index eae57334c7dc2..35e16e6e5a807 100644 --- a/test/SIL/Parser/available.sil +++ b/test/SIL/Parser/available.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s | FileCheck %s +// RUN: %target-sil-opt %s | %FileCheck %s @available(*,unavailable,message: "it has been renamed") public struct mmConstUnsafePointer { diff --git a/test/SIL/Parser/basic.sil b/test/SIL/Parser/basic.sil index a258ea24c837f..64e859ee5439b 100644 --- a/test/SIL/Parser/basic.sil +++ b/test/SIL/Parser/basic.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen | %FileCheck %s sil_stage raw // CHECK: sil_stage raw diff --git a/test/SIL/Parser/basic_objc.sil b/test/SIL/Parser/basic_objc.sil index f8b274f521991..232707e7868c2 100644 --- a/test/SIL/Parser/basic_objc.sil +++ b/test/SIL/Parser/basic_objc.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SIL/Parser/bound_generic.sil b/test/SIL/Parser/bound_generic.sil index 07340031583c7..ce0cb73c19520 100644 --- a/test/SIL/Parser/bound_generic.sil +++ b/test/SIL/Parser/bound_generic.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen | %FileCheck %s // rdar://14443287 sil_stage raw diff --git a/test/SIL/Parser/coverage_maps.sil b/test/SIL/Parser/coverage_maps.sil index 24787ceef260d..3ab203e1fd496 100644 --- a/test/SIL/Parser/coverage_maps.sil +++ b/test/SIL/Parser/coverage_maps.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s -module-name=coverage_maps | %target-sil-opt -verify -module-name=coverage_maps | FileCheck %s +// RUN: %target-sil-opt %s -module-name=coverage_maps | %target-sil-opt -verify -module-name=coverage_maps | %FileCheck %s sil @someFunction : $@convention(thin) () -> () { bb0: diff --git a/test/SIL/Parser/default_witness_tables.sil b/test/SIL/Parser/default_witness_tables.sil index 0313340c91c17..cfe23f6a07375 100644 --- a/test/SIL/Parser/default_witness_tables.sil +++ b/test/SIL/Parser/default_witness_tables.sil @@ -1,5 +1,5 @@ -// RUN: %target-sil-opt %s -module-name=witness_tables -enable-resilience | %target-sil-opt -module-name=witness_tables -enable-resilience | FileCheck %s -// RUN: %target-sil-opt %s -module-name=witness_tables -enable-resilience -O | FileCheck %s +// RUN: %target-sil-opt %s -module-name=witness_tables -enable-resilience | %target-sil-opt -module-name=witness_tables -enable-resilience | %FileCheck %s +// RUN: %target-sil-opt %s -module-name=witness_tables -enable-resilience -O | %FileCheck %s sil_stage raw diff --git a/test/SIL/Parser/enum_in_class.sil b/test/SIL/Parser/enum_in_class.sil index 6ab43e5dbbd18..0d2dfabdc1904 100644 --- a/test/SIL/Parser/enum_in_class.sil +++ b/test/SIL/Parser/enum_in_class.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen | %FileCheck %s // rdar://16764223 diff --git a/test/SIL/Parser/final.swift b/test/SIL/Parser/final.swift index 06198fe62362b..03bc3fe186c31 100644 --- a/test/SIL/Parser/final.swift +++ b/test/SIL/Parser/final.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen | %FileCheck %s // CHECK: final class Rect // CHECK: @sil_stored final var orgx: Double diff --git a/test/SIL/Parser/generic_signature_with_depth.swift b/test/SIL/Parser/generic_signature_with_depth.swift index 5909cf23e3cac..e6635aee2ad88 100644 --- a/test/SIL/Parser/generic_signature_with_depth.swift +++ b/test/SIL/Parser/generic_signature_with_depth.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-silgen | %target-sil-opt | FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen | %target-sil-opt | %FileCheck %s protocol mmGeneratorType { associatedtype Element diff --git a/test/SIL/Parser/generics.sil b/test/SIL/Parser/generics.sil index b1d5bc63011b7..014248c4df607 100644 --- a/test/SIL/Parser/generics.sil +++ b/test/SIL/Parser/generics.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen | %FileCheck %s sil_stage raw import Builtin diff --git a/test/SIL/Parser/global_init_attribute.sil b/test/SIL/Parser/global_init_attribute.sil index dc44034c46bc0..3f7bdb27bd47d 100644 --- a/test/SIL/Parser/global_init_attribute.sil +++ b/test/SIL/Parser/global_init_attribute.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle %s -emit-silgen | %FileCheck %s sil_stage canonical diff --git a/test/SIL/Parser/nonatomic_reference_counting.sil b/test/SIL/Parser/nonatomic_reference_counting.sil index 975884c77d984..5204ae174848e 100644 --- a/test/SIL/Parser/nonatomic_reference_counting.sil +++ b/test/SIL/Parser/nonatomic_reference_counting.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen | %FileCheck %s // Check that all reference counting instructions can take the [nonatomic] // attribute. SIL parser should be able to parse this attribute and diff --git a/test/SIL/Parser/overloaded_member.sil b/test/SIL/Parser/overloaded_member.sil index a7ae9752b0001..de9e8007662b7 100644 --- a/test/SIL/Parser/overloaded_member.sil +++ b/test/SIL/Parser/overloaded_member.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-silgen -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen -disable-objc-attr-requires-foundation-module | %FileCheck %s // rdar://15763213 // Make sure that we can parse SILDeclRef to an overloaded member. diff --git a/test/SIL/Parser/polymorphic_function.sil b/test/SIL/Parser/polymorphic_function.sil index 07117fefa553d..0b7c11195bfd6 100644 --- a/test/SIL/Parser/polymorphic_function.sil +++ b/test/SIL/Parser/polymorphic_function.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s | FileCheck %s +// RUN: %target-sil-opt %s | %FileCheck %s import Swift diff --git a/test/SIL/Parser/protocol_getter.sil b/test/SIL/Parser/protocol_getter.sil index 80419182d7327..69e77f4571f96 100644 --- a/test/SIL/Parser/protocol_getter.sil +++ b/test/SIL/Parser/protocol_getter.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen | %FileCheck %s // Verify that SILParser correctly handles witness_method on a getter. import Swift diff --git a/test/SIL/Parser/self.sil b/test/SIL/Parser/self.sil index d1860511d2348..1b06ac6a83063 100644 --- a/test/SIL/Parser/self.sil +++ b/test/SIL/Parser/self.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -parse-stdlib -module-name Swift -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend %s -parse-stdlib -module-name Swift -emit-silgen | %FileCheck %s enum Optional { case none diff --git a/test/SIL/Parser/self_substitution.sil b/test/SIL/Parser/self_substitution.sil index b1945c3181793..461e48b90742e 100644 --- a/test/SIL/Parser/self_substitution.sil +++ b/test/SIL/Parser/self_substitution.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s | FileCheck %s +// RUN: %target-sil-opt %s | %FileCheck %s import Builtin import Swift diff --git a/test/SIL/Parser/sil_scope.sil b/test/SIL/Parser/sil_scope.sil index ccfbe4674c1c4..5af31104e9538 100644 --- a/test/SIL/Parser/sil_scope.sil +++ b/test/SIL/Parser/sil_scope.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s | FileCheck %s +// RUN: %target-sil-opt %s | %FileCheck %s // CHECK: sil_scope 1 { loc "foo.sil":12:34 parent @foo : $@convention(thin) () -> () } sil_scope 1 { loc "foo.sil":12:34 parent @foo : $@convention(thin) () -> () } diff --git a/test/SIL/Parser/sil_scope_inline_fn.sil b/test/SIL/Parser/sil_scope_inline_fn.sil index aa3e50f30096b..b00da92e584ae 100644 --- a/test/SIL/Parser/sil_scope_inline_fn.sil +++ b/test/SIL/Parser/sil_scope_inline_fn.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -O %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -O %s | %FileCheck %s sil_scope 1 { loc "foo.sil":3:4 parent @foo : $@convention(thin) () -> () } sil_scope 2 { loc "foo.sil":3:4 parent 1 } diff --git a/test/SIL/Parser/sillocation.sil b/test/SIL/Parser/sillocation.sil index 30a9f5852481d..71d6a37c3a2c3 100644 --- a/test/SIL/Parser/sillocation.sil +++ b/test/SIL/Parser/sillocation.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s | FileCheck %s +// RUN: %target-sil-opt %s | %FileCheck %s sil @foo : $@convention(thin) () -> () { bb0: diff --git a/test/SIL/Parser/static_initializer.sil b/test/SIL/Parser/static_initializer.sil index 8ff4081c7c7c4..8bccc07152f25 100644 --- a/test/SIL/Parser/static_initializer.sil +++ b/test/SIL/Parser/static_initializer.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s | FileCheck %s +// RUN: %target-sil-opt %s | %FileCheck %s // Generated from // var x : Int32 = 2 diff --git a/test/SIL/Parser/stored_property.sil b/test/SIL/Parser/stored_property.sil index b074e9a69385d..b08ece0386fa6 100644 --- a/test/SIL/Parser/stored_property.sil +++ b/test/SIL/Parser/stored_property.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s | FileCheck %s +// RUN: %target-sil-opt %s | %FileCheck %s import Swift diff --git a/test/SIL/Parser/typed_boxes.sil b/test/SIL/Parser/typed_boxes.sil index 9ce333e4dceb7..18d950584f97d 100644 --- a/test/SIL/Parser/typed_boxes.sil +++ b/test/SIL/Parser/typed_boxes.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen | %FileCheck %s import Swift diff --git a/test/SIL/Parser/undef.sil b/test/SIL/Parser/undef.sil index a2880ad9b9e2e..0c6ea3db15936 100644 --- a/test/SIL/Parser/undef.sil +++ b/test/SIL/Parser/undef.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s | %target-sil-opt | FileCheck %s +// RUN: %target-sil-opt %s | %target-sil-opt | %FileCheck %s sil_stage raw import Builtin diff --git a/test/SIL/Parser/where_clause.sil b/test/SIL/Parser/where_clause.sil index ce567189799ca..5b4addb454260 100644 --- a/test/SIL/Parser/where_clause.sil +++ b/test/SIL/Parser/where_clause.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen | %FileCheck %s // rdar://16238241 // Make sure we can parse where clause with conformance & same-type requirements. diff --git a/test/SIL/Parser/witness_protocol_from_import.sil b/test/SIL/Parser/witness_protocol_from_import.sil index b930a88316120..ea6eaa880af6d 100644 --- a/test/SIL/Parser/witness_protocol_from_import.sil +++ b/test/SIL/Parser/witness_protocol_from_import.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen | %FileCheck %s sil_stage raw diff --git a/test/SIL/Parser/witness_specialize.sil b/test/SIL/Parser/witness_specialize.sil index 6000cc9a10471..c76d7934f7ccf 100644 --- a/test/SIL/Parser/witness_specialize.sil +++ b/test/SIL/Parser/witness_specialize.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s -module-name=witness_specialize | %target-sil-opt -module-name=witness_specialize | FileCheck %s +// RUN: %target-sil-opt %s -module-name=witness_specialize | %target-sil-opt -module-name=witness_specialize | %FileCheck %s sil_stage raw diff --git a/test/SIL/Parser/witness_tables.sil b/test/SIL/Parser/witness_tables.sil index 16711e57c3c79..d408d8554b4f6 100644 --- a/test/SIL/Parser/witness_tables.sil +++ b/test/SIL/Parser/witness_tables.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s -module-name=witness_tables | %target-sil-opt -module-name=witness_tables | FileCheck %s +// RUN: %target-sil-opt %s -module-name=witness_tables | %target-sil-opt -module-name=witness_tables | %FileCheck %s protocol AssocReqt { func requiredMethod() diff --git a/test/SIL/Parser/witness_with_inherited_gp.sil b/test/SIL/Parser/witness_with_inherited_gp.sil index c73e5b2ccac0f..134304b107758 100644 --- a/test/SIL/Parser/witness_with_inherited_gp.sil +++ b/test/SIL/Parser/witness_with_inherited_gp.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s -module-name WitnessTableWithGP | FileCheck %s +// RUN: %target-sil-opt %s -module-name WitnessTableWithGP | %FileCheck %s // REQUIRES: disabled // FIXME: diff --git a/test/SIL/Serialization/deserialize_appkit.sil b/test/SIL/Serialization/deserialize_appkit.sil index 1b2389ffe5cde..3ad45aaedab52 100644 --- a/test/SIL/Serialization/deserialize_appkit.sil +++ b/test/SIL/Serialization/deserialize_appkit.sil @@ -1,6 +1,6 @@ // Make sure that we can deserialize AppKit. // RUN: %target-sil-opt %platform-sdk-overlay-dir/AppKit.swiftmodule > /dev/null -// RUN: llvm-bcanalyzer %platform-sdk-overlay-dir/AppKit.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %platform-sdk-overlay-dir/AppKit.swiftmodule | %FileCheck %s // REQUIRES: objc_interop // REQUIRES: OS=macosx diff --git a/test/SIL/Serialization/deserialize_coregraphics.swift b/test/SIL/Serialization/deserialize_coregraphics.swift index 03728155f0b17..60d57cec74c3e 100644 --- a/test/SIL/Serialization/deserialize_coregraphics.swift +++ b/test/SIL/Serialization/deserialize_coregraphics.swift @@ -1,6 +1,6 @@ // Make sure that we can deserialize CoreGraphics. // RUN: %target-sil-opt %platform-sdk-overlay-dir/CoreGraphics.swiftmodule > /dev/null -// RUN: llvm-bcanalyzer %platform-sdk-overlay-dir/CoreGraphics.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %platform-sdk-overlay-dir/CoreGraphics.swiftmodule | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SIL/Serialization/deserialize_darwin.sil b/test/SIL/Serialization/deserialize_darwin.sil index 8aaa44d409dd2..31c94a1b065f3 100644 --- a/test/SIL/Serialization/deserialize_darwin.sil +++ b/test/SIL/Serialization/deserialize_darwin.sil @@ -1,6 +1,6 @@ // Make sure that we can deserialize darwin. // RUN: %target-sil-opt %platform-sdk-overlay-dir/Darwin.swiftmodule > /dev/null -// RUN: llvm-bcanalyzer %platform-sdk-overlay-dir/Darwin.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %platform-sdk-overlay-dir/Darwin.swiftmodule | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SIL/Serialization/deserialize_foundation.sil b/test/SIL/Serialization/deserialize_foundation.sil index 551f84167ba01..ca1ad375ee173 100644 --- a/test/SIL/Serialization/deserialize_foundation.sil +++ b/test/SIL/Serialization/deserialize_foundation.sil @@ -1,6 +1,6 @@ // Make sure that we can deserialize foundation. // RUN: %target-sil-opt %platform-sdk-overlay-dir/Foundation.swiftmodule > /dev/null -// RUN: llvm-bcanalyzer %platform-sdk-overlay-dir/Foundation.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %platform-sdk-overlay-dir/Foundation.swiftmodule | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SIL/Serialization/deserialize_generic.sil b/test/SIL/Serialization/deserialize_generic.sil index 02c880c4e2669..39c900f30988f 100644 --- a/test/SIL/Serialization/deserialize_generic.sil +++ b/test/SIL/Serialization/deserialize_generic.sil @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -sil-serialize-all -o %t %S/Inputs/def_generic.swift -// RUN: %target-sil-opt -linker -I %t %s | FileCheck %s +// RUN: %target-sil-opt -linker -I %t %s | %FileCheck %s // Make sure that SILFunctionType with GenericSignature can match up with // SILFunctionType deserialized from module. diff --git a/test/SIL/Serialization/deserialize_generic_marker.sil b/test/SIL/Serialization/deserialize_generic_marker.sil index 84d02ada80ed5..1bcd2dab8639e 100644 --- a/test/SIL/Serialization/deserialize_generic_marker.sil +++ b/test/SIL/Serialization/deserialize_generic_marker.sil @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -sil-serialize-all -o %t %S/Inputs/def_generic_marker.swift -// RUN: %target-sil-opt -linker -I %t %s | FileCheck %s +// RUN: %target-sil-opt -linker -I %t %s | %FileCheck %s // Make sure that SILFunctionType with GenericSignature can match up with // SILFunctionType deserialized from module. diff --git a/test/SIL/Serialization/deserialize_objectivec.sil b/test/SIL/Serialization/deserialize_objectivec.sil index 0eb0b3faa86cf..113a2279a5715 100644 --- a/test/SIL/Serialization/deserialize_objectivec.sil +++ b/test/SIL/Serialization/deserialize_objectivec.sil @@ -1,6 +1,6 @@ // Make sure that we can deserialize Objective-C. // RUN: %target-sil-opt %platform-sdk-overlay-dir/ObjectiveC.swiftmodule > /dev/null -// RUN: llvm-bcanalyzer %platform-sdk-overlay-dir/ObjectiveC.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %platform-sdk-overlay-dir/ObjectiveC.swiftmodule | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SIL/Serialization/deserialize_stdlib.sil b/test/SIL/Serialization/deserialize_stdlib.sil index 80282cb9b9c6a..4176250e2efe4 100644 --- a/test/SIL/Serialization/deserialize_stdlib.sil +++ b/test/SIL/Serialization/deserialize_stdlib.sil @@ -1,5 +1,5 @@ // Make sure that we can deserialize the stdlib. // RUN: %target-sil-opt %platform-module-dir/Swift.swiftmodule > /dev/null -// RUN: llvm-bcanalyzer %platform-module-dir/Swift.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %platform-module-dir/Swift.swiftmodule | %FileCheck %s // CHECK-NOT: Unknown diff --git a/test/SIL/Serialization/effectsattr.sil b/test/SIL/Serialization/effectsattr.sil index 559048e76c4ac..e2a2d9e8548ef 100644 --- a/test/SIL/Serialization/effectsattr.sil +++ b/test/SIL/Serialization/effectsattr.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s -o - | FileCheck %s +// RUN: %target-sil-opt %s -o - | %FileCheck %s sil_stage canonical diff --git a/test/SIL/Serialization/function_param_convention.sil b/test/SIL/Serialization/function_param_convention.sil index 898ee3933a5f5..ab33f3c1a4fc5 100644 --- a/test/SIL/Serialization/function_param_convention.sil +++ b/test/SIL/Serialization/function_param_convention.sil @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: %target-swift-frontend -parse-sil -sil-inline-threshold 0 %S/Inputs/function_param_convention_input.sil -o %t/FunctionInput.swiftmodule -emit-module -parse-as-library -parse-stdlib -module-name FunctionInput -sil-serialize-all -O -// RUN: %target-sil-opt -I %t -linker %s -o - | FileCheck %s +// RUN: %target-sil-opt -I %t -linker %s -o - | %FileCheck %s import Swift import FunctionInput diff --git a/test/SIL/Serialization/init_existential_inst_deserializes_witness_tables.swift b/test/SIL/Serialization/init_existential_inst_deserializes_witness_tables.swift index f04a11d47c270..f65f4d668175b 100644 --- a/test/SIL/Serialization/init_existential_inst_deserializes_witness_tables.swift +++ b/test/SIL/Serialization/init_existential_inst_deserializes_witness_tables.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: %target-swift-frontend -sil-inline-threshold 0 %S/Inputs/init_existential_inst_deserializes_witness_tables_input.swift -o %t/Swift.swiftmodule -emit-module -parse-as-library -parse-stdlib -module-link-name swiftCore -module-name Swift -sil-serialize-all -O -// RUN: %target-swift-frontend -I %t -O %s -emit-sil -o - | FileCheck %s +// RUN: %target-swift-frontend -I %t -O %s -emit-sil -o - | %FileCheck %s // CHECK: sil_witness_table public_external [fragile] X: P module Swift { diff --git a/test/SIL/Serialization/metatype_casts.sil b/test/SIL/Serialization/metatype_casts.sil index da932c35b0aa9..8364ea5230504 100644 --- a/test/SIL/Serialization/metatype_casts.sil +++ b/test/SIL/Serialization/metatype_casts.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s -o - | FileCheck %s +// RUN: %target-sil-opt %s -o - | %FileCheck %s // Check that this file can be parsed at all. // SIL verifier should not crash on metatypes of metatypes. diff --git a/test/SIL/Serialization/perf_inline_without_inline_all.swift b/test/SIL/Serialization/perf_inline_without_inline_all.swift index dcc05d47065d7..7c3b9634dce1a 100644 --- a/test/SIL/Serialization/perf_inline_without_inline_all.swift +++ b/test/SIL/Serialization/perf_inline_without_inline_all.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t; mkdir -p %t // RUN: %target-swift-frontend -emit-module %S/Inputs/nontransparent.swift -O -sil-serialize-all -parse-stdlib -parse-as-library -emit-module -o %t/Swift.swiftmodule -module-name=Swift -module-link-name swiftCore -// RUN: %target-swift-frontend %s -O -I %t -emit-sil -o - | FileCheck %s +// RUN: %target-swift-frontend %s -O -I %t -emit-sil -o - | %FileCheck %s import Swift diff --git a/test/SIL/Serialization/public_external.sil b/test/SIL/Serialization/public_external.sil index 042fc87e4005a..a005c1168093c 100644 --- a/test/SIL/Serialization/public_external.sil +++ b/test/SIL/Serialization/public_external.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -parse-sil -emit-module -module-name Swift -module-link-name swiftCore -parse-stdlib -parse-as-library -sil-serialize-all -o - | %target-sil-opt -module-name Swift | FileCheck %s +// RUN: %target-swift-frontend %s -parse-sil -emit-module -module-name Swift -module-link-name swiftCore -parse-stdlib -parse-as-library -sil-serialize-all -o - | %target-sil-opt -module-name Swift | %FileCheck %s // CHECK-NOT: sil public_external @pe : $@convention(thin) () -> () { // CHECK-NOT: sil hidden_external @he : $@convention(thin) () -> () { diff --git a/test/SIL/Serialization/semanticsattr.sil b/test/SIL/Serialization/semanticsattr.sil index b56aa873e211b..468af7801a925 100644 --- a/test/SIL/Serialization/semanticsattr.sil +++ b/test/SIL/Serialization/semanticsattr.sil @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: %target-swift-frontend -parse-sil -emit-sib -parse-as-library -parse-stdlib -module-name SemanticsAttr -o %t/SemanticsAttr.sib %s -// RUN: %target-sil-opt %t/SemanticsAttr.sib -o - -sil-sort-output | FileCheck %s +// RUN: %target-sil-opt %t/SemanticsAttr.sib -o - -sil-sort-output | %FileCheck %s sil_stage canonical diff --git a/test/SIL/Serialization/shared_function_serialization.sil b/test/SIL/Serialization/shared_function_serialization.sil index ab7a8ae322f8c..9060cd25dfe21 100644 --- a/test/SIL/Serialization/shared_function_serialization.sil +++ b/test/SIL/Serialization/shared_function_serialization.sil @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: %target-swift-frontend %S/Inputs/shared_function_serialization_input.swift -o %t/Swift.swiftmodule -emit-module -parse-as-library -parse-stdlib -module-link-name swiftCore -module-name Swift -sil-serialize-all -O -// RUN: %target-sil-opt -enable-sil-verify-all -I %t -linker -inline %s -o - | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -I %t -linker -inline %s -o - | %FileCheck %s // CHECK: sil private @top_level_code // CHECK: sil public_external [fragile] @{{.*}}_TFVs1XCfT_S_ diff --git a/test/SIL/Serialization/specializer_can_deserialize.swift b/test/SIL/Serialization/specializer_can_deserialize.swift index 424b9c72d8139..57d81134d25a2 100644 --- a/test/SIL/Serialization/specializer_can_deserialize.swift +++ b/test/SIL/Serialization/specializer_can_deserialize.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: %target-swift-frontend -emit-module %S/Inputs/specializer_input.swift -O -sil-serialize-all -parse-stdlib -parse-as-library -emit-module -o %t/Swift.swiftmodule -module-name=Swift -module-link-name swiftCore -// RUN: %target-swift-frontend %s -O -I %t -emit-sil -o - | FileCheck %s +// RUN: %target-swift-frontend %s -O -I %t -emit-sil -o - | %FileCheck %s import Swift diff --git a/test/SIL/Serialization/visibility.sil b/test/SIL/Serialization/visibility.sil index 98e7239e3e4b6..10e40a9188eae 100644 --- a/test/SIL/Serialization/visibility.sil +++ b/test/SIL/Serialization/visibility.sil @@ -1,6 +1,6 @@ // RUN: %target-swift-frontend %s -parse-sil -sil-serialize-all -emit-module -o - -module-name Swift -module-link-name swiftCore -parse-as-library -parse-stdlib | %target-sil-opt -module-name Swift > %t.sil -// RUN: FileCheck %s < %t.sil -// RUN: FileCheck -check-prefix=NEG-CHECK %s < %t.sil +// RUN: %FileCheck %s < %t.sil +// RUN: %FileCheck -check-prefix=NEG-CHECK %s < %t.sil import Builtin diff --git a/test/SIL/Serialization/vtable_deserialization.swift b/test/SIL/Serialization/vtable_deserialization.swift index f98a7fa4c6eed..d2f892a51ba3c 100644 --- a/test/SIL/Serialization/vtable_deserialization.swift +++ b/test/SIL/Serialization/vtable_deserialization.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: %target-swift-frontend %S/Inputs/vtable_deserialization_input.swift -o %t/Swift.swiftmodule -emit-module -parse-as-library -parse-stdlib -module-link-name swiftCore -module-name Swift -sil-serialize-all -// RUN: %target-swift-frontend %s -emit-sil -O -I %t -o - | FileCheck %s +// RUN: %target-swift-frontend %s -emit-sil -O -I %t -o - | %FileCheck %s import Swift diff --git a/test/SIL/Serialization/witness_tables.sil b/test/SIL/Serialization/witness_tables.sil index deb5ea1b84d33..085b137b27d21 100644 --- a/test/SIL/Serialization/witness_tables.sil +++ b/test/SIL/Serialization/witness_tables.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -sil-serialize-all -module-name witness_tables -emit-module -o - %s | %target-sil-opt -module-name witness_tables | FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -sil-serialize-all -module-name witness_tables -emit-module -o - %s | %target-sil-opt -module-name witness_tables | %FileCheck %s protocol AssocReqt { func requiredMethod() diff --git a/test/SIL/clone_init_existential.sil b/test/SIL/clone_init_existential.sil index f87480e2be858..1cde454c8dcb3 100644 --- a/test/SIL/clone_init_existential.sil +++ b/test/SIL/clone_init_existential.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -inline %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -inline %s | %FileCheck %s // Check if cloning of init_existential_* works correctly with multiple // conformances. diff --git a/test/SIL/clone_select_switch_value.sil b/test/SIL/clone_select_switch_value.sil index 396353db7c728..6e2a27e350008 100644 --- a/test/SIL/clone_select_switch_value.sil +++ b/test/SIL/clone_select_switch_value.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -inline %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -inline %s | %FileCheck %s // Check if cloning of select_value and switch_value works correctly without // producing illegal SIL. diff --git a/test/SIL/cloning.sil b/test/SIL/cloning.sil index 2dfdb84c01e23..390532d4f0e99 100644 --- a/test/SIL/cloning.sil +++ b/test/SIL/cloning.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -inline %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -inline %s | %FileCheck %s // Check cloning of instructions. diff --git a/test/SIL/printer_include_decls.swift b/test/SIL/printer_include_decls.swift index d6c050d774f04..a131e2fbf47c8 100644 --- a/test/SIL/printer_include_decls.swift +++ b/test/SIL/printer_include_decls.swift @@ -1,7 +1,7 @@ // RUN: rm -f %t.* // RUN: %target-swift-frontend -emit-sil %s -o %t.sil -// RUN: FileCheck --input-file=%t.sil %s -// RUN: %target-swift-frontend -emit-silgen %t.sil -module-name=printer_include_decl | FileCheck %s +// RUN: %FileCheck --input-file=%t.sil %s +// RUN: %target-swift-frontend -emit-silgen %t.sil -module-name=printer_include_decl | %FileCheck %s var x: Int // CHECK: var x: Int diff --git a/test/SIL/unimplemented_initializer.swift b/test/SIL/unimplemented_initializer.swift index 8703be94f82f1..4db8be31876f5 100644 --- a/test/SIL/unimplemented_initializer.swift +++ b/test/SIL/unimplemented_initializer.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -sdk %S/../SILGen/Inputs -I %S/../SILGen/Inputs -enable-source-import -primary-file %s -emit-sil -emit-verbose-sil | FileCheck %s -check-prefix=CHECK-DEBUG -// RUN: %target-swift-frontend -sdk %S/../SILGen/Inputs -I %S/../SILGen/Inputs -enable-source-import -primary-file %s -emit-sil -emit-verbose-sil -O | FileCheck %s -check-prefix=CHECK-RELEASE +// RUN: %target-swift-frontend -sdk %S/../SILGen/Inputs -I %S/../SILGen/Inputs -enable-source-import -primary-file %s -emit-sil -emit-verbose-sil | %FileCheck %s -check-prefix=CHECK-DEBUG +// RUN: %target-swift-frontend -sdk %S/../SILGen/Inputs -I %S/../SILGen/Inputs -enable-source-import -primary-file %s -emit-sil -emit-verbose-sil -O | %FileCheck %s -check-prefix=CHECK-RELEASE // XFAIL: linux diff --git a/test/SIL/whole_module_optimization.swift b/test/SIL/whole_module_optimization.swift index 15f1951171127..a5c69cf23fe8d 100644 --- a/test/SIL/whole_module_optimization.swift +++ b/test/SIL/whole_module_optimization.swift @@ -1,13 +1,13 @@ // RUN: %target-swift-frontend -emit-sil -O %s %S/Inputs/whole_module_optimization_helper.swift -o %t.sil -module-name main -// RUN: FileCheck %s < %t.sil -// RUN: FileCheck %s -check-prefix=NEGATIVE < %t.sil +// RUN: %FileCheck %s < %t.sil +// RUN: %FileCheck %s -check-prefix=NEGATIVE < %t.sil // RUN: %target-swift-frontend -emit-sil -O -primary-file %s %S/Inputs/whole_module_optimization_helper.swift -o %t.unopt.sil -module-name main -// RUN: FileCheck %s -check-prefix=CHECK-SINGLE-FILE < %t.unopt.sil +// RUN: %FileCheck %s -check-prefix=CHECK-SINGLE-FILE < %t.unopt.sil // RUN: %target-swift-frontend -emit-sil -O -enable-testing %s %S/Inputs/whole_module_optimization_helper.swift -o %t.testing.sil -module-name main -// RUN: FileCheck %s < %t.testing.sil -// RUN: FileCheck %s -check-prefix=NEGATIVE-TESTABLE < %t.testing.sil +// RUN: %FileCheck %s < %t.testing.sil +// RUN: %FileCheck %s -check-prefix=NEGATIVE-TESTABLE < %t.testing.sil private func privateFn() -> Int32 { return 2 diff --git a/test/SILGen/NSApplicationMain.swift b/test/SILGen/NSApplicationMain.swift index 66272c026d67e..a60973c2087de 100644 --- a/test/SILGen/NSApplicationMain.swift +++ b/test/SILGen/NSApplicationMain.swift @@ -1,8 +1,8 @@ -// RUN: %target-swift-frontend -emit-silgen -parse-as-library -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | FileCheck %s -// RUN: %target-swift-frontend -emit-ir -parse-as-library -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | FileCheck %s -check-prefix=IR +// RUN: %target-swift-frontend -emit-silgen -parse-as-library -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-ir -parse-as-library -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s -check-prefix=IR -// RUN: %target-swift-frontend -emit-silgen -parse-as-library -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -D REFERENCE | FileCheck %s -// RUN: %target-swift-frontend -emit-ir -parse-as-library -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -D REFERENCE | FileCheck %s -check-prefix=IR +// RUN: %target-swift-frontend -emit-silgen -parse-as-library -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -D REFERENCE | %FileCheck %s +// RUN: %target-swift-frontend -emit-ir -parse-as-library -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -D REFERENCE | %FileCheck %s -check-prefix=IR // REQUIRES: OS=macosx diff --git a/test/SILGen/UIApplicationMain.swift b/test/SILGen/UIApplicationMain.swift index 4172b1c12bc11..c6e9e9748b7ef 100644 --- a/test/SILGen/UIApplicationMain.swift +++ b/test/SILGen/UIApplicationMain.swift @@ -1,20 +1,20 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-silgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen -parse-as-library %s | FileCheck %s -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-ir -parse-as-library %s | FileCheck %s -check-prefix=IR +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen -parse-as-library %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-ir -parse-as-library %s | %FileCheck %s -check-prefix=IR -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen -parse-as-library %s -D REFERENCE | FileCheck %s -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-ir -parse-as-library %s -D REFERENCE | FileCheck %s -check-prefix=IR +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen -parse-as-library %s -D REFERENCE | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-ir -parse-as-library %s -D REFERENCE | %FileCheck %s -check-prefix=IR -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen -parse-as-library -primary-file %s %S/Inputs/UIApplicationMain-helper.swift -module-name test | FileCheck %s -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-ir -parse-as-library -primary-file %s %S/Inputs/UIApplicationMain-helper.swift -module-name test | FileCheck %s -check-prefix=IR +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen -parse-as-library -primary-file %s %S/Inputs/UIApplicationMain-helper.swift -module-name test | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-ir -parse-as-library -primary-file %s %S/Inputs/UIApplicationMain-helper.swift -module-name test | %FileCheck %s -check-prefix=IR -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen -parse-as-library %s %S/Inputs/UIApplicationMain-helper.swift -module-name test | FileCheck %s -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-ir -parse-as-library %s %S/Inputs/UIApplicationMain-helper.swift -module-name test | FileCheck %s -check-prefix=IR +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen -parse-as-library %s %S/Inputs/UIApplicationMain-helper.swift -module-name test | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-ir -parse-as-library %s %S/Inputs/UIApplicationMain-helper.swift -module-name test | %FileCheck %s -check-prefix=IR -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen -parse-as-library %S/Inputs/UIApplicationMain-helper.swift %s -module-name test | FileCheck %s -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-ir -parse-as-library %S/Inputs/UIApplicationMain-helper.swift %s -module-name test | FileCheck %s -check-prefix=IR +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen -parse-as-library %S/Inputs/UIApplicationMain-helper.swift %s -module-name test | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-ir -parse-as-library %S/Inputs/UIApplicationMain-helper.swift %s -module-name test | %FileCheck %s -check-prefix=IR // REQUIRES: OS=ios // REQUIRES: objc_interop diff --git a/test/SILGen/accessibility_vtables.swift b/test/SILGen/accessibility_vtables.swift index 868bb2803aeb3..989e3a4308759 100644 --- a/test/SILGen/accessibility_vtables.swift +++ b/test/SILGen/accessibility_vtables.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-module -o %t %S/Inputs/accessibility_vtables_helper.swift -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen -primary-file %s %S/Inputs/accessibility_vtables_other.swift -I %t -module-name accessibility_vtables | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen -primary-file %s %S/Inputs/accessibility_vtables_other.swift -I %t -module-name accessibility_vtables | %FileCheck %s import accessibility_vtables_helper diff --git a/test/SILGen/accessibility_warnings.swift b/test/SILGen/accessibility_warnings.swift index 5b6b54e61ca35..5a88ef6a28251 100644 --- a/test/SILGen/accessibility_warnings.swift +++ b/test/SILGen/accessibility_warnings.swift @@ -1,5 +1,5 @@ // RUN: %target-parse-verify-swift -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // This file tests that the AST produced after fixing accessibility warnings // is valid according to SILGen and the verifiers. diff --git a/test/SILGen/accessors.swift b/test/SILGen/accessors.swift index 6556ec4c3dbfb..f447f256fc426 100644 --- a/test/SILGen/accessors.swift +++ b/test/SILGen/accessors.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s // Hold a reference to do to magically become non-POD. class Reference {} diff --git a/test/SILGen/address_only_types.swift b/test/SILGen/address_only_types.swift index 615e888dac190..a8fddd65f9eef 100644 --- a/test/SILGen/address_only_types.swift +++ b/test/SILGen/address_only_types.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -parse-stdlib -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -parse-stdlib -emit-silgen %s | %FileCheck %s precedencegroup AssignmentPrecedence { assignment: true } diff --git a/test/SILGen/addressors.swift b/test/SILGen/addressors.swift index 6159d91ead977..32099761b0e54 100644 --- a/test/SILGen/addressors.swift +++ b/test/SILGen/addressors.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -parse-stdlib -emit-sil %s | FileCheck %s -// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | FileCheck %s -check-prefix=SILGEN +// RUN: %target-swift-frontend -parse-stdlib -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | %FileCheck %s -check-prefix=SILGEN import Swift diff --git a/test/SILGen/apply_abstraction_nested.swift b/test/SILGen/apply_abstraction_nested.swift index a8ba96ea2c616..2da4743aa82f9 100644 --- a/test/SILGen/apply_abstraction_nested.swift +++ b/test/SILGen/apply_abstraction_nested.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s infix operator ~> { precedence 255 associativity left } diff --git a/test/SILGen/argument_labels.swift b/test/SILGen/argument_labels.swift index 03d20c105ac84..c188044db96bd 100644 --- a/test/SILGen/argument_labels.swift +++ b/test/SILGen/argument_labels.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -suppress-argument-labels-in-types %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -suppress-argument-labels-in-types %s | %FileCheck %s public struct X { } public struct Y { } diff --git a/test/SILGen/arguments.swift b/test/SILGen/arguments.swift index 18c5bd7ba91e7..c3efdbb554d43 100644 --- a/test/SILGen/arguments.swift +++ b/test/SILGen/arguments.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -module-name Swift -parse-stdlib -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -module-name Swift -parse-stdlib -emit-silgen %s | %FileCheck %s struct Int {} struct Float {} diff --git a/test/SILGen/array_literal_abstraction.swift b/test/SILGen/array_literal_abstraction.swift index 3f368a8ad8a15..2fa30231131da 100644 --- a/test/SILGen/array_literal_abstraction.swift +++ b/test/SILGen/array_literal_abstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // Verify that reabstraction happens when forming container literals. // diff --git a/test/SILGen/assignment.swift b/test/SILGen/assignment.swift index 4f0ae8bc4e614..cd024c6a71733 100644 --- a/test/SILGen/assignment.swift +++ b/test/SILGen/assignment.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class C {} diff --git a/test/SILGen/auto_closures.swift b/test/SILGen/auto_closures.swift index 9c2c4672156e4..684932e71c39b 100644 --- a/test/SILGen/auto_closures.swift +++ b/test/SILGen/auto_closures.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | %FileCheck %s struct Bool {} var false_ = Bool() diff --git a/test/SILGen/auto_generated_super_init_call.swift b/test/SILGen/auto_generated_super_init_call.swift index 5f7dad3b1491d..556af656497db 100644 --- a/test/SILGen/auto_generated_super_init_call.swift +++ b/test/SILGen/auto_generated_super_init_call.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // Test that we emit a call to super.init at the end of the initializer, when none has been previously added. diff --git a/test/SILGen/availability_query.swift b/test/SILGen/availability_query.swift index 230af9fd6e8d5..e1644519fcd7b 100644 --- a/test/SILGen/availability_query.swift +++ b/test/SILGen/availability_query.swift @@ -1,5 +1,5 @@ // RUN: %target-swift-frontend -emit-sil %s -target x86_64-apple-macosx10.50 -verify -// RUN: %target-swift-frontend -emit-silgen %s -target x86_64-apple-macosx10.50 | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s -target x86_64-apple-macosx10.50 | %FileCheck %s // REQUIRES: OS=macosx diff --git a/test/SILGen/boxed_existentials.swift b/test/SILGen/boxed_existentials.swift index 95b24dabd83a8..742b9108201d7 100644 --- a/test/SILGen/boxed_existentials.swift +++ b/test/SILGen/boxed_existentials.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | FileCheck %s -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | FileCheck %s --check-prefix=GUARANTEED +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s --check-prefix=GUARANTEED func test_type_lowering(_ x: Error) { } // CHECK-LABEL: sil hidden @_TF18boxed_existentials18test_type_loweringFPs5Error_T_ : $@convention(thin) (@owned Error) -> () { diff --git a/test/SILGen/builtins.swift b/test/SILGen/builtins.swift index c18eb17b3202a..960f34b7da47a 100644 --- a/test/SILGen/builtins.swift +++ b/test/SILGen/builtins.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -emit-silgen -parse-stdlib %s -disable-objc-attr-requires-foundation-module | FileCheck %s -// RUN: %target-swift-frontend -emit-sil -Onone -parse-stdlib %s -disable-objc-attr-requires-foundation-module | FileCheck -check-prefix=CANONICAL %s +// RUN: %target-swift-frontend -emit-silgen -parse-stdlib %s -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -Onone -parse-stdlib %s -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CANONICAL %s import Swift diff --git a/test/SILGen/c_function_pointers.swift b/test/SILGen/c_function_pointers.swift index 35b12fa473995..83c8d08cd61c9 100644 --- a/test/SILGen/c_function_pointers.swift +++ b/test/SILGen/c_function_pointers.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -verify %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -verify %s | %FileCheck %s func values(_ arg: @escaping @convention(c) (Int) -> Int) -> @convention(c) (Int) -> Int { return arg diff --git a/test/SILGen/c_materializeForSet_linkage.swift b/test/SILGen/c_materializeForSet_linkage.swift index 3b6298698f526..605273e5bb18d 100644 --- a/test/SILGen/c_materializeForSet_linkage.swift +++ b/test/SILGen/c_materializeForSet_linkage.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/call_chain_reabstraction.swift b/test/SILGen/call_chain_reabstraction.swift index 8616535f55c0e..a75dadd3dcf19 100644 --- a/test/SILGen/call_chain_reabstraction.swift +++ b/test/SILGen/call_chain_reabstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s struct A { func g(_ recur: (A, U) -> U) -> (A, U) -> U { diff --git a/test/SILGen/capture_inout.swift b/test/SILGen/capture_inout.swift index e42e1ebc565ad..0e07e9a1a1d5d 100644 --- a/test/SILGen/capture_inout.swift +++ b/test/SILGen/capture_inout.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | %FileCheck %s typealias Int = Builtin.Int64 diff --git a/test/SILGen/capture_typealias.swift b/test/SILGen/capture_typealias.swift index 51409cf0b8407..61afe668e5024 100644 --- a/test/SILGen/capture_typealias.swift +++ b/test/SILGen/capture_typealias.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | %FileCheck %s typealias Int = Builtin.Int64 diff --git a/test/SILGen/capture_typed_boxes.swift b/test/SILGen/capture_typed_boxes.swift index 519fe51927554..ea16f88981294 100644 --- a/test/SILGen/capture_typed_boxes.swift +++ b/test/SILGen/capture_typed_boxes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func foo(_ x: Int) -> () -> Int { var x = x diff --git a/test/SILGen/casts.swift b/test/SILGen/casts.swift index e30fd55d1bea6..d0a4a6ca89ac2 100644 --- a/test/SILGen/casts.swift +++ b/test/SILGen/casts.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class B { } class D : B { } diff --git a/test/SILGen/cdecl.swift b/test/SILGen/cdecl.swift index 869a9ef14deb1..db01cbcab8ff1 100644 --- a/test/SILGen/cdecl.swift +++ b/test/SILGen/cdecl.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil hidden [thunk] @pear : $@convention(c) // CHECK: function_ref @_TF5cdecl5apple diff --git a/test/SILGen/cf.swift b/test/SILGen/cf.swift index 7d6b1cfc4de28..ca0e846ab145b 100644 --- a/test/SILGen/cf.swift +++ b/test/SILGen/cf.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -import-cf-types -sdk %S/Inputs %s -emit-silgen -o - | FileCheck %s +// RUN: %target-swift-frontend -import-cf-types -sdk %S/Inputs %s -emit-silgen -o - | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/cf_members.swift b/test/SILGen/cf_members.swift index bfeea910851bb..aacc11b67061b 100644 --- a/test/SILGen/cf_members.swift +++ b/test/SILGen/cf_members.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -I %S/../IDE/Inputs/custom-modules %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -I %S/../IDE/Inputs/custom-modules %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/class_bound_protocols.swift b/test/SILGen/class_bound_protocols.swift index 0c4fcbc13868d..80390c3e590bd 100644 --- a/test/SILGen/class_bound_protocols.swift +++ b/test/SILGen/class_bound_protocols.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-stdlib -parse-as-library -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -parse-as-library -emit-silgen %s | %FileCheck %s // -- Class-bound archetypes and existentials are *not* address-only and can // be manipulated using normal reference type value semantics. diff --git a/test/SILGen/class_resilience.swift b/test/SILGen/class_resilience.swift index 8eb4bb6bc3787..0c471a02b424d 100644 --- a/test/SILGen/class_resilience.swift +++ b/test/SILGen/class_resilience.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-silgen -enable-resilience %s | FileCheck %s +// RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-silgen -enable-resilience %s | %FileCheck %s import resilient_class diff --git a/test/SILGen/closure_inline_initializer.swift b/test/SILGen/closure_inline_initializer.swift index 23cc01df59860..698048f46d0fb 100644 --- a/test/SILGen/closure_inline_initializer.swift +++ b/test/SILGen/closure_inline_initializer.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil shared @_TFIvV26closure_inline_initializer3Foo3fooSiiU_FT_Si diff --git a/test/SILGen/closure_script_global_escape.swift b/test/SILGen/closure_script_global_escape.swift index 41cea01538626..941c538705fbc 100644 --- a/test/SILGen/closure_script_global_escape.swift +++ b/test/SILGen/closure_script_global_escape.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -module-name foo -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -module-name foo -emit-silgen %s | %FileCheck %s // RUN: %target-swift-frontend -module-name foo -emit-sil -verify %s // CHECK-LABEL: sil @main diff --git a/test/SILGen/closures.swift b/test/SILGen/closures.swift index e25749c7128f8..7480be5c40cf1 100644 --- a/test/SILGen/closures.swift +++ b/test/SILGen/closures.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-stdlib -parse-as-library -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -parse-as-library -emit-silgen %s | %FileCheck %s import Swift diff --git a/test/SILGen/collection_cast_crash.swift b/test/SILGen/collection_cast_crash.swift index a4b4869c00077..c6adab45ef3b3 100644 --- a/test/SILGen/collection_cast_crash.swift +++ b/test/SILGen/collection_cast_crash.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -primary-file %s -emit-sil -o - | FileCheck %s +// RUN: %target-swift-frontend -O -primary-file %s -emit-sil -o - | %FileCheck %s // check if the compiler does not crash if a function is specialized // which contains a collection cast diff --git a/test/SILGen/collection_downcast.swift b/test/SILGen/collection_downcast.swift index 78ddcf576a75c..89ad6279be58e 100644 --- a/test/SILGen/collection_downcast.swift +++ b/test/SILGen/collection_downcast.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/collection_subtype_downcast.swift b/test/SILGen/collection_subtype_downcast.swift index 4f8695f61235b..d96153c3855a1 100644 --- a/test/SILGen/collection_subtype_downcast.swift +++ b/test/SILGen/collection_subtype_downcast.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -enable-experimental-collection-casts -emit-silgen -sdk %S/Inputs %s | FileCheck %s +// RUN: %target-swift-frontend -enable-experimental-collection-casts -emit-silgen -sdk %S/Inputs %s | %FileCheck %s struct S { var x, y: Int } diff --git a/test/SILGen/collection_subtype_upcast.swift b/test/SILGen/collection_subtype_upcast.swift index e0253467245c6..a2d6021c06980 100644 --- a/test/SILGen/collection_subtype_upcast.swift +++ b/test/SILGen/collection_subtype_upcast.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -enable-experimental-collection-casts -emit-silgen -sdk %S/Inputs %s | FileCheck %s +// RUN: %target-swift-frontend -enable-experimental-collection-casts -emit-silgen -sdk %S/Inputs %s | %FileCheck %s struct S { var x, y: Int } diff --git a/test/SILGen/collection_upcast.swift b/test/SILGen/collection_upcast.swift index 1d2c52b2c3619..c26504006e0f9 100644 --- a/test/SILGen/collection_upcast.swift +++ b/test/SILGen/collection_upcast.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // FIXME: rdar://problem/19648117 Needs splitting objc parts out // XFAIL: linux diff --git a/test/SILGen/complete_object_init.swift b/test/SILGen/complete_object_init.swift index 7f31fcf182fef..02687ef8e3bbf 100644 --- a/test/SILGen/complete_object_init.swift +++ b/test/SILGen/complete_object_init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen | %FileCheck %s struct X { } diff --git a/test/SILGen/conditionally_unreachable.swift b/test/SILGen/conditionally_unreachable.swift index 7c7e5fa5091e7..5c60d1467dd78 100644 --- a/test/SILGen/conditionally_unreachable.swift +++ b/test/SILGen/conditionally_unreachable.swift @@ -1,8 +1,8 @@ -// RUN: %target-swift-frontend -emit-silgen -parse-stdlib -primary-file %s | FileCheck %s -check-prefix=RAW -// RUN: %target-swift-frontend -emit-sil -assert-config Debug -parse-stdlib -primary-file %s | FileCheck -check-prefix=DEBUG %s -// RUN: %target-swift-frontend -emit-sil -O -assert-config Debug -parse-stdlib -primary-file %s | FileCheck -check-prefix=DEBUG %s -// RUN: %target-swift-frontend -emit-sil -assert-config Release -parse-stdlib -primary-file %s | FileCheck -check-prefix=RELEASE %s -// RUN: %target-swift-frontend -emit-sil -O -assert-config Release -parse-stdlib -primary-file %s | FileCheck -check-prefix=RELEASE %s +// RUN: %target-swift-frontend -emit-silgen -parse-stdlib -primary-file %s | %FileCheck %s -check-prefix=RAW +// RUN: %target-swift-frontend -emit-sil -assert-config Debug -parse-stdlib -primary-file %s | %FileCheck -check-prefix=DEBUG %s +// RUN: %target-swift-frontend -emit-sil -O -assert-config Debug -parse-stdlib -primary-file %s | %FileCheck -check-prefix=DEBUG %s +// RUN: %target-swift-frontend -emit-sil -assert-config Release -parse-stdlib -primary-file %s | %FileCheck -check-prefix=RELEASE %s +// RUN: %target-swift-frontend -emit-sil -O -assert-config Release -parse-stdlib -primary-file %s | %FileCheck -check-prefix=RELEASE %s import Swift diff --git a/test/SILGen/copy_lvalue_peepholes.swift b/test/SILGen/copy_lvalue_peepholes.swift index c747623118518..57c89c6c72a33 100644 --- a/test/SILGen/copy_lvalue_peepholes.swift +++ b/test/SILGen/copy_lvalue_peepholes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-stdlib -parse-as-library -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -parse-as-library -emit-silgen %s | %FileCheck %s precedencegroup AssignmentPrecedence { assignment: true } diff --git a/test/SILGen/coverage_class.swift b/test/SILGen/coverage_class.swift index 5de4aaad7dcf3..d27df0a2f9ade 100644 --- a/test/SILGen/coverage_class.swift +++ b/test/SILGen/coverage_class.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sil -module-name coverage_class %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sil -module-name coverage_class %s | %FileCheck %s class C { // CHECK-LABEL: sil_coverage_map {{.*}}// coverage_class.C.foo diff --git a/test/SILGen/coverage_closures.swift b/test/SILGen/coverage_closures.swift index 6b6c0b2e028ea..725758ce040f4 100644 --- a/test/SILGen/coverage_closures.swift +++ b/test/SILGen/coverage_closures.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_closures %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_closures %s | %FileCheck %s // CHECK-LABEL: sil_coverage_map {{.*}}// coverage_closures.bar func bar(arr: [(Int32) -> Int32]) { diff --git a/test/SILGen/coverage_default_args.swift b/test/SILGen/coverage_default_args.swift index 84a3aaaeabc0b..71c203039cf95 100644 --- a/test/SILGen/coverage_default_args.swift +++ b/test/SILGen/coverage_default_args.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_default_args %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_default_args %s | %FileCheck %s // CHECK-LABEL: sil_coverage_map {{.*}}// coverage_default_args.closureInArgs // CHECK: [[@LINE+2]]:41 -> [[@LINE+2]]:57 : 1 diff --git a/test/SILGen/coverage_exceptions.swift b/test/SILGen/coverage_exceptions.swift index 4b09da3360816..e368def87c8cf 100644 --- a/test/SILGen/coverage_exceptions.swift +++ b/test/SILGen/coverage_exceptions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_catch %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_catch %s | %FileCheck %s enum SomeErr : Error { case Err1 diff --git a/test/SILGen/coverage_guard.swift b/test/SILGen/coverage_guard.swift index 248e10cde1c19..020d971052710 100644 --- a/test/SILGen/coverage_guard.swift +++ b/test/SILGen/coverage_guard.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_guard %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_guard %s | %FileCheck %s // CHECK-LABEL: sil_coverage_map {{.*}}// coverage_guard.foo func foo(_ x : Int32) { // CHECK: [[@LINE]]:23 -> [[END:[0-9]+:2]] : 0 diff --git a/test/SILGen/coverage_if.swift b/test/SILGen/coverage_if.swift index 0abfee58845eb..6e1419e8a130b 100644 --- a/test/SILGen/coverage_if.swift +++ b/test/SILGen/coverage_if.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_if %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_if %s | %FileCheck %s // CHECK-LABEL: sil_coverage_map {{.*}}// coverage_if.foo func foo(x : Bool) { // CHECK: [[@LINE]]:20 -> {{[0-9]+}}:2 : 0 diff --git a/test/SILGen/coverage_label.swift b/test/SILGen/coverage_label.swift index 864981c29fb21..986514289c371 100644 --- a/test/SILGen/coverage_label.swift +++ b/test/SILGen/coverage_label.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -suppress-warnings -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_label %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -suppress-warnings -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_label %s | %FileCheck %s // CHECK-LABEL: sil_coverage_map {{.*}}// coverage_label.foo func foo() { // CHECK-DAG: [[@LINE]]:12 -> [[@LINE+19]]:2 : 0 diff --git a/test/SILGen/coverage_member_closure.swift b/test/SILGen/coverage_member_closure.swift index e7b79c272ae59..937ac80e45fdc 100644 --- a/test/SILGen/coverage_member_closure.swift +++ b/test/SILGen/coverage_member_closure.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sil -module-name coverage_member_closure %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sil -module-name coverage_member_closure %s | %FileCheck %s class C { // CHECK-LABEL: sil_coverage_map {{.*}}// coverage_member_closure.C.__allocating_init diff --git a/test/SILGen/coverage_smoke.swift b/test/SILGen/coverage_smoke.swift index 72bc74e7d33d8..8d816c4ff91a2 100644 --- a/test/SILGen/coverage_smoke.swift +++ b/test/SILGen/coverage_smoke.swift @@ -2,11 +2,11 @@ // RUN: %target-build-swift %s -profile-generate -profile-coverage-mapping -Xfrontend -disable-incremental-llvm-codegen -o %t/main // RUN: env LLVM_PROFILE_FILE=%t/default.profraw %target-run %t/main // RUN: %llvm-profdata merge %t/default.profraw -o %t/default.profdata -// RUN: %llvm-profdata show %t/default.profdata -function=f_internal | FileCheck %s --check-prefix=CHECK-INTERNAL -// RUN: %llvm-profdata show %t/default.profdata -function=f_private | FileCheck %s --check-prefix=CHECK-PRIVATE -// RUN: %llvm-profdata show %t/default.profdata -function=f_public | FileCheck %s --check-prefix=CHECK-PUBLIC -// RUN: %llvm-profdata show %t/default.profdata -function=main | FileCheck %s --check-prefix=CHECK-MAIN -// RUN: %llvm-cov show %t/main -instr-profile=%t/default.profdata | FileCheck %s --check-prefix=CHECK-COV +// RUN: %llvm-profdata show %t/default.profdata -function=f_internal | %FileCheck %s --check-prefix=CHECK-INTERNAL +// RUN: %llvm-profdata show %t/default.profdata -function=f_private | %FileCheck %s --check-prefix=CHECK-PRIVATE +// RUN: %llvm-profdata show %t/default.profdata -function=f_public | %FileCheck %s --check-prefix=CHECK-PUBLIC +// RUN: %llvm-profdata show %t/default.profdata -function=main | %FileCheck %s --check-prefix=CHECK-MAIN +// RUN: %llvm-cov show %t/main -instr-profile=%t/default.profdata | %FileCheck %s --check-prefix=CHECK-COV // RUN: rm -rf %t // REQUIRES: profile_runtime diff --git a/test/SILGen/coverage_switch.swift b/test/SILGen/coverage_switch.swift index c724f37a93ad8..953c472edb488 100644 --- a/test/SILGen/coverage_switch.swift +++ b/test/SILGen/coverage_switch.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_switch %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_switch %s | %FileCheck %s // CHECK-LABEL: sil_coverage_map {{.*}}// coverage_switch.f1 func f1(_ x : Int32) { diff --git a/test/SILGen/coverage_ternary.swift b/test/SILGen/coverage_ternary.swift index 04d0d4b193b6b..e5926eb98eacb 100644 --- a/test/SILGen/coverage_ternary.swift +++ b/test/SILGen/coverage_ternary.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_ternary %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_ternary %s | %FileCheck %s // CHECK-LABEL: sil_coverage_map {{.*}}// coverage_ternary.foo func foo(_ x : Int32) -> Int32 { diff --git a/test/SILGen/coverage_while.swift b/test/SILGen/coverage_while.swift index 79fe332266fd2..7e7535e5e2915 100644 --- a/test/SILGen/coverage_while.swift +++ b/test/SILGen/coverage_while.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -suppress-warnings -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_while %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -suppress-warnings -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_while %s | %FileCheck %s // CHECK-LABEL: // coverage_while.eoo () -> () func eoo() { diff --git a/test/SILGen/decls.swift b/test/SILGen/decls.swift index 1a86947f44d53..df4bdb67ca568 100644 --- a/test/SILGen/decls.swift +++ b/test/SILGen/decls.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -parse-as-library -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -parse-as-library -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil hidden @_TF5decls11void_returnFT_T_ // CHECK: = tuple diff --git a/test/SILGen/default_arguments.swift b/test/SILGen/default_arguments.swift index d7d05de6f7045..480cb8126cf4a 100644 --- a/test/SILGen/default_arguments.swift +++ b/test/SILGen/default_arguments.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s // __FUNCTION__ used as top-level parameter produces the module name. // CHECK-LABEL: sil @main diff --git a/test/SILGen/default_arguments_generic.swift b/test/SILGen/default_arguments_generic.swift index c37fec4d634b7..d2d9c48fdccff 100644 --- a/test/SILGen/default_arguments_generic.swift +++ b/test/SILGen/default_arguments_generic.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func foo(x x: T = 0) { } diff --git a/test/SILGen/default_arguments_imported.swift b/test/SILGen/default_arguments_imported.swift index 08dd09ce24ad6..b63a22ef0fe3f 100644 --- a/test/SILGen/default_arguments_imported.swift +++ b/test/SILGen/default_arguments_imported.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s // Test SIL generation for imported default arguments. diff --git a/test/SILGen/default_constructor.swift b/test/SILGen/default_constructor.swift index 3fb88dcb8a588..841069a0d1d9f 100644 --- a/test/SILGen/default_constructor.swift +++ b/test/SILGen/default_constructor.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen -primary-file %s | %FileCheck %s struct B { var i : Int, j : Float diff --git a/test/SILGen/deinit_in_vtable.swift b/test/SILGen/deinit_in_vtable.swift index 80ee7657373f1..0ef4a3d1ddef5 100644 --- a/test/SILGen/deinit_in_vtable.swift +++ b/test/SILGen/deinit_in_vtable.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -O -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -O -emit-sil %s | %FileCheck %s // The second run tests is it can be compiled without crashes. // RUN: %target-swift-frontend -Xllvm -sil-full-demangle -O -S %s diff --git a/test/SILGen/dependent_member_lowering.swift b/test/SILGen/dependent_member_lowering.swift index 1db01377b3c08..586d6868d8812 100644 --- a/test/SILGen/dependent_member_lowering.swift +++ b/test/SILGen/dependent_member_lowering.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol P { associatedtype A diff --git a/test/SILGen/downcast_reabstraction.swift b/test/SILGen/downcast_reabstraction.swift index 9cb29aeecd5de..3b985a033e172 100644 --- a/test/SILGen/downcast_reabstraction.swift +++ b/test/SILGen/downcast_reabstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil hidden @_TF22downcast_reabstraction19condFunctionFromAnyFP_T_ // CHECK: checked_cast_addr_br take_always Any in [[IN:%.*]] : $*Any to () -> () in [[OUT:%.*]] : $*@callee_owned (@in ()) -> @out (), [[YES:bb[0-9]+]], [[NO:bb[0-9]+]] diff --git a/test/SILGen/dso_handle.swift b/test/SILGen/dso_handle.swift index f8cdd0b0f55e2..1d3657c297f3b 100644 --- a/test/SILGen/dso_handle.swift +++ b/test/SILGen/dso_handle.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s // CHECK: sil_global hidden_external [[DSO:@__dso_handle]] : $Builtin.RawPointer diff --git a/test/SILGen/dynamic.swift b/test/SILGen/dynamic.swift index 3225f5c99fb6e..e86475ec3dbd3 100644 --- a/test/SILGen/dynamic.swift +++ b/test/SILGen/dynamic.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-silgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -sil-full-demangle -primary-file %s %S/Inputs/dynamic_other.swift -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -sil-full-demangle -primary-file %s %S/Inputs/dynamic_other.swift -emit-silgen | %FileCheck %s // RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -sil-full-demangle -primary-file %s %S/Inputs/dynamic_other.swift -emit-sil -verify // REQUIRES: objc_interop diff --git a/test/SILGen/dynamic_init.swift b/test/SILGen/dynamic_init.swift index 671372b4e48f6..495656cd4cfeb 100644 --- a/test/SILGen/dynamic_init.swift +++ b/test/SILGen/dynamic_init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class C { required init() { } diff --git a/test/SILGen/dynamic_lookup.swift b/test/SILGen/dynamic_lookup.swift index 3126ea4e6e964..d38ea6d58a75c 100644 --- a/test/SILGen/dynamic_lookup.swift +++ b/test/SILGen/dynamic_lookup.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -emit-silgen -disable-objc-attr-requires-foundation-module %s | FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen -disable-objc-attr-requires-foundation-module %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/dynamic_self.swift b/test/SILGen/dynamic_self.swift index 310c930f4be9b..058aa150f06f3 100644 --- a/test/SILGen/dynamic_self.swift +++ b/test/SILGen/dynamic_self.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s -disable-objc-attr-requires-foundation-module | %FileCheck %s protocol P { func f() -> Self diff --git a/test/SILGen/dynamic_self_reference_storage.swift b/test/SILGen/dynamic_self_reference_storage.swift index 44d129c9c2392..dcf4895cf4178 100644 --- a/test/SILGen/dynamic_self_reference_storage.swift +++ b/test/SILGen/dynamic_self_reference_storage.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class Foo { // CHECK-LABEL: sil hidden @_TFC30dynamic_self_reference_storage3Foo11dynamicSelf diff --git a/test/SILGen/effectsattr.swift b/test/SILGen/effectsattr.swift index c405f7298e1cf..e7d2839228d0a 100644 --- a/test/SILGen/effectsattr.swift +++ b/test/SILGen/effectsattr.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | %FileCheck %s //CHECK: [readonly] @func1 diff --git a/test/SILGen/enum.swift b/test/SILGen/enum.swift index baa562f15c686..b702534490bac 100644 --- a/test/SILGen/enum.swift +++ b/test/SILGen/enum.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-stdlib -parse-as-library -emit-silgen -module-name Swift %s | FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -parse-as-library -emit-silgen -module-name Swift %s | %FileCheck %s precedencegroup AssignmentPrecedence { assignment: true } diff --git a/test/SILGen/enum_generic_raw_value.swift b/test/SILGen/enum_generic_raw_value.swift index be7395f937e31..00d48ffb0f573 100644 --- a/test/SILGen/enum_generic_raw_value.swift +++ b/test/SILGen/enum_generic_raw_value.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil hidden @_TFO22enum_generic_raw_value1EC enum E: Int { diff --git a/test/SILGen/enum_resilience.swift b/test/SILGen/enum_resilience.swift index 6e070a57c7b46..9268b0f9b50d4 100644 --- a/test/SILGen/enum_resilience.swift +++ b/test/SILGen/enum_resilience.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-silgen -enable-resilience %s | FileCheck %s +// RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-silgen -enable-resilience %s | %FileCheck %s import resilient_enum diff --git a/test/SILGen/erasure_reabstraction.swift b/test/SILGen/erasure_reabstraction.swift index 9a16652305125..169bea1d1d85d 100644 --- a/test/SILGen/erasure_reabstraction.swift +++ b/test/SILGen/erasure_reabstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s struct Foo {} class Bar {} diff --git a/test/SILGen/errors.swift b/test/SILGen/errors.swift index 23e08154e5e6c..7951a75fb8d3e 100644 --- a/test/SILGen/errors.swift +++ b/test/SILGen/errors.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-stdlib -emit-silgen -verify -primary-file %s %S/Inputs/errors_other.swift | FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen -verify -primary-file %s %S/Inputs/errors_other.swift | %FileCheck %s import Swift diff --git a/test/SILGen/existential_erasure.swift b/test/SILGen/existential_erasure.swift index d7cdd1618ebdd..6440d7d18f94a 100644 --- a/test/SILGen/existential_erasure.swift +++ b/test/SILGen/existential_erasure.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol P { func downgrade(_ m68k: Bool) -> Self diff --git a/test/SILGen/existential_metatypes.swift b/test/SILGen/existential_metatypes.swift index 30b4479a8590a..31531197cad25 100644 --- a/test/SILGen/existential_metatypes.swift +++ b/test/SILGen/existential_metatypes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -parse-stdlib %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -parse-stdlib %s | %FileCheck %s protocol P { init() diff --git a/test/SILGen/expressions.swift b/test/SILGen/expressions.swift index 6c9934d3d0b17..e88c1c6161f81 100644 --- a/test/SILGen/expressions.swift +++ b/test/SILGen/expressions.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: echo "public var x = Int()" | %target-swift-frontend -module-name FooBar -emit-module -o %t - -// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s -I%t -disable-access-control | FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s -I%t -disable-access-control | %FileCheck %s import Swift import FooBar diff --git a/test/SILGen/extensions.swift b/test/SILGen/extensions.swift index 2b98564c4486a..769b3a3987ee7 100644 --- a/test/SILGen/extensions.swift +++ b/test/SILGen/extensions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class Foo { // CHECK-LABEL: sil hidden @_TFC10extensions3Foo3zim diff --git a/test/SILGen/extensions_objc.swift b/test/SILGen/extensions_objc.swift index 3cad0fd7594f4..7ddc7ace82d5e 100644 --- a/test/SILGen/extensions_objc.swift +++ b/test/SILGen/extensions_objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen | %FileCheck %s // // REQUIRES: objc_interop diff --git a/test/SILGen/external_definitions.swift b/test/SILGen/external_definitions.swift index 1cb53da4fb64b..a40420f0c5641 100644 --- a/test/SILGen/external_definitions.swift +++ b/test/SILGen/external_definitions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs %s -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/final.swift b/test/SILGen/final.swift index a32fa5cc81606..c24fe19c0b7a8 100644 --- a/test/SILGen/final.swift +++ b/test/SILGen/final.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class TestClass { diff --git a/test/SILGen/force_cast_chained_optional.swift b/test/SILGen/force_cast_chained_optional.swift index 50eb7b4036a03..7097d062e3ebc 100644 --- a/test/SILGen/force_cast_chained_optional.swift +++ b/test/SILGen/force_cast_chained_optional.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class Foo { var bar: Bar! diff --git a/test/SILGen/foreach.swift b/test/SILGen/foreach.swift index 05428e0dee6ca..4941828a31d1a 100644 --- a/test/SILGen/foreach.swift +++ b/test/SILGen/foreach.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class C {} diff --git a/test/SILGen/foreign_errors.swift b/test/SILGen/foreign_errors.swift index 9c89793ea050d..0149d2b39de09 100644 --- a/test/SILGen/foreign_errors.swift +++ b/test/SILGen/foreign_errors.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-silgen -parse-as-library %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-silgen -parse-as-library %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/fragile_globals.swift b/test/SILGen/fragile_globals.swift index 0c6fef2bcf5e8..642d6d35893a6 100644 --- a/test/SILGen/fragile_globals.swift +++ b/test/SILGen/fragile_globals.swift @@ -2,7 +2,7 @@ // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -parse-as-library -sil-serialize-all -o %t %S/Inputs/ModuleA.swift // RUN: %target-swift-frontend -emit-module -parse-as-library -sil-serialize-all -o %t %S/Inputs/ModuleB.swift -// RUN: %target-swift-frontend -parse-as-library -I%t %s -Xllvm -sil-disable-pass="SIL Global Optimization" -O -emit-sil | FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -I%t %s -Xllvm -sil-disable-pass="SIL Global Optimization" -O -emit-sil | %FileCheck %s import ModuleA import ModuleB diff --git a/test/SILGen/function_conversion.swift b/test/SILGen/function_conversion.swift index e49f0942dbbaa..5190d8da9b9c0 100644 --- a/test/SILGen/function_conversion.swift +++ b/test/SILGen/function_conversion.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // Check SILGen against various FunctionConversionExprs emitted by Sema. diff --git a/test/SILGen/function_conversion_objc.swift b/test/SILGen/function_conversion_objc.swift index d419b85f2c725..580e107683a45 100644 --- a/test/SILGen/function_conversion_objc.swift +++ b/test/SILGen/function_conversion_objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen -verify | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen -verify | %FileCheck %s import Foundation diff --git a/test/SILGen/functions.swift b/test/SILGen/functions.swift index 9bac5572e83c1..a1d435b6d4188 100644 --- a/test/SILGen/functions.swift +++ b/test/SILGen/functions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -parse-stdlib -parse-as-library -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -parse-stdlib -parse-as-library -emit-silgen %s | %FileCheck %s import Swift // just for Optional diff --git a/test/SILGen/generic_casts.swift b/test/SILGen/generic_casts.swift index f3b5488bdf05b..d1d516129250c 100644 --- a/test/SILGen/generic_casts.swift +++ b/test/SILGen/generic_casts.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s protocol ClassBound : class {} protocol NotClassBound {} diff --git a/test/SILGen/generic_closures.swift b/test/SILGen/generic_closures.swift index c3d95dd7cce04..23132e2877477 100644 --- a/test/SILGen/generic_closures.swift +++ b/test/SILGen/generic_closures.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | FileCheck %s -// RUN: %target-swift-frontend -parse-stdlib -emit-silgen -suppress-argument-labels-in-types %s | FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen -suppress-argument-labels-in-types %s | %FileCheck %s import Swift diff --git a/test/SILGen/generic_literals.swift b/test/SILGen/generic_literals.swift index daa52959bc4ea..fc780d0a8cc84 100644 --- a/test/SILGen/generic_literals.swift +++ b/test/SILGen/generic_literals.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil hidden @_TF16generic_literals21genericIntegerLitera func genericIntegerLiteral(x: T) { diff --git a/test/SILGen/generic_objc_block_bridge.swift b/test/SILGen/generic_objc_block_bridge.swift index 74d12bb863dc3..8a42e698c3764 100644 --- a/test/SILGen/generic_objc_block_bridge.swift +++ b/test/SILGen/generic_objc_block_bridge.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/generic_property_base_lifetime.swift b/test/SILGen/generic_property_base_lifetime.swift index 2ab3750dc5c08..0338d4a4ed25d 100644 --- a/test/SILGen/generic_property_base_lifetime.swift +++ b/test/SILGen/generic_property_base_lifetime.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s -disable-objc-attr-requires-foundation-module | %FileCheck %s protocol ProtocolA: class { var intProp: Int { get set } diff --git a/test/SILGen/generic_tuples.swift b/test/SILGen/generic_tuples.swift index f2005ff32d1c4..6f6f563870779 100644 --- a/test/SILGen/generic_tuples.swift +++ b/test/SILGen/generic_tuples.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -parse-as-library %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -parse-as-library %s | %FileCheck %s func dup(_ x: T) -> (T, T) { return (x,x) } diff --git a/test/SILGen/generic_witness.swift b/test/SILGen/generic_witness.swift index 198e724ec4aea..cd5ea04142773 100644 --- a/test/SILGen/generic_witness.swift +++ b/test/SILGen/generic_witness.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol Runcible { func runce(_ x: A) diff --git a/test/SILGen/global_init_attribute.swift b/test/SILGen/global_init_attribute.swift index 8585814f662c1..67566f16ec756 100644 --- a/test/SILGen/global_init_attribute.swift +++ b/test/SILGen/global_init_attribute.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-module -o %t %S/Inputs/def_global.swift -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -parse-as-library -emit-silgen -I %t %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -parse-as-library -emit-silgen -I %t %s | %FileCheck %s // // Test that SILGen uses the "global_init" attribute for all global // variable addressors. diff --git a/test/SILGen/global_resilience.swift b/test/SILGen/global_resilience.swift index acdd57d781c37..af67003e5553a 100644 --- a/test/SILGen/global_resilience.swift +++ b/test/SILGen/global_resilience.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -I %S/../Inputs -emit-silgen -enable-source-import -parse-as-library -enable-resilience %s | FileCheck %s -// RUN: %target-swift-frontend -I %S/../Inputs -emit-sil -enable-source-import -parse-as-library -enable-resilience %s -O | FileCheck --check-prefix=CHECK-OPT %s +// RUN: %target-swift-frontend -I %S/../Inputs -emit-silgen -enable-source-import -parse-as-library -enable-resilience %s | %FileCheck %s +// RUN: %target-swift-frontend -I %S/../Inputs -emit-sil -enable-source-import -parse-as-library -enable-resilience %s -O | %FileCheck --check-prefix=CHECK-OPT %s import resilient_global diff --git a/test/SILGen/guaranteed_closure_context.swift b/test/SILGen/guaranteed_closure_context.swift index ec41d73c8fb48..4649c666599a9 100644 --- a/test/SILGen/guaranteed_closure_context.swift +++ b/test/SILGen/guaranteed_closure_context.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -emit-silgen -enable-guaranteed-closure-contexts %s | FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen -enable-guaranteed-closure-contexts %s | %FileCheck %s func use(_: T) {} diff --git a/test/SILGen/guaranteed_self.swift b/test/SILGen/guaranteed_self.swift index 28ed628464a47..57ec939b76844 100644 --- a/test/SILGen/guaranteed_self.swift +++ b/test/SILGen/guaranteed_self.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s -disable-objc-attr-requires-foundation-module | %FileCheck %s protocol Fooable { init() diff --git a/test/SILGen/if_expr.swift b/test/SILGen/if_expr.swift index 95741fadc37ab..84fcd8b1ac2f6 100644 --- a/test/SILGen/if_expr.swift +++ b/test/SILGen/if_expr.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func fizzbuzz(i: Int) -> String { return i % 3 == 0 diff --git a/test/SILGen/if_while_binding.swift b/test/SILGen/if_while_binding.swift index 1b8d8d63e73e7..5d4747218152b 100644 --- a/test/SILGen/if_while_binding.swift +++ b/test/SILGen/if_while_binding.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s func foo() -> String? { return "" } func bar() -> String? { return "" } diff --git a/test/SILGen/implicitly_unwrapped_optional.swift b/test/SILGen/implicitly_unwrapped_optional.swift index 3f31c56c1393f..63ec64079d545 100644 --- a/test/SILGen/implicitly_unwrapped_optional.swift +++ b/test/SILGen/implicitly_unwrapped_optional.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func foo(f f: (() -> ())!) { var f: (() -> ())! = f diff --git a/test/SILGen/import_as_member.swift b/test/SILGen/import_as_member.swift index bc8a1b38a33d9..f493923f4868e 100644 --- a/test/SILGen/import_as_member.swift +++ b/test/SILGen/import_as_member.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -I %S/../IDE/Inputs/custom-modules %s 2>&1 | FileCheck --check-prefix=SIL %s +// RUN: %target-swift-frontend -emit-silgen -I %S/../IDE/Inputs/custom-modules %s 2>&1 | %FileCheck --check-prefix=SIL %s // REQUIRES: objc_interop import ImportAsMember.A import ImportAsMember.Proto diff --git a/test/SILGen/import_as_member_cf.swift b/test/SILGen/import_as_member_cf.swift index 62663e7ac22f1..d42efd6d0ff3e 100644 --- a/test/SILGen/import_as_member_cf.swift +++ b/test/SILGen/import_as_member_cf.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -I %S/../IDE/Inputs/custom-modules %s 2>&1 | FileCheck --check-prefix=SIL %s +// RUN: %target-swift-frontend -emit-silgen -I %S/../IDE/Inputs/custom-modules %s 2>&1 | %FileCheck --check-prefix=SIL %s // REQUIRES: objc_interop import ImportAsMember.C diff --git a/test/SILGen/imported_struct_array_field.swift b/test/SILGen/imported_struct_array_field.swift index 22763a55f7516..016cbc6167dff 100644 --- a/test/SILGen/imported_struct_array_field.swift +++ b/test/SILGen/imported_struct_array_field.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -import-objc-header %S/Inputs/array_typedef.h %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -import-objc-header %S/Inputs/array_typedef.h %s | %FileCheck %s // CHECK-LABEL: sil shared [transparent] [fragile] @_TFVSC4NameC{{.*}} : $@convention(method) (UInt8, UInt8, UInt8, UInt8, @thin Name.Type) -> Name func useImportedArrayTypedefInit() -> Name { diff --git a/test/SILGen/indirect_enum.swift b/test/SILGen/indirect_enum.swift index b2f8b8087038d..748d7c90f2e41 100644 --- a/test/SILGen/indirect_enum.swift +++ b/test/SILGen/indirect_enum.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s indirect enum TreeA { case Nil diff --git a/test/SILGen/inherited_protocol_conformance_multi_file.swift b/test/SILGen/inherited_protocol_conformance_multi_file.swift index 5d29b7b887f9d..82a722784597c 100644 --- a/test/SILGen/inherited_protocol_conformance_multi_file.swift +++ b/test/SILGen/inherited_protocol_conformance_multi_file.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file.swift -module-name main | FileCheck %s --check-prefix=THIS_FILE -// RUN: %target-swift-frontend -emit-silgen %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file.swift -module-name main | FileCheck %s --check-prefix=OTHER_FILE +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file.swift -module-name main | %FileCheck %s --check-prefix=THIS_FILE +// RUN: %target-swift-frontend -emit-silgen %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file.swift -module-name main | %FileCheck %s --check-prefix=OTHER_FILE // THIS_FILE-NOT: sil_witness_table {{.*}} B: P // THIS_FILE-LABEL: sil_witness_table hidden D: R module main diff --git a/test/SILGen/inherited_protocol_conformance_multi_file_2.swift b/test/SILGen/inherited_protocol_conformance_multi_file_2.swift index 0cdf9c633d789..d58bd7fbb1bfc 100644 --- a/test/SILGen/inherited_protocol_conformance_multi_file_2.swift +++ b/test/SILGen/inherited_protocol_conformance_multi_file_2.swift @@ -1,46 +1,46 @@ // -- Try all the permutations of file order possible. // Abc -// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | FileCheck %s --check-prefix=FILE_A +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | %FileCheck %s --check-prefix=FILE_A // aBc -// RUN: %target-swift-frontend -emit-silgen %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | FileCheck %s --check-prefix=FILE_B +// RUN: %target-swift-frontend -emit-silgen %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | %FileCheck %s --check-prefix=FILE_B // abC -// RUN: %target-swift-frontend -emit-silgen %s %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | FileCheck %s --check-prefix=FILE_C +// RUN: %target-swift-frontend -emit-silgen %s %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | %FileCheck %s --check-prefix=FILE_C // Bac -// RUN: %target-swift-frontend -emit-silgen -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %s %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | FileCheck %s --check-prefix=FILE_B +// RUN: %target-swift-frontend -emit-silgen -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %s %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | %FileCheck %s --check-prefix=FILE_B // bAc -// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | FileCheck %s --check-prefix=FILE_A +// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | %FileCheck %s --check-prefix=FILE_A // baC -// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | FileCheck %s --check-prefix=FILE_C +// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | %FileCheck %s --check-prefix=FILE_C // OS X 10.9 -// RUN: %target-swift-frontend -emit-silgen -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %s %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | FileCheck %s --check-prefix=FILE_C +// RUN: %target-swift-frontend -emit-silgen -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %s %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | %FileCheck %s --check-prefix=FILE_C // cAb -// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | FileCheck %s --check-prefix=FILE_A +// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | %FileCheck %s --check-prefix=FILE_A // caB -// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | FileCheck %s --check-prefix=FILE_B +// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | %FileCheck %s --check-prefix=FILE_B // Acb -// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | FileCheck %s --check-prefix=FILE_A +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | %FileCheck %s --check-prefix=FILE_A // aCb -// RUN: %target-swift-frontend -emit-silgen %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | FileCheck %s --check-prefix=FILE_C +// RUN: %target-swift-frontend -emit-silgen %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | %FileCheck %s --check-prefix=FILE_C // abC -// RUN: %target-swift-frontend -emit-silgen %s %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | FileCheck %s --check-prefix=FILE_B +// RUN: %target-swift-frontend -emit-silgen %s %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | %FileCheck %s --check-prefix=FILE_B // Bca -// RUN: %target-swift-frontend -emit-silgen -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %s -module-name main | FileCheck %s --check-prefix=FILE_B +// RUN: %target-swift-frontend -emit-silgen -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %s -module-name main | %FileCheck %s --check-prefix=FILE_B // bCa -// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %s -module-name main | FileCheck %s --check-prefix=FILE_C +// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %s -module-name main | %FileCheck %s --check-prefix=FILE_C // bcA -// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -primary-file %s -module-name main | FileCheck %s --check-prefix=FILE_A +// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -primary-file %s -module-name main | %FileCheck %s --check-prefix=FILE_A // Cba -// RUN: %target-swift-frontend -emit-silgen -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %s -module-name main | FileCheck %s --check-prefix=FILE_C +// RUN: %target-swift-frontend -emit-silgen -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %s -module-name main | %FileCheck %s --check-prefix=FILE_C // cBa -// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %s -module-name main | FileCheck %s --check-prefix=FILE_B +// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %s -module-name main | %FileCheck %s --check-prefix=FILE_B // cbA -// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -primary-file %s -module-name main | FileCheck %s --check-prefix=FILE_A +// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -primary-file %s -module-name main | %FileCheck %s --check-prefix=FILE_A // FILE_A-NOT: sil [transparent] [thunk] @_TTWV4main5Things9EquatableS_ZFS1_oi2ee // FILE_A-NOT: sil [transparent] [thunk] @_TTWV4main5Things8HashableS_FS1_g9hashValueSi diff --git a/test/SILGen/init_ref_delegation.swift b/test/SILGen/init_ref_delegation.swift index e657a67061cbe..fe1ef240fa204 100644 --- a/test/SILGen/init_ref_delegation.swift +++ b/test/SILGen/init_ref_delegation.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s -disable-objc-attr-requires-foundation-module | %FileCheck %s struct X { } diff --git a/test/SILGen/instrprof_basic.swift b/test/SILGen/instrprof_basic.swift index efaf262840046..d17e60b8fbbe5 100644 --- a/test/SILGen/instrprof_basic.swift +++ b/test/SILGen/instrprof_basic.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -emit-silgen -profile-generate %s | FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen -profile-generate %s | %FileCheck %s // CHECK: sil hidden @[[F_EMPTY:.*empty.*]] : // CHECK: %[[NAME:.*]] = string_literal utf8 "{{.*}}instrprof_basic.swift:[[F_EMPTY]]" diff --git a/test/SILGen/instrprof_operators.swift b/test/SILGen/instrprof_operators.swift index 6c39cb3c9bf26..70b6704cab65f 100644 --- a/test/SILGen/instrprof_operators.swift +++ b/test/SILGen/instrprof_operators.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -emit-silgen -profile-generate %s | FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen -profile-generate %s | %FileCheck %s // CHECK: sil hidden @[[F_OPERATORS:.*operators.*]] : // CHECK: %[[NAME:.*]] = string_literal utf8 "{{.*}}instrprof_operators.swift:[[F_OPERATORS]]" diff --git a/test/SILGen/interface_type_mangling.swift b/test/SILGen/interface_type_mangling.swift index 91d9fcd7dfec3..e32224cfb0b89 100644 --- a/test/SILGen/interface_type_mangling.swift +++ b/test/SILGen/interface_type_mangling.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle %s -emit-silgen | %FileCheck %s protocol P { associatedtype Assoc1 diff --git a/test/SILGen/ivar_destroyer.swift b/test/SILGen/ivar_destroyer.swift index 0b2ae37ad9493..0d3858eb15d1e 100644 --- a/test/SILGen/ivar_destroyer.swift +++ b/test/SILGen/ivar_destroyer.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | %FileCheck %s // Only derived classes with non-trivial ivars need an ivar destroyer. diff --git a/test/SILGen/lazy_global_access.swift b/test/SILGen/lazy_global_access.swift index 9c028835fe4f7..93448feb78df7 100644 --- a/test/SILGen/lazy_global_access.swift +++ b/test/SILGen/lazy_global_access.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s -check-prefix=MAIN -// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | FileCheck %s -check-prefix=LIBRARY +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s -check-prefix=MAIN +// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | %FileCheck %s -check-prefix=LIBRARY // The following code is valid as a library or as a main source file. Script // variables should be accessed directly, whereas library global variables diff --git a/test/SILGen/lazy_globals.swift b/test/SILGen/lazy_globals.swift index 72979f2e7744f..2adb9055595ce 100644 --- a/test/SILGen/lazy_globals.swift +++ b/test/SILGen/lazy_globals.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | %FileCheck %s // CHECK: sil private @globalinit_[[T:.*]]_func0 : $@convention(thin) () -> () { // CHECK: alloc_global @_Tv12lazy_globals1xSi diff --git a/test/SILGen/lazy_globals_multiple_vars.swift b/test/SILGen/lazy_globals_multiple_vars.swift index 15643220a5f9a..aaa149bcdf65c 100644 --- a/test/SILGen/lazy_globals_multiple_vars.swift +++ b/test/SILGen/lazy_globals_multiple_vars.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | %FileCheck %s // CHECK: sil private [[INIT_A_B:@globalinit_.*]] : // CHECK: alloc_global @_Tv26lazy_globals_multiple_vars1aSi diff --git a/test/SILGen/let_decls.swift b/test/SILGen/let_decls.swift index ac761546af08e..6eb9f486cd1ed 100644 --- a/test/SILGen/let_decls.swift +++ b/test/SILGen/let_decls.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s func takeClosure(_ a : () -> Int) {} diff --git a/test/SILGen/lifetime.swift b/test/SILGen/lifetime.swift index d916e49dfacc9..14a9f9b629017 100644 --- a/test/SILGen/lifetime.swift +++ b/test/SILGen/lifetime.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -parse-as-library -emit-silgen -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -parse-as-library -emit-silgen -primary-file %s | %FileCheck %s struct Buh { var x: Int { diff --git a/test/SILGen/lifetime_unions.swift b/test/SILGen/lifetime_unions.swift index c2442c0ac0e40..b919416740316 100644 --- a/test/SILGen/lifetime_unions.swift +++ b/test/SILGen/lifetime_unions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | %FileCheck %s enum TrivialUnion { case Foo diff --git a/test/SILGen/local_captures.swift b/test/SILGen/local_captures.swift index 20b16f8fca84f..e7e4372f7d6c5 100644 --- a/test/SILGen/local_captures.swift +++ b/test/SILGen/local_captures.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | %FileCheck %s // Check that we don't crash if a local function references another local // function without captures. diff --git a/test/SILGen/local_recursion.swift b/test/SILGen/local_recursion.swift index 46a436744e87b..3f18d39274ce5 100644 --- a/test/SILGen/local_recursion.swift +++ b/test/SILGen/local_recursion.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil hidden @_TF15local_recursion15local_recursionFTSi1ySi_T_ : $@convention(thin) (Int, Int) -> () { // CHECK: bb0([[X:%0]] : $Int, [[Y:%1]] : $Int): diff --git a/test/SILGen/lying_about_optional_return.swift b/test/SILGen/lying_about_optional_return.swift index 1416dc43748d1..211603d5c92df 100644 --- a/test/SILGen/lying_about_optional_return.swift +++ b/test/SILGen/lying_about_optional_return.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -import-objc-header %S/Inputs/c_function_pointer_in_c_struct.h -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -import-objc-header %S/Inputs/c_function_pointer_in_c_struct.h -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil hidden @_TF27lying_about_optional_return45optionalChainingForeignFunctionTypeProperties func optionalChainingForeignFunctionTypeProperties(a: SomeCallbacks?) { diff --git a/test/SILGen/lying_about_optional_return_objc.swift b/test/SILGen/lying_about_optional_return_objc.swift index 3cda001e20a07..487904455284c 100644 --- a/test/SILGen/lying_about_optional_return_objc.swift +++ b/test/SILGen/lying_about_optional_return_objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -import-objc-header %S/Inputs/block_property_in_objc_class.h -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -import-objc-header %S/Inputs/block_property_in_objc_class.h -emit-silgen %s | %FileCheck %s // REQUIRES: objc_interop // CHECK-LABEL: sil hidden @_TF32lying_about_optional_return_objc45optionalChainingForeignFunctionTypeProperties diff --git a/test/SILGen/mangling.swift b/test/SILGen/mangling.swift index 2c3de21fd1530..c89f17a25ef65 100644 --- a/test/SILGen/mangling.swift +++ b/test/SILGen/mangling.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/mangling_ext_structA.swift b/test/SILGen/mangling_ext_structA.swift index 5f4e9f035eb53..bb67d393f332c 100644 --- a/test/SILGen/mangling_ext_structA.swift +++ b/test/SILGen/mangling_ext_structA.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/def_structA.swift -// RUN: %target-swift-frontend -emit-silgen -module-name ext_structA -I %t %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -module-name ext_structA -I %t %s | %FileCheck %s // Ensure that members of extensions of types from another module are mangled // correctly. diff --git a/test/SILGen/mangling_generic_extensions.swift b/test/SILGen/mangling_generic_extensions.swift index adaf74b132d6e..5fabc7fde85cd 100644 --- a/test/SILGen/mangling_generic_extensions.swift +++ b/test/SILGen/mangling_generic_extensions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s struct Foo { } diff --git a/test/SILGen/mangling_private.swift b/test/SILGen/mangling_private.swift index 09f1114fcd123..6bef9d0eecbe5 100644 --- a/test/SILGen/mangling_private.swift +++ b/test/SILGen/mangling_private.swift @@ -1,14 +1,14 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/mangling_private_helper.swift -// RUN: %target-swift-frontend -emit-silgen %S/Inputs/mangling_private_helper.swift | FileCheck %s -check-prefix=CHECK-BASE +// RUN: %target-swift-frontend -emit-silgen %S/Inputs/mangling_private_helper.swift | %FileCheck %s -check-prefix=CHECK-BASE -// RUN: %target-swift-frontend %s -I %t -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend %s -I %t -emit-silgen | %FileCheck %s // RUN: cp %s %t -// RUN: %target-swift-frontend %t/mangling_private.swift -I %t -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend %t/mangling_private.swift -I %t -emit-silgen | %FileCheck %s // RUN: cp %s %t/other_name.swift -// RUN: %target-swift-frontend %t/other_name.swift -I %t -emit-silgen -module-name mangling_private | FileCheck %s -check-prefix=OTHER-NAME +// RUN: %target-swift-frontend %t/other_name.swift -I %t -emit-silgen -module-name mangling_private | %FileCheck %s -check-prefix=OTHER-NAME import mangling_private_helper diff --git a/test/SILGen/materializeForSet.swift b/test/SILGen/materializeForSet.swift index e1ef4af74538c..6e3cbbb3a55b2 100644 --- a/test/SILGen/materializeForSet.swift +++ b/test/SILGen/materializeForSet.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class Base { var stored: Int = 0 diff --git a/test/SILGen/metatype_abstraction.swift b/test/SILGen/metatype_abstraction.swift index a702deaab8a63..70c84e84e678c 100644 --- a/test/SILGen/metatype_abstraction.swift +++ b/test/SILGen/metatype_abstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -module-name Swift -parse-stdlib %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -module-name Swift -parse-stdlib %s | %FileCheck %s enum Optional { case none diff --git a/test/SILGen/metatype_casts.swift b/test/SILGen/metatype_casts.swift index 06be9a371323c..5156172fcdd17 100644 --- a/test/SILGen/metatype_casts.swift +++ b/test/SILGen/metatype_casts.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil hidden @_TF14metatype_casts6t_is_u // CHECK: checked_cast_br {{.*}} $@thick T.Type to $@thick U.Type diff --git a/test/SILGen/metatype_object_conversion.swift b/test/SILGen/metatype_object_conversion.swift index 5b2768cd0c860..0fab2ec3c063c 100644 --- a/test/SILGen/metatype_object_conversion.swift +++ b/test/SILGen/metatype_object_conversion.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/metatypes.swift b/test/SILGen/metatypes.swift index c99eb8e69bbf8..6908d5fddd8c9 100644 --- a/test/SILGen/metatypes.swift +++ b/test/SILGen/metatypes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | %FileCheck %s import Swift diff --git a/test/SILGen/multi_file.swift b/test/SILGen/multi_file.swift index 3f05d368689b4..2a4fd09f4dc25 100644 --- a/test/SILGen/multi_file.swift +++ b/test/SILGen/multi_file.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/multi_file_helper.swift | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/multi_file_helper.swift | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/SILGen/nested_generics.swift b/test/SILGen/nested_generics.swift index c797f492bc5fa..0fa4660454282 100644 --- a/test/SILGen/nested_generics.swift +++ b/test/SILGen/nested_generics.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen -enable-experimental-nested-generic-types -parse-as-library %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen -enable-experimental-nested-generic-types -parse-as-library %s | %FileCheck %s // RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-sil -enable-experimental-nested-generic-types -parse-as-library %s > /dev/null // RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-sil -O -enable-experimental-nested-generic-types -parse-as-library %s > /dev/null // RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-ir -enable-experimental-nested-generic-types -parse-as-library %s > /dev/null diff --git a/test/SILGen/newtype.swift b/test/SILGen/newtype.swift index 29f0ed8aa48c5..0b6b86b486059 100644 --- a/test/SILGen/newtype.swift +++ b/test/SILGen/newtype.swift @@ -1,6 +1,6 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import -enable-swift-newtype %s | FileCheck %s -check-prefix=CHECK-RAW +// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import -enable-swift-newtype %s | %FileCheck %s -check-prefix=CHECK-RAW -// RUN: %target-swift-frontend -emit-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import -enable-swift-newtype %s | FileCheck %s -check-prefix=CHECK-CANONICAL +// RUN: %target-swift-frontend -emit-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import -enable-swift-newtype %s | %FileCheck %s -check-prefix=CHECK-CANONICAL // REQUIRES: objc_interop diff --git a/test/SILGen/noescape_reabstraction.swift b/test/SILGen/noescape_reabstraction.swift index 6dbdb13e74d5f..85ffcfe46eee6 100644 --- a/test/SILGen/noescape_reabstraction.swift +++ b/test/SILGen/noescape_reabstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s struct S {} diff --git a/test/SILGen/nsmanaged-witness.swift b/test/SILGen/nsmanaged-witness.swift index b0d70883ff570..df598465d3bfd 100644 --- a/test/SILGen/nsmanaged-witness.swift +++ b/test/SILGen/nsmanaged-witness.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_attr_NSManaged.swift b/test/SILGen/objc_attr_NSManaged.swift index b55ec3b5ef249..13193f1daff92 100644 --- a/test/SILGen/objc_attr_NSManaged.swift +++ b/test/SILGen/objc_attr_NSManaged.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_attr_NSManaged_multi.swift b/test/SILGen/objc_attr_NSManaged_multi.swift index 6035717b8db7d..2e24dde77849f 100644 --- a/test/SILGen/objc_attr_NSManaged_multi.swift +++ b/test/SILGen/objc_attr_NSManaged_multi.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -primary-file %s %S/objc_attr_NSManaged.swift -I %S/Inputs -enable-source-import -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -primary-file %s %S/objc_attr_NSManaged.swift -I %S/Inputs -enable-source-import -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_blocks_bridging.swift b/test/SILGen/objc_blocks_bridging.swift index 5348629815d70..a5b3b7a354238 100644 --- a/test/SILGen/objc_blocks_bridging.swift +++ b/test/SILGen/objc_blocks_bridging.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-silgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -verify -emit-silgen -I %S/Inputs -disable-objc-attr-requires-foundation-module %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -verify -emit-silgen -I %S/Inputs -disable-objc-attr-requires-foundation-module %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_bool_bridging.swift b/test/SILGen/objc_bool_bridging.swift index 030bda6fa758d..919f275471147 100644 --- a/test/SILGen/objc_bool_bridging.swift +++ b/test/SILGen/objc_bool_bridging.swift @@ -3,7 +3,7 @@ // XFAIL: * -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-silgen %s -import-objc-header %S/Inputs/BoolBridgingTests.h | FileCheck %s --check-prefix=CHECK $(test '%target-os' = 'macosx' -o '(' '%target-os' = 'ios' -a '%target-ptrsize' = '32' ')' && echo '--check-prefix=CHECK-OBJCBOOL') +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-silgen %s -import-objc-header %S/Inputs/BoolBridgingTests.h | %FileCheck %s --check-prefix=CHECK $(test '%target-os' = 'macosx' -o '(' '%target-os' = 'ios' -a '%target-ptrsize' = '32' ')' && echo '--check-prefix=CHECK-OBJCBOOL') // REQUIRES: objc_interop diff --git a/test/SILGen/objc_bridged_results.swift b/test/SILGen/objc_bridged_results.swift index d5091d7feac44..b25080de95d0d 100644 --- a/test/SILGen/objc_bridged_results.swift +++ b/test/SILGen/objc_bridged_results.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-silgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen %s -import-objc-header %S/Inputs/objc_bridged_results.h | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen %s -import-objc-header %S/Inputs/objc_bridged_results.h | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_bridging.swift b/test/SILGen/objc_bridging.swift index a1725d378169f..19760e9fbf6a5 100644 --- a/test/SILGen/objc_bridging.swift +++ b/test/SILGen/objc_bridging.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-silgen-test-overlays // RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-module -o %t -I %S/../Inputs/ObjCBridging %S/../Inputs/ObjCBridging/Appliances.swift -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -I %S/../Inputs/ObjCBridging -Xllvm -sil-full-demangle -emit-silgen %s | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-cpu --check-prefix=CHECK-%target-os-%target-cpu +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -I %S/../Inputs/ObjCBridging -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-cpu --check-prefix=CHECK-%target-os-%target-cpu // REQUIRES: objc_interop diff --git a/test/SILGen/objc_bridging_any.swift b/test/SILGen/objc_bridging_any.swift index 927a1b7f56c2d..50df482600f2d 100644 --- a/test/SILGen/objc_bridging_any.swift +++ b/test/SILGen/objc_bridging_any.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-id-as-any -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-id-as-any -emit-silgen %s | %FileCheck %s // REQUIRES: objc_interop import Foundation diff --git a/test/SILGen/objc_currying.swift b/test/SILGen/objc_currying.swift index c9f28ffc6cf36..13681716e852e 100644 --- a/test/SILGen/objc_currying.swift +++ b/test/SILGen/objc_currying.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %build-silgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_dealloc.swift b/test/SILGen/objc_dealloc.swift index f559354075056..219f17eeebfb1 100644 --- a/test/SILGen/objc_dealloc.swift +++ b/test/SILGen/objc_dealloc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_dictionary_bridging.swift b/test/SILGen/objc_dictionary_bridging.swift index 1bb30c2183ae7..a782ba0df0a03 100644 --- a/test/SILGen/objc_dictionary_bridging.swift +++ b/test/SILGen/objc_dictionary_bridging.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-silgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_disable_brigding.swift b/test/SILGen/objc_disable_brigding.swift index a2237cef6f6fb..db349f8739b95 100644 --- a/test/SILGen/objc_disable_brigding.swift +++ b/test/SILGen/objc_disable_brigding.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-silgen-test-overlays // RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-module -o %t -I %S/../Inputs/ObjCBridging %S/../Inputs/ObjCBridging/Appliances.swift -I %t -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -I %S/../Inputs/ObjCBridging -disable-swift-bridge-attr -Xllvm -sil-full-demangle -emit-silgen %s | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-cpu --check-prefix=CHECK-%target-os-%target-cpu +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -I %S/../Inputs/ObjCBridging -disable-swift-bridge-attr -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-cpu --check-prefix=CHECK-%target-os-%target-cpu // REQUIRES: objc_interop diff --git a/test/SILGen/objc_enum.swift b/test/SILGen/objc_enum.swift index 15dc1d9556e3e..2944c03e88cef 100644 --- a/test/SILGen/objc_enum.swift +++ b/test/SILGen/objc_enum.swift @@ -1,6 +1,6 @@ // RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen > %t.out -// RUN: FileCheck -check-prefix=CHECK -check-prefix=CHECK-%target-ptrsize %s < %t.out -// RUN: FileCheck -check-prefix=NEGATIVE %s < %t.out +// RUN: %FileCheck -check-prefix=CHECK -check-prefix=CHECK-%target-ptrsize %s < %t.out +// RUN: %FileCheck -check-prefix=NEGATIVE %s < %t.out // REQUIRES: objc_interop diff --git a/test/SILGen/objc_enum_errortype.swift b/test/SILGen/objc_enum_errortype.swift index 95c07d4b8756f..f66952d8b572b 100644 --- a/test/SILGen/objc_enum_errortype.swift +++ b/test/SILGen/objc_enum_errortype.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s -import-objc-header %S/Inputs/objc_enum_errortype.h | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s -import-objc-header %S/Inputs/objc_enum_errortype.h | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_enum_unused_witnesses.swift b/test/SILGen/objc_enum_unused_witnesses.swift index ebb75e54a61bf..ab9fa42648bbf 100644 --- a/test/SILGen/objc_enum_unused_witnesses.swift +++ b/test/SILGen/objc_enum_unused_witnesses.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_error.swift b/test/SILGen/objc_error.swift index 3629204c073e1..08a92d9fd07a6 100644 --- a/test/SILGen/objc_error.swift +++ b/test/SILGen/objc_error.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-clang-importer-objc-overlays -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-silgen %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_extensions.swift b/test/SILGen/objc_extensions.swift index 28b2efd9e65ac..52367410768a3 100644 --- a/test/SILGen/objc_extensions.swift +++ b/test/SILGen/objc_extensions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs/ -I %S/Inputs -enable-source-import %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs/ -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_final.swift b/test/SILGen/objc_final.swift index d41407ae0c13e..5551bb7bfe91b 100644 --- a/test/SILGen/objc_final.swift +++ b/test/SILGen/objc_final.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen -emit-verbose-sil | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen -emit-verbose-sil | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_generic_class.swift b/test/SILGen/objc_generic_class.swift index 8fda7fb02233a..980b7fddba9fb 100644 --- a/test/SILGen/objc_generic_class.swift +++ b/test/SILGen/objc_generic_class.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_implicitly_unwrapped_optional.swift b/test/SILGen/objc_implicitly_unwrapped_optional.swift index ede08766267c0..84eaf0a4a5bf6 100644 --- a/test/SILGen/objc_implicitly_unwrapped_optional.swift +++ b/test/SILGen/objc_implicitly_unwrapped_optional.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-sil -assert-config Release %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-sil -assert-config Release %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_imported_generic.swift b/test/SILGen/objc_imported_generic.swift index e0a0a655d9ace..077593a2f8729 100644 --- a/test/SILGen/objc_imported_generic.swift +++ b/test/SILGen/objc_imported_generic.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-silgen %s | %FileCheck %s // For integration testing, ensure we get through IRGen too. // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir -verify -DIRGEN_INTEGRATION_TEST %s diff --git a/test/SILGen/objc_imported_init.swift b/test/SILGen/objc_imported_init.swift index c77cd2f0f7529..fc2267cbee4cd 100644 --- a/test/SILGen/objc_imported_init.swift +++ b/test/SILGen/objc_imported_init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -verify -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | FileCheck %s +// RUN: %target-swift-frontend -verify -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_init_ref_delegation.swift b/test/SILGen/objc_init_ref_delegation.swift index 24071c979431b..e349f775433b0 100644 --- a/test/SILGen/objc_init_ref_delegation.swift +++ b/test/SILGen/objc_init_ref_delegation.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_keypath.swift b/test/SILGen/objc_keypath.swift index d11517977d8ee..85a4b479f6dc3 100644 --- a/test/SILGen/objc_keypath.swift +++ b/test/SILGen/objc_keypath.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_local.swift b/test/SILGen/objc_local.swift index 94c8ff5bd6e29..7eb9850cb15d4 100644 --- a/test/SILGen/objc_local.swift +++ b/test/SILGen/objc_local.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_metatypes.swift b/test/SILGen/objc_metatypes.swift index c12ddf82a9f71..ce585b880a97f 100644 --- a/test/SILGen/objc_metatypes.swift +++ b/test/SILGen/objc_metatypes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_nonnull_lie_hack.swift b/test/SILGen/objc_nonnull_lie_hack.swift index 944018487c587..aaedbd7727a88 100644 --- a/test/SILGen/objc_nonnull_lie_hack.swift +++ b/test/SILGen/objc_nonnull_lie_hack.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t/APINotes // RUN: mkdir -p %t/APINotes // RUN: %clang_apinotes -yaml-to-binary %S/Inputs/gizmo.apinotes -o %t/APINotes/gizmo.apinotesc -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -I %t/APINotes -enable-source-import -primary-file %s | FileCheck -check-prefix=SILGEN %s -// RUN: %target-swift-frontend -emit-sil -O -sdk %S/Inputs -I %S/Inputs -I %t/APINotes -enable-source-import -primary-file %s | FileCheck -check-prefix=OPT %s +// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -I %t/APINotes -enable-source-import -primary-file %s | %FileCheck -check-prefix=SILGEN %s +// RUN: %target-swift-frontend -emit-sil -O -sdk %S/Inputs -I %S/Inputs -I %t/APINotes -enable-source-import -primary-file %s | %FileCheck -check-prefix=OPT %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_ownership_conventions.swift b/test/SILGen/objc_ownership_conventions.swift index 5fb921d0cc373..908b92fcdd1b9 100644 --- a/test/SILGen/objc_ownership_conventions.swift +++ b/test/SILGen/objc_ownership_conventions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_properties.swift b/test/SILGen/objc_properties.swift index 32ba3f868b090..125edf5535866 100644 --- a/test/SILGen/objc_properties.swift +++ b/test/SILGen/objc_properties.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-silgen -emit-verbose-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import | FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen -emit-verbose-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_protocols.swift b/test/SILGen/objc_protocols.swift index 639bdb3f48570..cfa25d6d72181 100644 --- a/test/SILGen/objc_protocols.swift +++ b/test/SILGen/objc_protocols.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_selector.swift b/test/SILGen/objc_selector.swift index 2e3acab34bb02..bc51cf77814be 100644 --- a/test/SILGen/objc_selector.swift +++ b/test/SILGen/objc_selector.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_set_bridging.swift b/test/SILGen/objc_set_bridging.swift index c644b49e40dd9..0d54d4e220171 100644 --- a/test/SILGen/objc_set_bridging.swift +++ b/test/SILGen/objc_set_bridging.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-silgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_subscript.swift b/test/SILGen/objc_subscript.swift index bde28363a7092..71f61826c784c 100644 --- a/test/SILGen/objc_subscript.swift +++ b/test/SILGen/objc_subscript.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-silgen -emit-verbose-sil -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen -emit-verbose-sil -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_super.swift b/test/SILGen/objc_super.swift index 649d2e5daf7d0..31d6825476c4c 100644 --- a/test/SILGen/objc_super.swift +++ b/test/SILGen/objc_super.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_thunks.swift b/test/SILGen/objc_thunks.swift index a0f7912be1d58..8deaad98d9fc1 100644 --- a/test/SILGen/objc_thunks.swift +++ b/test/SILGen/objc_thunks.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen -emit-verbose-sil | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen -emit-verbose-sil | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_witnesses.swift b/test/SILGen/objc_witnesses.swift index 43c0fd4e39026..480093d56230f 100644 --- a/test/SILGen/objc_witnesses.swift +++ b/test/SILGen/objc_witnesses.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/optional-cast.swift b/test/SILGen/optional-cast.swift index 7d523f0204369..4344daf09d6d0 100644 --- a/test/SILGen/optional-cast.swift +++ b/test/SILGen/optional-cast.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class A {} class B : A {} diff --git a/test/SILGen/optional.swift b/test/SILGen/optional.swift index d9fb27e296b24..30a15d2eba6a3 100644 --- a/test/SILGen/optional.swift +++ b/test/SILGen/optional.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func testCall(_ f: (() -> ())?) { f?() diff --git a/test/SILGen/optional_lvalue.swift b/test/SILGen/optional_lvalue.swift index 908c0a040a6bd..c9d73309f745f 100644 --- a/test/SILGen/optional_lvalue.swift +++ b/test/SILGen/optional_lvalue.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil hidden @_TF15optional_lvalue22assign_optional_lvalueFTRGSqSi_Si_T_ // CHECK: [[SHADOW:%.*]] = alloc_box $Optional diff --git a/test/SILGen/optional_to_bool.swift b/test/SILGen/optional_to_bool.swift index 969e7af41809b..f4dc7b511b449 100644 --- a/test/SILGen/optional_to_bool.swift +++ b/test/SILGen/optional_to_bool.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime public protocol P {} extension Int: P {} diff --git a/test/SILGen/partial_apply_generic.swift b/test/SILGen/partial_apply_generic.swift index ac9612def3ac3..734410bee70be 100644 --- a/test/SILGen/partial_apply_generic.swift +++ b/test/SILGen/partial_apply_generic.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol Foo { static func staticFunc() diff --git a/test/SILGen/partial_apply_init.swift b/test/SILGen/partial_apply_init.swift index 66aaf460e4ad8..6faf59c45c788 100644 --- a/test/SILGen/partial_apply_init.swift +++ b/test/SILGen/partial_apply_init.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s -// RUN: %target-swift-frontend -emit-silgen -suppress-argument-labels-in-types %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -suppress-argument-labels-in-types %s | %FileCheck %s class C { init(x: Int) {} diff --git a/test/SILGen/partial_apply_protocol_class_refinement_method.swift b/test/SILGen/partial_apply_protocol_class_refinement_method.swift index f7a77a2b1cec6..38c98c7e9548b 100644 --- a/test/SILGen/partial_apply_protocol_class_refinement_method.swift +++ b/test/SILGen/partial_apply_protocol_class_refinement_method.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol P { func foo() } protocol Q: class, P {} diff --git a/test/SILGen/partial_apply_super.swift b/test/SILGen/partial_apply_super.swift index 654acc6e0191e..d6fd900db7486 100644 --- a/test/SILGen/partial_apply_super.swift +++ b/test/SILGen/partial_apply_super.swift @@ -2,7 +2,7 @@ // RUN: mkdir %t // RUN: %target-swift-frontend -I %t -emit-module -emit-module-path=%t/resilient_struct.swiftmodule -module-name resilient_struct %S/../Inputs/resilient_struct.swift // RUN: %target-swift-frontend -I %t -emit-module -emit-module-path=%t/resilient_class.swiftmodule -module-name resilient_class %S/../Inputs/resilient_class.swift -// RUN: %target-swift-frontend -enable-resilience -emit-silgen -parse-as-library -I %t %s | FileCheck %s +// RUN: %target-swift-frontend -enable-resilience -emit-silgen -parse-as-library -I %t %s | %FileCheck %s import resilient_class diff --git a/test/SILGen/pointer_conversion.swift b/test/SILGen/pointer_conversion.swift index c58ef49709fd5..b601e503325f8 100644 --- a/test/SILGen/pointer_conversion.swift +++ b/test/SILGen/pointer_conversion.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // FIXME: rdar://problem/19648117 Needs splitting objc parts out // XFAIL: linux diff --git a/test/SILGen/properties.swift b/test/SILGen/properties.swift index 77401c404d152..27344010e2867 100644 --- a/test/SILGen/properties.swift +++ b/test/SILGen/properties.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -parse-as-library -emit-silgen -disable-objc-attr-requires-foundation-module %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -parse-as-library -emit-silgen -disable-objc-attr-requires-foundation-module %s | %FileCheck %s var zero: Int = 0 diff --git a/test/SILGen/property_abstraction.swift b/test/SILGen/property_abstraction.swift index 2747c4eae8cfd..71d5efbbbd367 100644 --- a/test/SILGen/property_abstraction.swift +++ b/test/SILGen/property_abstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s struct Int { mutating func foo() {} diff --git a/test/SILGen/property_behavior.swift b/test/SILGen/property_behavior.swift index 7701b5ceba8bc..efa46ad9ca1ce 100644 --- a/test/SILGen/property_behavior.swift +++ b/test/SILGen/property_behavior.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -enable-experimental-property-behaviors %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -enable-experimental-property-behaviors %s | %FileCheck %s protocol behavior { associatedtype Value } diff --git a/test/SILGen/property_behavior_init.swift b/test/SILGen/property_behavior_init.swift index a42985157a54a..cfcbd183c0bb4 100644 --- a/test/SILGen/property_behavior_init.swift +++ b/test/SILGen/property_behavior_init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -enable-experimental-property-behaviors -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -enable-experimental-property-behaviors -emit-silgen %s | %FileCheck %s protocol diBehavior { associatedtype Value var storage: Value { get set } diff --git a/test/SILGen/protocol_class_refinement.swift b/test/SILGen/protocol_class_refinement.swift index a4bc5b29fd035..35198311a0b22 100644 --- a/test/SILGen/protocol_class_refinement.swift +++ b/test/SILGen/protocol_class_refinement.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol UID { func uid() -> Int diff --git a/test/SILGen/protocol_extensions.swift b/test/SILGen/protocol_extensions.swift index bf846001bd775..d1bb2747733f6 100644 --- a/test/SILGen/protocol_extensions.swift +++ b/test/SILGen/protocol_extensions.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -disable-objc-attr-requires-foundation-module -emit-silgen %s | FileCheck %s -// RUN: %target-swift-frontend -disable-objc-attr-requires-foundation-module -emit-silgen -suppress-argument-labels-in-types %s | FileCheck %s +// RUN: %target-swift-frontend -disable-objc-attr-requires-foundation-module -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -disable-objc-attr-requires-foundation-module -emit-silgen -suppress-argument-labels-in-types %s | %FileCheck %s public protocol P1 { func reqP1a() diff --git a/test/SILGen/protocol_optional.swift b/test/SILGen/protocol_optional.swift index ffdb990a80a7d..d9700ddf71236 100644 --- a/test/SILGen/protocol_optional.swift +++ b/test/SILGen/protocol_optional.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -emit-silgen -disable-objc-attr-requires-foundation-module %s | FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen -disable-objc-attr-requires-foundation-module %s | %FileCheck %s @objc protocol P1 { @objc optional func method(_ x: Int) diff --git a/test/SILGen/protocol_resilience.swift b/test/SILGen/protocol_resilience.swift index 1ad1da4ec5d4a..76d33f19dd760 100644 --- a/test/SILGen/protocol_resilience.swift +++ b/test/SILGen/protocol_resilience.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-silgen -enable-resilience %s | FileCheck %s --check-prefix=CHECK +// RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-silgen -enable-resilience %s | %FileCheck %s --check-prefix=CHECK import resilient_protocol diff --git a/test/SILGen/protocol_resilience_objc.swift b/test/SILGen/protocol_resilience_objc.swift index 2202e1f048ee4..fb8dd34255437 100644 --- a/test/SILGen/protocol_resilience_objc.swift +++ b/test/SILGen/protocol_resilience_objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -disable-objc-attr-requires-foundation-module -enable-resilience %s | FileCheck %s --check-prefix=CHECK +// RUN: %target-swift-frontend -emit-silgen -disable-objc-attr-requires-foundation-module -enable-resilience %s | %FileCheck %s --check-prefix=CHECK // REQUIRES: objc_interop // @objc protocols don't need default witness tables diff --git a/test/SILGen/protocols.swift b/test/SILGen/protocols.swift index 13ccc6ef0a0bc..1f7fb61a0debb 100644 --- a/test/SILGen/protocols.swift +++ b/test/SILGen/protocols.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s //===----------------------------------------------------------------------===// // Calling Existential Subscripts diff --git a/test/SILGen/reabstract.swift b/test/SILGen/reabstract.swift index e04257c52a215..6604ce1082b4d 100644 --- a/test/SILGen/reabstract.swift +++ b/test/SILGen/reabstract.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s func takeFn(_ f : (T) -> T?) {} func liftOptional(_ x : Int) -> Int? { return x } diff --git a/test/SILGen/reabstract_lvalue.swift b/test/SILGen/reabstract_lvalue.swift index e0ff41c97638a..78a56cbcfdf24 100644 --- a/test/SILGen/reabstract_lvalue.swift +++ b/test/SILGen/reabstract_lvalue.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s struct MyMetatypeIsThin {} diff --git a/test/SILGen/required_init.swift b/test/SILGen/required_init.swift index d9ab5d706411d..bbb8204e17417 100644 --- a/test/SILGen/required_init.swift +++ b/test/SILGen/required_init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func subclassFloatLiteral() -> Bar { let x: Bar = 1.0 diff --git a/test/SILGen/result_abstraction.swift b/test/SILGen/result_abstraction.swift index 8b52ca1d4db61..020ba4d21088a 100644 --- a/test/SILGen/result_abstraction.swift +++ b/test/SILGen/result_abstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s struct S {} struct R {} diff --git a/test/SILGen/rethrows.swift b/test/SILGen/rethrows.swift index e8d34230c44c0..d5c946d2cc2c4 100644 --- a/test/SILGen/rethrows.swift +++ b/test/SILGen/rethrows.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil -verify %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil -verify %s | %FileCheck %s @discardableResult func rethrower(_ fn: () throws -> Int) rethrows -> Int { diff --git a/test/SILGen/same_type_abstraction.swift b/test/SILGen/same_type_abstraction.swift index f73044cffdd54..54a249eb28992 100644 --- a/test/SILGen/same_type_abstraction.swift +++ b/test/SILGen/same_type_abstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol Associated { associatedtype Assoc diff --git a/test/SILGen/scalar_to_tuple_args.swift b/test/SILGen/scalar_to_tuple_args.swift index f260051f80389..736d716ba73e2 100644 --- a/test/SILGen/scalar_to_tuple_args.swift +++ b/test/SILGen/scalar_to_tuple_args.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func inoutWithDefaults(_ x: inout Int, y: Int = 0, z: Int = 0) {} func inoutWithCallerSideDefaults(_ x: inout Int, y: Int = #line) {} diff --git a/test/SILGen/semanticsattr.swift b/test/SILGen/semanticsattr.swift index d9c3d1b8ec957..6ba5d82ff1d5b 100644 --- a/test/SILGen/semanticsattr.swift +++ b/test/SILGen/semanticsattr.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | %FileCheck %s // CHECK: [_semantics "123"] [_semantics "223"] @func1 @_semantics("223") @_semantics("123") diff --git a/test/SILGen/sil_locations.swift b/test/SILGen/sil_locations.swift index db406bd4d62a0..1b9d81dec7488 100644 --- a/test/SILGen/sil_locations.swift +++ b/test/SILGen/sil_locations.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -emit-verbose-sil %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -emit-verbose-sil %s | %FileCheck %s // FIXME: Not sure if this an ideal source info for the branch - // it points to if, not the last instruction in the block. diff --git a/test/SILGen/sil_locations_top_level.swift b/test/SILGen/sil_locations_top_level.swift index f492cc838b6ad..09358e0a51d22 100644 --- a/test/SILGen/sil_locations_top_level.swift +++ b/test/SILGen/sil_locations_top_level.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen -emit-verbose-sil %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen -emit-verbose-sil %s | %FileCheck %s // Test top-level/module locations. class TopLevelObjectTy { diff --git a/test/SILGen/specialize_attr.swift b/test/SILGen/specialize_attr.swift index 6a3d2a9755e2d..cf6ace21d7065 100644 --- a/test/SILGen/specialize_attr.swift +++ b/test/SILGen/specialize_attr.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -emit-verbose-sil %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -emit-verbose-sil %s | %FileCheck %s // CHECK-LABEL: @_specialize(Int, Float) // CHECK-NEXT: func specializeThis(_ t: T, u: U) diff --git a/test/SILGen/statements.swift b/test/SILGen/statements.swift index 98f8a3d6bdf70..d35bcd95f35b4 100644 --- a/test/SILGen/statements.swift +++ b/test/SILGen/statements.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -parse-as-library -emit-silgen -verify %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -parse-as-library -emit-silgen -verify %s | %FileCheck %s class MyClass { func foo() { } diff --git a/test/SILGen/struct_resilience.swift b/test/SILGen/struct_resilience.swift index 88458a6d807b2..831143beab959 100644 --- a/test/SILGen/struct_resilience.swift +++ b/test/SILGen/struct_resilience.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-silgen -enable-resilience %s | FileCheck %s +// RUN: %target-swift-frontend -I %S/../Inputs -enable-source-import -emit-silgen -enable-resilience %s | %FileCheck %s import resilient_struct diff --git a/test/SILGen/super.swift b/test/SILGen/super.swift index c40802597abb2..9072cb754a7e8 100644 --- a/test/SILGen/super.swift +++ b/test/SILGen/super.swift @@ -2,7 +2,7 @@ // RUN: mkdir %t // RUN: %target-swift-frontend -I %t -emit-module -emit-module-path=%t/resilient_struct.swiftmodule -module-name resilient_struct %S/../Inputs/resilient_struct.swift // RUN: %target-swift-frontend -I %t -emit-module -emit-module-path=%t/resilient_class.swiftmodule -module-name resilient_class %S/../Inputs/resilient_class.swift -// RUN: %target-swift-frontend -emit-silgen -parse-as-library -I %t %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -parse-as-library -I %t %s | %FileCheck %s import resilient_class diff --git a/test/SILGen/super_init_refcounting.swift b/test/SILGen/super_init_refcounting.swift index aac7e2ce8385d..8f589c0c2b8e1 100644 --- a/test/SILGen/super_init_refcounting.swift +++ b/test/SILGen/super_init_refcounting.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class Foo { init() {} diff --git a/test/SILGen/super_objc_class_method.swift b/test/SILGen/super_objc_class_method.swift index 80fb13e709332..9815cb231e548 100644 --- a/test/SILGen/super_objc_class_method.swift +++ b/test/SILGen/super_objc_class_method.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/switch.swift b/test/SILGen/switch.swift index abc483485e68f..5b17e52610275 100644 --- a/test/SILGen/switch.swift +++ b/test/SILGen/switch.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/SILGen/switch_abstraction.swift b/test/SILGen/switch_abstraction.swift index 4627535e9cff5..b802195559ac3 100644 --- a/test/SILGen/switch_abstraction.swift +++ b/test/SILGen/switch_abstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -parse-stdlib %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -parse-stdlib %s | %FileCheck %s struct A {} diff --git a/test/SILGen/switch_fallthrough.swift b/test/SILGen/switch_fallthrough.swift index 611a3c409f065..62568fe7230c6 100644 --- a/test/SILGen/switch_fallthrough.swift +++ b/test/SILGen/switch_fallthrough.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // Some fake predicates for pattern guards. func runced() -> Bool { return true } diff --git a/test/SILGen/switch_isa.swift b/test/SILGen/switch_isa.swift index db2ff53ae885e..e8938db5191cd 100644 --- a/test/SILGen/switch_isa.swift +++ b/test/SILGen/switch_isa.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/SILGen/switch_objc.swift b/test/SILGen/switch_objc.swift index 4fd1c92551246..1752bed18af00 100644 --- a/test/SILGen/switch_objc.swift +++ b/test/SILGen/switch_objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-silgen %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/switch_var.swift b/test/SILGen/switch_var.swift index 3341399f8cc91..35ec8e7844839 100644 --- a/test/SILGen/switch_var.swift +++ b/test/SILGen/switch_var.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // TODO: Implement tuple equality in the library. // BLOCKED: diff --git a/test/SILGen/toplevel.swift b/test/SILGen/toplevel.swift index 5def6ba28fa08..68b12ba333ff4 100644 --- a/test/SILGen/toplevel.swift +++ b/test/SILGen/toplevel.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/SILGen/toplevel_errors.swift b/test/SILGen/toplevel_errors.swift index 7bf0580e7fa9a..081edbe56150c 100644 --- a/test/SILGen/toplevel_errors.swift +++ b/test/SILGen/toplevel_errors.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s enum MyError : Error { case A, B diff --git a/test/SILGen/transparent_attribute.swift b/test/SILGen/transparent_attribute.swift index ac3ead0b11e74..f87beccc50423 100644 --- a/test/SILGen/transparent_attribute.swift +++ b/test/SILGen/transparent_attribute.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -emit-verbose-sil %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -emit-verbose-sil %s | %FileCheck %s // Test if 'transparent' attribute gets propagated correctly to apply instructions. diff --git a/test/SILGen/tuples.swift b/test/SILGen/tuples.swift index 6ca0be6286489..5b79f51e1b9a8 100644 --- a/test/SILGen/tuples.swift +++ b/test/SILGen/tuples.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class C {} enum Foo { diff --git a/test/SILGen/types.swift b/test/SILGen/types.swift index 6224fbf932007..a5ecba753cdfb 100644 --- a/test/SILGen/types.swift +++ b/test/SILGen/types.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | %FileCheck %s class C { var member: Int = 0 diff --git a/test/SILGen/unicode_scalar_concat.swift b/test/SILGen/unicode_scalar_concat.swift index 4dc8373b25414..b422a44ddb32c 100644 --- a/test/SILGen/unicode_scalar_concat.swift +++ b/test/SILGen/unicode_scalar_concat.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // Check that string literals that are unicode scalar literals // are emitted as string_literal instead of integers. diff --git a/test/SILGen/unmanaged.swift b/test/SILGen/unmanaged.swift index a1a953ece24e1..e27a0d38ddb54 100644 --- a/test/SILGen/unmanaged.swift +++ b/test/SILGen/unmanaged.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil %s | %FileCheck %s class C {} diff --git a/test/SILGen/unowned.swift b/test/SILGen/unowned.swift index 67684665ea2cc..9d2e278a24019 100644 --- a/test/SILGen/unowned.swift +++ b/test/SILGen/unowned.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func takeClosure(_ fn: () -> Int) {} diff --git a/test/SILGen/vtable_thunks.swift b/test/SILGen/vtable_thunks.swift index affb56a478b6c..5ec7532fd5437 100644 --- a/test/SILGen/vtable_thunks.swift +++ b/test/SILGen/vtable_thunks.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -emit-silgen -I %S/Inputs -enable-source-import %s -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -emit-silgen -I %S/Inputs -enable-source-import %s -disable-objc-attr-requires-foundation-module | %FileCheck %s protocol AddrOnly {} diff --git a/test/SILGen/vtable_thunks_reabstraction_final.swift b/test/SILGen/vtable_thunks_reabstraction_final.swift index c8f3ad851c9bc..c28a42957e9cd 100644 --- a/test/SILGen/vtable_thunks_reabstraction_final.swift +++ b/test/SILGen/vtable_thunks_reabstraction_final.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol Fooable { func foo(_ x: Int) -> Int? diff --git a/test/SILGen/vtables.swift b/test/SILGen/vtables.swift index 9cf30c5d615dd..35ca425dff563 100644 --- a/test/SILGen/vtables.swift +++ b/test/SILGen/vtables.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -emit-silgen -I %S/Inputs -enable-source-import %s -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -emit-silgen -I %S/Inputs -enable-source-import %s -disable-objc-attr-requires-foundation-module | %FileCheck %s // FIXME: rdar://problem/19648117 Needs splitting objc parts out // XFAIL: linux diff --git a/test/SILGen/weak.swift b/test/SILGen/weak.swift index 16c8b246ef908..03d976170db4d 100644 --- a/test/SILGen/weak.swift +++ b/test/SILGen/weak.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s class C { func f() -> Int { return 42 } diff --git a/test/SILGen/witness_same_type.swift b/test/SILGen/witness_same_type.swift index 8a8da2ad42e36..99c4d1e65df10 100644 --- a/test/SILGen/witness_same_type.swift +++ b/test/SILGen/witness_same_type.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol Fooable { associatedtype Bar diff --git a/test/SILGen/witness_single_tuple.swift b/test/SILGen/witness_single_tuple.swift index 03e1d67359b4e..3ba022afdf33c 100644 --- a/test/SILGen/witness_single_tuple.swift +++ b/test/SILGen/witness_single_tuple.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol Runcible { func runce(x: Int) diff --git a/test/SILGen/witness_tables.swift b/test/SILGen/witness_tables.swift index 31d7ebbe2627e..590dd14bdcac9 100644 --- a/test/SILGen/witness_tables.swift +++ b/test/SILGen/witness_tables.swift @@ -1,10 +1,10 @@ // RUN: %target-swift-frontend -emit-silgen -I %S/Inputs -enable-source-import %s -disable-objc-attr-requires-foundation-module > %t.sil -// RUN: FileCheck -check-prefix=TABLE -check-prefix=TABLE-ALL %s < %t.sil -// RUN: FileCheck -check-prefix=SYMBOL %s < %t.sil +// RUN: %FileCheck -check-prefix=TABLE -check-prefix=TABLE-ALL %s < %t.sil +// RUN: %FileCheck -check-prefix=SYMBOL %s < %t.sil // RUN: %target-swift-frontend -emit-silgen -I %S/Inputs -enable-source-import %s -disable-objc-attr-requires-foundation-module -enable-testing > %t.testable.sil -// RUN: FileCheck -check-prefix=TABLE-TESTABLE -check-prefix=TABLE-ALL %s < %t.testable.sil -// RUN: FileCheck -check-prefix=SYMBOL-TESTABLE %s < %t.testable.sil +// RUN: %FileCheck -check-prefix=TABLE-TESTABLE -check-prefix=TABLE-ALL %s < %t.testable.sil +// RUN: %FileCheck -check-prefix=SYMBOL-TESTABLE %s < %t.testable.sil import witness_tables_b diff --git a/test/SILGen/witness_tables_multifile.swift b/test/SILGen/witness_tables_multifile.swift index 05e88fb460462..4c447a3c5e143 100644 --- a/test/SILGen/witness_tables_multifile.swift +++ b/test/SILGen/witness_tables_multifile.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/witness_tables_multifile_2.swift | FileCheck %s -check-prefix=CHECK-FIRST-FILE -// RUN: %target-swift-frontend -emit-silgen %s -primary-file %S/Inputs/witness_tables_multifile_2.swift | FileCheck %S/Inputs/witness_tables_multifile_2.swift -check-prefix=CHECK-SECOND-FILE +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/witness_tables_multifile_2.swift | %FileCheck %s -check-prefix=CHECK-FIRST-FILE +// RUN: %target-swift-frontend -emit-silgen %s -primary-file %S/Inputs/witness_tables_multifile_2.swift | %FileCheck %S/Inputs/witness_tables_multifile_2.swift -check-prefix=CHECK-SECOND-FILE protocol InheritsFooable : Fooable {} diff --git a/test/SILGen/witnesses.swift b/test/SILGen/witnesses.swift index 2e032d05c7059..cff0d5e50bb00 100644 --- a/test/SILGen/witnesses.swift +++ b/test/SILGen/witnesses.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s -disable-objc-attr-requires-foundation-module | %FileCheck %s infix operator <~> {} diff --git a/test/SILGen/witnesses_canonical.swift b/test/SILGen/witnesses_canonical.swift index 9a85542654502..a23d0f9c9b612 100644 --- a/test/SILGen/witnesses_canonical.swift +++ b/test/SILGen/witnesses_canonical.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // rdar://problem/20714534 -- we need to canonicalize an associated type's // protocols when emitting witness method table for a conformance. diff --git a/test/SILGen/witnesses_class.swift b/test/SILGen/witnesses_class.swift index c732f2aac5af1..2f212ed843f6c 100644 --- a/test/SILGen/witnesses_class.swift +++ b/test/SILGen/witnesses_class.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol Fooable: class { func foo() diff --git a/test/SILGen/witnesses_inheritance.swift b/test/SILGen/witnesses_inheritance.swift index 9d89ba21a331c..150990cd771ad 100644 --- a/test/SILGen/witnesses_inheritance.swift +++ b/test/SILGen/witnesses_inheritance.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol Fooable { func foo() diff --git a/test/SILGen/witnesses_refinement.swift b/test/SILGen/witnesses_refinement.swift index a69295bba3e09..2bbe412f608ce 100644 --- a/test/SILGen/witnesses_refinement.swift +++ b/test/SILGen/witnesses_refinement.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol Saturable: Comparable { func saturated(max: Self) -> Self diff --git a/test/SILGen/writeback.swift b/test/SILGen/writeback.swift index 77f15d8f3ecee..60ecd332099af 100644 --- a/test/SILGen/writeback.swift +++ b/test/SILGen/writeback.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s struct Foo { mutating // used to test writeback. diff --git a/test/SILOptimizer/DestructorAnalysis.swift b/test/SILOptimizer/DestructorAnalysis.swift index ed0822a9726db..60ba39c29064b 100644 --- a/test/SILOptimizer/DestructorAnalysis.swift +++ b/test/SILOptimizer/DestructorAnalysis.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil %s -Xllvm -debug-only=destructor-analysis 2>&1 | FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s -Xllvm -debug-only=destructor-analysis 2>&1 | %FileCheck %s // This test depends on asserts because we look at debug output. // REQUIRES: asserts diff --git a/test/SILOptimizer/abcopts.sil b/test/SILOptimizer/abcopts.sil index 7e82302c1e172..144a18dc1e91e 100644 --- a/test/SILOptimizer/abcopts.sil +++ b/test/SILOptimizer/abcopts.sil @@ -1,6 +1,6 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -loop-rotate -dce -simplify-cfg -abcopts -enable-abcopts=1 %s | FileCheck %s -// RUN: %target-sil-opt -enable-sil-verify-all -loop-rotate -dce -simplify-cfg -abcopts -dce -enable-abcopts -enable-abc-hoisting %s | FileCheck %s --check-prefix=HOIST -// RUN: %target-sil-opt -enable-sil-verify-all -abcopts %s | FileCheck %s --check-prefix=RANGECHECK +// RUN: %target-sil-opt -enable-sil-verify-all -loop-rotate -dce -simplify-cfg -abcopts -enable-abcopts=1 %s | %FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -loop-rotate -dce -simplify-cfg -abcopts -dce -enable-abcopts -enable-abc-hoisting %s | %FileCheck %s --check-prefix=HOIST +// RUN: %target-sil-opt -enable-sil-verify-all -abcopts %s | %FileCheck %s --check-prefix=RANGECHECK sil_stage canonical diff --git a/test/SILOptimizer/alias-crash.sil b/test/SILOptimizer/alias-crash.sil index 9dce07cae1a1d..d45aa0fe33c67 100644 --- a/test/SILOptimizer/alias-crash.sil +++ b/test/SILOptimizer/alias-crash.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -redundant-load-elim | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -redundant-load-elim | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/allocbox_to_stack.sil b/test/SILOptimizer/allocbox_to_stack.sil index 4932a573e57c2..d138cd067c842 100644 --- a/test/SILOptimizer/allocbox_to_stack.sil +++ b/test/SILOptimizer/allocbox_to_stack.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -allocbox-to-stack | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -allocbox-to-stack | %FileCheck %s import Builtin diff --git a/test/SILOptimizer/allocbox_to_stack_with_false.swift b/test/SILOptimizer/allocbox_to_stack_with_false.swift index 273c0eb65cf5e..1f85f27328178 100644 --- a/test/SILOptimizer/allocbox_to_stack_with_false.swift +++ b/test/SILOptimizer/allocbox_to_stack_with_false.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil %s -verify | FileCheck %s +// RUN: %target-swift-frontend -emit-sil %s -verify | %FileCheck %s // Make sure that materializations of computed properties such as 'false' and // 'true' don't leave needless stack allocations. diff --git a/test/SILOptimizer/always_inline.sil b/test/SILOptimizer/always_inline.sil index 20dfa4c6a3340..9dcb6885d0772 100644 --- a/test/SILOptimizer/always_inline.sil +++ b/test/SILOptimizer/always_inline.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -inline -dce -sil-inline-threshold=1 | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -inline -dce -sil-inline-threshold=1 | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/arcsequenceopts.sil b/test/SILOptimizer/arcsequenceopts.sil index 17e25f80eb018..c2e5b2a2e1aad 100644 --- a/test/SILOptimizer/arcsequenceopts.sil +++ b/test/SILOptimizer/arcsequenceopts.sil @@ -1,6 +1,6 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -enable-loop-arc=0 -arc-sequence-opts %s | FileCheck %s -// RUN: %target-sil-opt -enable-sil-verify-all -enable-loop-arc=1 -arc-sequence-opts %s | FileCheck -check-prefix=CHECK -check-prefix=CHECK-LOOP %s -// RUN: %target-sil-opt -enable-sil-verify-all -arc-loop-opts %s | FileCheck -check-prefix=CHECK -check-prefix=CHECK-LOOP %s +// RUN: %target-sil-opt -enable-sil-verify-all -enable-loop-arc=0 -arc-sequence-opts %s | %FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -enable-loop-arc=1 -arc-sequence-opts %s | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-LOOP %s +// RUN: %target-sil-opt -enable-sil-verify-all -arc-loop-opts %s | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-LOOP %s sil_stage canonical diff --git a/test/SILOptimizer/arcsequenceopts_casts.sil b/test/SILOptimizer/arcsequenceopts_casts.sil index 934a6500fd3f8..d182cd32f02ec 100644 --- a/test/SILOptimizer/arcsequenceopts_casts.sil +++ b/test/SILOptimizer/arcsequenceopts_casts.sil @@ -1,5 +1,5 @@ -// RUN: %target-sil-opt -module-name Swift -enable-sil-verify-all -arc-sequence-opts -enable-loop-arc=0 %s | FileCheck %s -// RUN: %target-sil-opt -module-name Swift -enable-sil-verify-all -arc-sequence-opts -enable-loop-arc=1 %s | FileCheck %s +// RUN: %target-sil-opt -module-name Swift -enable-sil-verify-all -arc-sequence-opts -enable-loop-arc=0 %s | %FileCheck %s +// RUN: %target-sil-opt -module-name Swift -enable-sil-verify-all -arc-sequence-opts -enable-loop-arc=1 %s | %FileCheck %s import Builtin diff --git a/test/SILOptimizer/arcsequenceopts_loops.sil b/test/SILOptimizer/arcsequenceopts_loops.sil index b4d1cc2630c20..457f9aae156d3 100644 --- a/test/SILOptimizer/arcsequenceopts_loops.sil +++ b/test/SILOptimizer/arcsequenceopts_loops.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -enable-loop-arc=1 -arc-sequence-opts %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -enable-loop-arc=1 -arc-sequence-opts %s | %FileCheck %s ////////////////// // Declarations // diff --git a/test/SILOptimizer/arcsequenceopts_loops.sil.gyb b/test/SILOptimizer/arcsequenceopts_loops.sil.gyb index 3c78a3f9b21f9..9466cf1bd5f7d 100644 --- a/test/SILOptimizer/arcsequenceopts_loops.sil.gyb +++ b/test/SILOptimizer/arcsequenceopts_loops.sil.gyb @@ -2,7 +2,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %gyb %s > %t/arc-sequence-opts-loops.sil -// RUN: %target-sil-opt -enable-sil-verify-all -arc-sequence-opts %t/arc-sequence-opts-loops.sil -enable-loop-arc=0 | FileCheck %t/arc-sequence-opts-loops.sil +// RUN: %target-sil-opt -enable-sil-verify-all -arc-sequence-opts %t/arc-sequence-opts-loops.sil -enable-loop-arc=0 | %FileCheck %t/arc-sequence-opts-loops.sil %# Ignore the following admonition; it applies to the resulting .sil %# test file only. diff --git a/test/SILOptimizer/arcsequenceopts_rcidentityanalysis.sil b/test/SILOptimizer/arcsequenceopts_rcidentityanalysis.sil index fc6ccbb578631..ff4be5944a2f7 100644 --- a/test/SILOptimizer/arcsequenceopts_rcidentityanalysis.sil +++ b/test/SILOptimizer/arcsequenceopts_rcidentityanalysis.sil @@ -1,5 +1,5 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -enable-loop-arc=0 -arc-sequence-opts %s | FileCheck %s -// RUN: %target-sil-opt -enable-sil-verify-all -enable-loop-arc=1 -arc-sequence-opts %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -enable-loop-arc=0 -arc-sequence-opts %s | %FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -enable-loop-arc=1 -arc-sequence-opts %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/arcsequenceopts_uniquecheck.sil b/test/SILOptimizer/arcsequenceopts_uniquecheck.sil index 72d94dae56438..ff83d6b27f5f0 100644 --- a/test/SILOptimizer/arcsequenceopts_uniquecheck.sil +++ b/test/SILOptimizer/arcsequenceopts_uniquecheck.sil @@ -1,5 +1,5 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -enable-loop-arc=0 -arc-sequence-opts %s | FileCheck %s -// RUN: %target-sil-opt -enable-sil-verify-all -enable-loop-arc=1 -arc-sequence-opts %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -enable-loop-arc=0 -arc-sequence-opts %s | %FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -enable-loop-arc=1 -arc-sequence-opts %s | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/array_count_propagation.sil b/test/SILOptimizer/array_count_propagation.sil index 96d9fac3bbe56..298ecb597432c 100644 --- a/test/SILOptimizer/array_count_propagation.sil +++ b/test/SILOptimizer/array_count_propagation.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -array-count-propagation %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -array-count-propagation %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/array_element_propagation.sil b/test/SILOptimizer/array_element_propagation.sil index 0ab18edde0593..7245819fb1d6a 100644 --- a/test/SILOptimizer/array_element_propagation.sil +++ b/test/SILOptimizer/array_element_propagation.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -array-element-propagation %s | FileCheck %s +// RUN: %target-sil-opt -array-element-propagation %s | %FileCheck %s sil_stage canonical import Builtin diff --git a/test/SILOptimizer/array_mutable_assertonly.swift b/test/SILOptimizer/array_mutable_assertonly.swift index 8cc99e7915942..bb69f28e3d1ff 100644 --- a/test/SILOptimizer/array_mutable_assertonly.swift +++ b/test/SILOptimizer/array_mutable_assertonly.swift @@ -1,16 +1,16 @@ -// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | FileCheck %s --check-prefix=TEST1 -// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | FileCheck %s --check-prefix=TEST2 -// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | FileCheck %s --check-prefix=TEST3 -// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | FileCheck %s --check-prefix=TEST4 -// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | FileCheck %s --check-prefix=TEST5 -// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | FileCheck %s --check-prefix=TEST6 -// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | FileCheck %s --check-prefix=TEST7 -// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | FileCheck %s --check-prefix=TEST8 -// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | FileCheck %s --check-prefix=TEST9 -// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | FileCheck %s --check-prefix=TEST10 -// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | FileCheck %s --check-prefix=TEST11 -// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | FileCheck %s --check-prefix=TEST12 -// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | FileCheck %s --check-prefix=TEST13 +// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | %FileCheck %s --check-prefix=TEST1 +// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | %FileCheck %s --check-prefix=TEST2 +// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | %FileCheck %s --check-prefix=TEST3 +// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | %FileCheck %s --check-prefix=TEST4 +// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | %FileCheck %s --check-prefix=TEST5 +// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | %FileCheck %s --check-prefix=TEST6 +// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | %FileCheck %s --check-prefix=TEST7 +// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | %FileCheck %s --check-prefix=TEST8 +// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | %FileCheck %s --check-prefix=TEST9 +// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | %FileCheck %s --check-prefix=TEST10 +// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | %FileCheck %s --check-prefix=TEST11 +// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | %FileCheck %s --check-prefix=TEST12 +// RUN: %target-swift-frontend -O -emit-sil -Xllvm -debug-only=cowarray-opts -primary-file %s 2>&1 | %FileCheck %s --check-prefix=TEST13 // REQUIRES: asserts,swift_stdlib_no_asserts,optimized_stdlib // TEST1-LABEL: COW Array Opts in Func {{.*}}inoutarr{{.*}} diff --git a/test/SILOptimizer/assert_configuration.sil b/test/SILOptimizer/assert_configuration.sil index d1f98440c5ed6..6aaa449e77619 100644 --- a/test/SILOptimizer/assert_configuration.sil +++ b/test/SILOptimizer/assert_configuration.sil @@ -1,6 +1,6 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -diagnostic-constant-propagation -assert-conf-id 1 | FileCheck %s --check-prefix=ONE -// RUN: %target-sil-opt -enable-sil-verify-all %s -diagnostic-constant-propagation -assert-conf-id 4294967295 | FileCheck %s --check-prefix=DISABLED -// RUN: %target-sil-opt -enable-sil-verify-all %s -performance-constant-propagation -assert-conf-id 1 | FileCheck %s --check-prefix=PERFONE +// RUN: %target-sil-opt -enable-sil-verify-all %s -diagnostic-constant-propagation -assert-conf-id 1 | %FileCheck %s --check-prefix=ONE +// RUN: %target-sil-opt -enable-sil-verify-all %s -diagnostic-constant-propagation -assert-conf-id 4294967295 | %FileCheck %s --check-prefix=DISABLED +// RUN: %target-sil-opt -enable-sil-verify-all %s -performance-constant-propagation -assert-conf-id 1 | %FileCheck %s --check-prefix=PERFONE import Builtin diff --git a/test/SILOptimizer/basic-aa.sil b/test/SILOptimizer/basic-aa.sil index bb1f0d2137900..358ab975fc401 100644 --- a/test/SILOptimizer/basic-aa.sil +++ b/test/SILOptimizer/basic-aa.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -module-name Swift %s -aa=basic-aa -aa-dump -o /dev/null | FileCheck %s +// RUN: %target-sil-opt -module-name Swift %s -aa=basic-aa -aa-dump -o /dev/null | %FileCheck %s // REQUIRES: asserts diff --git a/test/SILOptimizer/basic-callee-printer.sil b/test/SILOptimizer/basic-callee-printer.sil index 5766c40edcee1..4a73e7c3e4a3e 100644 --- a/test/SILOptimizer/basic-callee-printer.sil +++ b/test/SILOptimizer/basic-callee-printer.sil @@ -1,5 +1,5 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -basic-callee-printer -o /dev/null | FileCheck --check-prefix=CHECK --check-prefix=CHECK-NOWMO %s -// RUN: %target-sil-opt -enable-sil-verify-all %s -wmo -basic-callee-printer -o /dev/null | FileCheck --check-prefix=CHECK --check-prefix=CHECK-WMO %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -basic-callee-printer -o /dev/null | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-NOWMO %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -wmo -basic-callee-printer -o /dev/null | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-WMO %s sil_stage canonical diff --git a/test/SILOptimizer/basic-instruction-properties.sil b/test/SILOptimizer/basic-instruction-properties.sil index 69ac85bf8b1d7..f5540c439f128 100644 --- a/test/SILOptimizer/basic-instruction-properties.sil +++ b/test/SILOptimizer/basic-instruction-properties.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s -basic-instruction-property-dump -o /dev/null | FileCheck %s +// RUN: %target-sil-opt %s -basic-instruction-property-dump -o /dev/null | %FileCheck %s // REQUIRES: asserts diff --git a/test/SILOptimizer/bridged_casts_folding.swift b/test/SILOptimizer/bridged_casts_folding.swift index e3d60429af200..da0f6bef2612e 100644 --- a/test/SILOptimizer/bridged_casts_folding.swift +++ b/test/SILOptimizer/bridged_casts_folding.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILOptimizer/bridging_checked_cast.sil b/test/SILOptimizer/bridging_checked_cast.sil index 2c3ca97afe0b2..59434fa49e4cb 100644 --- a/test/SILOptimizer/bridging_checked_cast.sil +++ b/test/SILOptimizer/bridging_checked_cast.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -inline %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -inline %s | %FileCheck %s // REQUIRES: objc_interop import Swift diff --git a/test/SILOptimizer/caller_analysis_printer.sil b/test/SILOptimizer/caller_analysis_printer.sil index 657fa3bb2eb27..14b23aeaee1f0 100644 --- a/test/SILOptimizer/caller_analysis_printer.sil +++ b/test/SILOptimizer/caller_analysis_printer.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -caller-analysis-printer -o /dev/null | FileCheck --check-prefix=CHECK %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -caller-analysis-printer -o /dev/null | %FileCheck --check-prefix=CHECK %s // CHECK: Function dead_func has caller: false // CHECK: Function call_top has caller: false diff --git a/test/SILOptimizer/canonicalize_switch_enum.sil b/test/SILOptimizer/canonicalize_switch_enum.sil index 8b1de4ebd21aa..7a2d9fc9a868e 100644 --- a/test/SILOptimizer/canonicalize_switch_enum.sil +++ b/test/SILOptimizer/canonicalize_switch_enum.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-cfg | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-cfg | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/capture_promotion.sil b/test/SILOptimizer/capture_promotion.sil index 4674eceead552..08576a8f113ad 100644 --- a/test/SILOptimizer/capture_promotion.sil +++ b/test/SILOptimizer/capture_promotion.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -capture-promotion | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -capture-promotion | %FileCheck %s // Check to make sure that the process of promoting closure captures results in // a correctly cloned and modified closure function body. This test diff --git a/test/SILOptimizer/capture_promotion.swift b/test/SILOptimizer/capture_promotion.swift index 6fd1949dfa183..ede4990a3b479 100644 --- a/test/SILOptimizer/capture_promotion.swift +++ b/test/SILOptimizer/capture_promotion.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-sil -o - -verify | FileCheck %s +// RUN: %target-swift-frontend %s -emit-sil -o - -verify | %FileCheck %s class Foo { func foo() -> Int { diff --git a/test/SILOptimizer/capture_promotion_reachability.sil b/test/SILOptimizer/capture_promotion_reachability.sil index b336f54181e0c..a5be1c6899755 100644 --- a/test/SILOptimizer/capture_promotion_reachability.sil +++ b/test/SILOptimizer/capture_promotion_reachability.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -capture-promotion | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -capture-promotion | %FileCheck %s sil_stage raw diff --git a/test/SILOptimizer/capture_propagation.sil b/test/SILOptimizer/capture_propagation.sil index 88d23535cafd7..6d966a152695c 100644 --- a/test/SILOptimizer/capture_propagation.sil +++ b/test/SILOptimizer/capture_propagation.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -capture-prop | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -capture-prop | %FileCheck %s // Check the CapturePropagation specialized the reabstraction thunk. diff --git a/test/SILOptimizer/capture_propagation_linkage.swift b/test/SILOptimizer/capture_propagation_linkage.swift index 3d26b7df9bd02..0af62239fd3a8 100644 --- a/test/SILOptimizer/capture_propagation_linkage.swift +++ b/test/SILOptimizer/capture_propagation_linkage.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift %S/Inputs/capture_propagation_linkage/main.swift %s -O -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s +// RUN: %target-run %t/a.out | %FileCheck %s // REQUIRES: executable_test // CHECK: test ok diff --git a/test/SILOptimizer/cast_folding.swift b/test/SILOptimizer/cast_folding.swift index ffdb0f2a288bd..b715591bc9b8e 100644 --- a/test/SILOptimizer/cast_folding.swift +++ b/test/SILOptimizer/cast_folding.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s // We want to check two things here: // - Correctness // - That certain "is" checks are eliminated based on static analysis at compile-time diff --git a/test/SILOptimizer/cast_folding_no_bridging.sil b/test/SILOptimizer/cast_folding_no_bridging.sil index 5791961a41ea8..49ce87a5db9b5 100644 --- a/test/SILOptimizer/cast_folding_no_bridging.sil +++ b/test/SILOptimizer/cast_folding_no_bridging.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s // REQUIRES: objc_interop // We want to check that casts between two types which are both Swift types or diff --git a/test/SILOptimizer/cast_folding_objc.swift b/test/SILOptimizer/cast_folding_objc.swift index 2324626415ebe..7e73815378beb 100644 --- a/test/SILOptimizer/cast_folding_objc.swift +++ b/test/SILOptimizer/cast_folding_objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass="Function Signature Optimization" -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass="Function Signature Optimization" -emit-sil %s | %FileCheck %s // We want to check two things here: // - Correctness // - That certain "is" checks are eliminated based on static analysis at compile-time diff --git a/test/SILOptimizer/cast_folding_objc_generics.swift b/test/SILOptimizer/cast_folding_objc_generics.swift index 25d2ae099e3ff..4550731a17bdc 100644 --- a/test/SILOptimizer/cast_folding_objc_generics.swift +++ b/test/SILOptimizer/cast_folding_objc_generics.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -O -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -O -emit-sil %s | %FileCheck %s // REQUIRES: objc_interop import objc_generics diff --git a/test/SILOptimizer/cast_folding_objc_no_foundation.swift b/test/SILOptimizer/cast_folding_objc_no_foundation.swift index 5e2c43a5f6dc6..870981045ac66 100644 --- a/test/SILOptimizer/cast_folding_objc_no_foundation.swift +++ b/test/SILOptimizer/cast_folding_objc_no_foundation.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -O -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -O -emit-sil %s | %FileCheck %s // REQUIRES: objc_interop // TODO: Update optimizer for id-as-Any changes. diff --git a/test/SILOptimizer/cast_foldings.sil b/test/SILOptimizer/cast_foldings.sil index 06f06df7c0922..d1294d006a62c 100644 --- a/test/SILOptimizer/cast_foldings.sil +++ b/test/SILOptimizer/cast_foldings.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -sil-combine %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -sil-combine %s | %FileCheck %s import Swift diff --git a/test/SILOptimizer/cast_promote.sil b/test/SILOptimizer/cast_promote.sil index 9f296987ae77f..529c5d8c65363 100644 --- a/test/SILOptimizer/cast_promote.sil +++ b/test/SILOptimizer/cast_promote.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/closure_spec_and_inline.swift b/test/SILOptimizer/closure_spec_and_inline.swift index 0d4afbbed3ef3..cb4715328dd70 100644 --- a/test/SILOptimizer/closure_spec_and_inline.swift +++ b/test/SILOptimizer/closure_spec_and_inline.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -O -module-name=test %s -emit-sil | FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -O -module-name=test %s -emit-sil | %FileCheck %s func closure(_ a: Int, b: Int) -> Bool { return a < b diff --git a/test/SILOptimizer/closure_specialize.sil b/test/SILOptimizer/closure_specialize.sil index 88ed538e75c90..73e842c1e7185 100644 --- a/test/SILOptimizer/closure_specialize.sil +++ b/test/SILOptimizer/closure_specialize.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -closure-specialize %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -closure-specialize %s | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/closure_specialize_consolidated.sil b/test/SILOptimizer/closure_specialize_consolidated.sil index fccd253ceb608..89193f8765469 100644 --- a/test/SILOptimizer/closure_specialize_consolidated.sil +++ b/test/SILOptimizer/closure_specialize_consolidated.sil @@ -1,5 +1,5 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -closure-specialize %s | FileCheck %s -check-prefix=REMOVECLOSURES -// RUN: %target-sil-opt -enable-sil-verify-all -closure-specialize-eliminate-dead-closures=0 -closure-specialize %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -closure-specialize %s | %FileCheck %s -check-prefix=REMOVECLOSURES +// RUN: %target-sil-opt -enable-sil-verify-all -closure-specialize-eliminate-dead-closures=0 -closure-specialize %s | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/closure_specialize_simple.sil b/test/SILOptimizer/closure_specialize_simple.sil index 502be7a2d0f6c..9b4310bda044e 100644 --- a/test/SILOptimizer/closure_specialize_simple.sil +++ b/test/SILOptimizer/closure_specialize_simple.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -closure-specialize %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -closure-specialize %s | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/conditionforwarding.sil b/test/SILOptimizer/conditionforwarding.sil index 368c3305d7284..7b43416acfedf 100644 --- a/test/SILOptimizer/conditionforwarding.sil +++ b/test/SILOptimizer/conditionforwarding.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -condition-forwarding | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -condition-forwarding | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/const_fold_objc_bridge.sil b/test/SILOptimizer/const_fold_objc_bridge.sil index fac0d86df681d..147432c1db752 100644 --- a/test/SILOptimizer/const_fold_objc_bridge.sil +++ b/test/SILOptimizer/const_fold_objc_bridge.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -performance-constant-propagation | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -performance-constant-propagation | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILOptimizer/constant_propagation.sil b/test/SILOptimizer/constant_propagation.sil index 1466a9d14111a..ad62eb5dbd6ac 100644 --- a/test/SILOptimizer/constant_propagation.sil +++ b/test/SILOptimizer/constant_propagation.sil @@ -1,5 +1,5 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -diagnostic-constant-propagation | FileCheck %s -// RUN: %target-sil-opt -enable-sil-verify-all %s -performance-constant-propagation | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -diagnostic-constant-propagation | %FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -performance-constant-propagation | %FileCheck %s import Builtin diff --git a/test/SILOptimizer/copyforward.sil b/test/SILOptimizer/copyforward.sil index 5f8da1579d7a5..5e0259a14d5af 100644 --- a/test/SILOptimizer/copyforward.sil +++ b/test/SILOptimizer/copyforward.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -copy-forwarding -enable-copyforwarding -enable-destroyhoisting | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -copy-forwarding -enable-copyforwarding -enable-destroyhoisting | %FileCheck %s sil_stage canonical @@ -269,10 +269,10 @@ bb0(%0 : $*T): return %t : $() } -//CHECK-LABEL: xbranch +//CHECK-LABEL: branch //CHECK-NOT: copy_addr //CHECK: return -sil hidden @xbranch : $@convention(thin) (@in T, Bool) -> () { +sil hidden @branch : $@convention(thin) (@in T, Bool) -> () { bb0(%0 : $*T, %1 : $Bool): %2 = struct_extract %1 : $Bool, #Bool._value // user: %3 cond_br %2, bb1, bb2 // id: %3 diff --git a/test/SILOptimizer/cowarray_opt.sil b/test/SILOptimizer/cowarray_opt.sil index 9209470b54abc..d40da893ba1be 100644 --- a/test/SILOptimizer/cowarray_opt.sil +++ b/test/SILOptimizer/cowarray_opt.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -cowarray-opt %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -cowarray-opt %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/cropoverflow.sil b/test/SILOptimizer/cropoverflow.sil index d27cd376fb2c0..f53052479b613 100644 --- a/test/SILOptimizer/cropoverflow.sil +++ b/test/SILOptimizer/cropoverflow.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -remove-redundant-overflow-checks | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -remove-redundant-overflow-checks | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/cse.sil b/test/SILOptimizer/cse.sil index 3ac1f2a3f02cf..687e454bb38e1 100644 --- a/test/SILOptimizer/cse.sil +++ b/test/SILOptimizer/cse.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -cse | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -cse | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/cse_apply.sil b/test/SILOptimizer/cse_apply.sil index 9100a9ae6a5e8..477774a11e8ae 100644 --- a/test/SILOptimizer/cse_apply.sil +++ b/test/SILOptimizer/cse_apply.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -cse | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -cse | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/cse_objc.sil b/test/SILOptimizer/cse_objc.sil index eeb4a31b10af3..eebb43db472f3 100644 --- a/test/SILOptimizer/cse_objc.sil +++ b/test/SILOptimizer/cse_objc.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -cse | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -cse | %FileCheck %s // REQUIRES: objc_interop import Builtin diff --git a/test/SILOptimizer/dead_alloc_elim.sil b/test/SILOptimizer/dead_alloc_elim.sil index 15aa50361b4b7..ee6ffadc4f445 100644 --- a/test/SILOptimizer/dead_alloc_elim.sil +++ b/test/SILOptimizer/dead_alloc_elim.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -deadobject-elim %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -deadobject-elim %s | %FileCheck %s import Swift import Builtin diff --git a/test/SILOptimizer/dead_array_elim.sil b/test/SILOptimizer/dead_array_elim.sil index 6ac745a60c63a..4b5ad5b1c6868 100644 --- a/test/SILOptimizer/dead_array_elim.sil +++ b/test/SILOptimizer/dead_array_elim.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -deadobject-elim %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -deadobject-elim %s | %FileCheck %s // Linux doesn't have the same symbol name for _ArrayBuffer. // XFAIL: linux diff --git a/test/SILOptimizer/dead_code_elimination.sil b/test/SILOptimizer/dead_code_elimination.sil index 7cca374c6b6e9..6e57490f7e549 100644 --- a/test/SILOptimizer/dead_code_elimination.sil +++ b/test/SILOptimizer/dead_code_elimination.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -dce %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -dce %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/dead_func_init_method.sil b/test/SILOptimizer/dead_func_init_method.sil index 6d2dc2f805c93..7ecea975d7d0f 100644 --- a/test/SILOptimizer/dead_func_init_method.sil +++ b/test/SILOptimizer/dead_func_init_method.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -sil-deadfuncelim %s | FileCheck %s +// RUN: %target-sil-opt -sil-deadfuncelim %s | %FileCheck %s // Check that we don't crash on this. diff --git a/test/SILOptimizer/dead_function_elimination.swift b/test/SILOptimizer/dead_function_elimination.swift index afba3e8bc4d03..899f344ed6ec3 100644 --- a/test/SILOptimizer/dead_function_elimination.swift +++ b/test/SILOptimizer/dead_function_elimination.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend %s -O -emit-sil | FileCheck %s -// RUN: %target-swift-frontend %s -O -emit-sil -enable-testing | FileCheck -check-prefix=CHECK-TESTING %s +// RUN: %target-swift-frontend %s -O -emit-sil | %FileCheck %s +// RUN: %target-swift-frontend %s -O -emit-sil -enable-testing | %FileCheck -check-prefix=CHECK-TESTING %s // Check if cycles are removed. diff --git a/test/SILOptimizer/dead_inlined_func.swift b/test/SILOptimizer/dead_inlined_func.swift index 36d9fbcd37bd5..b1ef65061687d 100644 --- a/test/SILOptimizer/dead_inlined_func.swift +++ b/test/SILOptimizer/dead_inlined_func.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -O -g %s -emit-sil | FileCheck %s -check-prefix=CHECK-SIL -// RUN: %target-swift-frontend -O -g %s -sil-serialize-all -emit-ir | FileCheck %s -check-prefix=CHECK-IR +// RUN: %target-swift-frontend -O -g %s -emit-sil | %FileCheck %s -check-prefix=CHECK-SIL +// RUN: %target-swift-frontend -O -g %s -sil-serialize-all -emit-ir | %FileCheck %s -check-prefix=CHECK-IR // The dead inlined function should not be in the SIL // CHECK-SIL-NOT: sil {{.*}}to_be_inlined diff --git a/test/SILOptimizer/dead_internal_func.swift b/test/SILOptimizer/dead_internal_func.swift index 300e6a1b2ac46..5752c7f8923a9 100644 --- a/test/SILOptimizer/dead_internal_func.swift +++ b/test/SILOptimizer/dead_internal_func.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -O -emit-sil %s %S/Inputs/internal_func.swift | FileCheck %s -// RUN: %target-swift-frontend -O -enable-testing -emit-sil %s %S/Inputs/internal_func.swift | FileCheck -check-prefix=CHECK-TESTABLE %s +// RUN: %target-swift-frontend -O -emit-sil %s %S/Inputs/internal_func.swift | %FileCheck %s +// RUN: %target-swift-frontend -O -enable-testing -emit-sil %s %S/Inputs/internal_func.swift | %FileCheck -check-prefix=CHECK-TESTABLE %s // Check that an internal function from another file is removed after it gets // dead through inlining. diff --git a/test/SILOptimizer/dead_method.swift b/test/SILOptimizer/dead_method.swift index d169498cc5c03..a6799eb798e46 100644 --- a/test/SILOptimizer/dead_method.swift +++ b/test/SILOptimizer/dead_method.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -primary-file %s %S/Inputs/public_class.swift -parse-as-library -emit-sil | FileCheck %s +// RUN: %target-swift-frontend -O -primary-file %s %S/Inputs/public_class.swift -parse-as-library -emit-sil | %FileCheck %s private class Derived : Base { override func visible() { diff --git a/test/SILOptimizer/dead_store_elim.sil b/test/SILOptimizer/dead_store_elim.sil index 295398f824366..e658bec97b491 100644 --- a/test/SILOptimizer/dead_store_elim.sil +++ b/test/SILOptimizer/dead_store_elim.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s -dead-store-elim -max-partial-store-count=2 -enable-sil-verify-all | FileCheck %s +// RUN: %target-sil-opt %s -dead-store-elim -max-partial-store-count=2 -enable-sil-verify-all | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/dead_witness_module.swift b/test/SILOptimizer/dead_witness_module.swift index e2d4cfb2af10b..9fa32b19ec149 100644 --- a/test/SILOptimizer/dead_witness_module.swift +++ b/test/SILOptimizer/dead_witness_module.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend -Onone -parse-stdlib -parse-as-library -module-name TestModule -sil-serialize-all %S/Inputs/TestModule.swift -emit-module-path %t/TestModule.swiftmodule -// RUN: %target-swift-frontend -O %s -I %t -emit-sil | FileCheck %s +// RUN: %target-swift-frontend -O %s -I %t -emit-sil | %FileCheck %s // DeadFunctionElimination may not remove a method from a witness table which // is imported from another module. diff --git a/test/SILOptimizer/definite_init.sil b/test/SILOptimizer/definite_init.sil index 895e1dfd34e2d..edcaee8206da1 100644 --- a/test/SILOptimizer/definite_init.sil +++ b/test/SILOptimizer/definite_init.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -definite-init -verify | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -definite-init -verify | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/definite_init_crashes.sil b/test/SILOptimizer/definite_init_crashes.sil index 36dba6035046f..4e7fa505b9af4 100644 --- a/test/SILOptimizer/definite_init_crashes.sil +++ b/test/SILOptimizer/definite_init_crashes.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -definite-init | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -definite-init | %FileCheck %s // These are all regression tests to ensure that the memory promotion pass // doesn't crash. diff --git a/test/SILOptimizer/definite_init_failable_initializers.swift b/test/SILOptimizer/definite_init_failable_initializers.swift index c117289a43a4a..400235afcd356 100644 --- a/test/SILOptimizer/definite_init_failable_initializers.swift +++ b/test/SILOptimizer/definite_init_failable_initializers.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil -disable-objc-attr-requires-foundation-module %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil -disable-objc-attr-requires-foundation-module %s | %FileCheck %s // High-level tests that DI handles early returns from failable and throwing // initializers properly. The main complication is conditional release of self diff --git a/test/SILOptimizer/definite_init_objc_factory_init.swift b/test/SILOptimizer/definite_init_objc_factory_init.swift index a07efedd14d2f..0f9032822868e 100644 --- a/test/SILOptimizer/definite_init_objc_factory_init.swift +++ b/test/SILOptimizer/definite_init_objc_factory_init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/../IDE/Inputs/custom-modules %s -emit-sil | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/../IDE/Inputs/custom-modules %s -emit-sil | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILOptimizer/destructor_analysis.sil b/test/SILOptimizer/destructor_analysis.sil index 1e3ee623f70d0..3ccc7c87444bb 100644 --- a/test/SILOptimizer/destructor_analysis.sil +++ b/test/SILOptimizer/destructor_analysis.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -abcopts %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -abcopts %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/devirt_access.sil b/test/SILOptimizer/devirt_access.sil index 2c9c8b0382e21..bdd5a65dbccaa 100644 --- a/test/SILOptimizer/devirt_access.sil +++ b/test/SILOptimizer/devirt_access.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -devirtualizer | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -devirtualizer | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/devirt_access.swift b/test/SILOptimizer/devirt_access.swift index a3c55529c6711..87c6b2ad6b438 100644 --- a/test/SILOptimizer/devirt_access.swift +++ b/test/SILOptimizer/devirt_access.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-swift-frontend -emit-module -Onone -o %t %S/Inputs/devirt_access_other_module.swift -// RUN: %target-swift-frontend -O -primary-file %s %S/Inputs/devirt_access_helper.swift -I %t -emit-sil -sil-inline-threshold 1000 -sil-verify-all | FileCheck -check-prefix=WHOLE-MODULE %s -// RUN: %target-swift-frontend -O -primary-file %s %S/Inputs/devirt_access_helper.swift -I %t -emit-sil -sil-inline-threshold 1000 -sil-verify-all | FileCheck -check-prefix=PRIMARY-FILE %s +// RUN: %target-swift-frontend -O -primary-file %s %S/Inputs/devirt_access_helper.swift -I %t -emit-sil -sil-inline-threshold 1000 -sil-verify-all | %FileCheck -check-prefix=WHOLE-MODULE %s +// RUN: %target-swift-frontend -O -primary-file %s %S/Inputs/devirt_access_helper.swift -I %t -emit-sil -sil-inline-threshold 1000 -sil-verify-all | %FileCheck -check-prefix=PRIMARY-FILE %s import devirt_access_other_module diff --git a/test/SILOptimizer/devirt_access_other_module.swift b/test/SILOptimizer/devirt_access_other_module.swift index dea6075041c29..8d2f026851499 100644 --- a/test/SILOptimizer/devirt_access_other_module.swift +++ b/test/SILOptimizer/devirt_access_other_module.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil -O %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil -O %s | %FileCheck %s // Check that this file does not crash a compiler. // diff --git a/test/SILOptimizer/devirt_alloc_ref_dynamic.sil b/test/SILOptimizer/devirt_alloc_ref_dynamic.sil index aa59d11b339b7..586fcafb78860 100644 --- a/test/SILOptimizer/devirt_alloc_ref_dynamic.sil +++ b/test/SILOptimizer/devirt_alloc_ref_dynamic.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -devirtualizer -dce | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -devirtualizer -dce | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/devirt_archetype_method.swift b/test/SILOptimizer/devirt_archetype_method.swift index f10f7f0a1e720..5c88de5ad5c69 100644 --- a/test/SILOptimizer/devirt_archetype_method.swift +++ b/test/SILOptimizer/devirt_archetype_method.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil -primary-file %s | %FileCheck %s // We can't deserialize apply_inst with subst lists. When radar://14443304 // is fixed then we should convert this test to a SIL test. diff --git a/test/SILOptimizer/devirt_base_class.swift b/test/SILOptimizer/devirt_base_class.swift index 7ac4db033d34d..1a0850f61c13b 100644 --- a/test/SILOptimizer/devirt_base_class.swift +++ b/test/SILOptimizer/devirt_base_class.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s public class Base1 { @inline(never) func f() -> Int { return 0 } } diff --git a/test/SILOptimizer/devirt_concrete_subclass_of_generic_class.swift b/test/SILOptimizer/devirt_concrete_subclass_of_generic_class.swift index 1ea65c8ada4b6..0f0a6a733b3b9 100644 --- a/test/SILOptimizer/devirt_concrete_subclass_of_generic_class.swift +++ b/test/SILOptimizer/devirt_concrete_subclass_of_generic_class.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil -O %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil -O %s | %FileCheck %s // Check that devirtualizer can properly handle concrete non-generic subclasses // of generic classes. diff --git a/test/SILOptimizer/devirt_contravariant_args.swift b/test/SILOptimizer/devirt_contravariant_args.swift index c4c6ec9b7aafe..3a14528439dbe 100644 --- a/test/SILOptimizer/devirt_contravariant_args.swift +++ b/test/SILOptimizer/devirt_contravariant_args.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -primary-file %s -emit-sil -sil-inline-threshold 1000 -sil-verify-all | FileCheck %s +// RUN: %target-swift-frontend -O -primary-file %s -emit-sil -sil-inline-threshold 1000 -sil-verify-all | %FileCheck %s // Make sure that we can dig all the way through the class hierarchy and // protocol conformances. diff --git a/test/SILOptimizer/devirt_covariant_return.swift b/test/SILOptimizer/devirt_covariant_return.swift index bc77c1882afdb..9e31d165f8b44 100644 --- a/test/SILOptimizer/devirt_covariant_return.swift +++ b/test/SILOptimizer/devirt_covariant_return.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -O -Xllvm -disable-sil-cm-rr-cm=0 -primary-file %s -emit-sil -sil-inline-threshold 1000 -sil-verify-all | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -O -Xllvm -disable-sil-cm-rr-cm=0 -primary-file %s -emit-sil -sil-inline-threshold 1000 -sil-verify-all | %FileCheck %s // Make sure that we can dig all the way through the class hierarchy and // protocol conformances with covariant return types correctly. The verifier diff --git a/test/SILOptimizer/devirt_ctors.sil b/test/SILOptimizer/devirt_ctors.sil index 6806df95a38a6..9d9693a0e4867 100644 --- a/test/SILOptimizer/devirt_ctors.sil +++ b/test/SILOptimizer/devirt_ctors.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -inline -devirtualizer | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -inline -devirtualizer | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/devirt_default_case.swift b/test/SILOptimizer/devirt_default_case.swift index fafaad0cc1028..1aa71d4199792 100644 --- a/test/SILOptimizer/devirt_default_case.swift +++ b/test/SILOptimizer/devirt_default_case.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -O -module-name devirt_default_case -emit-sil %s | FileCheck -check-prefix=CHECK -check-prefix=CHECK-NORMAL %s -// RUN: %target-swift-frontend -O -module-name devirt_default_case -emit-sil -enable-testing %s | FileCheck -check-prefix=CHECK -check-prefix=CHECK-TESTABLE %s +// RUN: %target-swift-frontend -O -module-name devirt_default_case -emit-sil %s | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-NORMAL %s +// RUN: %target-swift-frontend -O -module-name devirt_default_case -emit-sil -enable-testing %s | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-TESTABLE %s @_silgen_name("action") func action(_ n:Int) -> () diff --git a/test/SILOptimizer/devirt_default_witness_method.sil b/test/SILOptimizer/devirt_default_witness_method.sil index e11633de71f16..703cdc2404fc9 100644 --- a/test/SILOptimizer/devirt_default_witness_method.sil +++ b/test/SILOptimizer/devirt_default_witness_method.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -enable-resilience | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -enable-resilience | %FileCheck %s sil_stage canonical import Builtin diff --git a/test/SILOptimizer/devirt_dependent_types.swift b/test/SILOptimizer/devirt_dependent_types.swift index a3ddfff6c9d24..81c2ceb7b3686 100644 --- a/test/SILOptimizer/devirt_dependent_types.swift +++ b/test/SILOptimizer/devirt_dependent_types.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil -O %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil -O %s | %FileCheck %s protocol Bar { associatedtype Element diff --git a/test/SILOptimizer/devirt_extension.swift b/test/SILOptimizer/devirt_extension.swift index 0ef203a15ae4a..1e4390c3194da 100644 --- a/test/SILOptimizer/devirt_extension.swift +++ b/test/SILOptimizer/devirt_extension.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s protocol DrawingElementDispatch {} diff --git a/test/SILOptimizer/devirt_inherited_conformance.swift b/test/SILOptimizer/devirt_inherited_conformance.swift index 4bc23301def4a..d3d1b3f5aac7f 100644 --- a/test/SILOptimizer/devirt_inherited_conformance.swift +++ b/test/SILOptimizer/devirt_inherited_conformance.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O %s -emit-sil | FileCheck %s +// RUN: %target-swift-frontend -O %s -emit-sil | %FileCheck %s // Make sure that we can dig all the way through the class hierarchy and // protocol conformances. diff --git a/test/SILOptimizer/devirt_jump_thread.sil b/test/SILOptimizer/devirt_jump_thread.sil index e6c36696ec89a..802b8c209c664 100644 --- a/test/SILOptimizer/devirt_jump_thread.sil +++ b/test/SILOptimizer/devirt_jump_thread.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-cfg -cse | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-cfg -cse | %FileCheck %s // Check that jump-threading works for sequences of checked_cast_br instructions produced by the devirtualizer. // This allows for simplifications of code like e.g. f.foo() + f.foo() diff --git a/test/SILOptimizer/devirt_jump_thread_crasher.sil b/test/SILOptimizer/devirt_jump_thread_crasher.sil index 25bb9ff78e1ed..e353363ee34af 100644 --- a/test/SILOptimizer/devirt_jump_thread_crasher.sil +++ b/test/SILOptimizer/devirt_jump_thread_crasher.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-cfg | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-cfg | %FileCheck %s // REQUIRES: objc_interop // FIXME: this test relies on standard library implementation details that are diff --git a/test/SILOptimizer/devirt_materializeForSet.swift b/test/SILOptimizer/devirt_materializeForSet.swift index 435d15393e395..59fad1c73dd43 100644 --- a/test/SILOptimizer/devirt_materializeForSet.swift +++ b/test/SILOptimizer/devirt_materializeForSet.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s // Check that compiler does not crash on the devirtualization of materializeForSet methods // and produces a correct code. diff --git a/test/SILOptimizer/devirt_method_with_generic_params.swift b/test/SILOptimizer/devirt_method_with_generic_params.swift index 900d02c57c0c9..4d1963b521ffe 100644 --- a/test/SILOptimizer/devirt_method_with_generic_params.swift +++ b/test/SILOptimizer/devirt_method_with_generic_params.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil -O %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil -O %s | %FileCheck %s class S { func f(_ x: T, _ y: U) -> T { return x } diff --git a/test/SILOptimizer/devirt_override.sil b/test/SILOptimizer/devirt_override.sil index 2f8ddd5924d0b..90116521c841a 100644 --- a/test/SILOptimizer/devirt_override.sil +++ b/test/SILOptimizer/devirt_override.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -inline -devirtualizer | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -inline -devirtualizer | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/devirt_protocol_method_invocations.swift b/test/SILOptimizer/devirt_protocol_method_invocations.swift index 32c1656511f28..6dfbd59d84916 100644 --- a/test/SILOptimizer/devirt_protocol_method_invocations.swift +++ b/test/SILOptimizer/devirt_protocol_method_invocations.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s public protocol Foo { func foo(_ x:Int) -> Int diff --git a/test/SILOptimizer/devirt_release.sil b/test/SILOptimizer/devirt_release.sil index 06bcbd72372ad..53e219fa50f13 100644 --- a/test/SILOptimizer/devirt_release.sil +++ b/test/SILOptimizer/devirt_release.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -release-devirtualizer -module-name=test | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -release-devirtualizer -module-name=test | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/devirt_single_module_in_multiple_files.swift b/test/SILOptimizer/devirt_single_module_in_multiple_files.swift index c81c5f7bc8542..b5d9f51946d6d 100644 --- a/test/SILOptimizer/devirt_single_module_in_multiple_files.swift +++ b/test/SILOptimizer/devirt_single_module_in_multiple_files.swift @@ -1,4 +1,4 @@ -// RUN: %target-swiftc_driver -module-name devirt_single_module_in_multiple_files -O %s %S/Inputs/BaseProblem.swift %S/Inputs/Problems.swift -parse-as-library -Xllvm -sil-disable-pass="Performance Inliner" -emit-sil 2>&1 | FileCheck %s +// RUN: %target-swiftc_driver -module-name devirt_single_module_in_multiple_files -O %s %S/Inputs/BaseProblem.swift %S/Inputs/Problems.swift -parse-as-library -Xllvm -sil-disable-pass="Performance Inliner" -emit-sil 2>&1 | %FileCheck %s public func test() { let e = Evaluator() diff --git a/test/SILOptimizer/devirt_specialized_conformance.swift b/test/SILOptimizer/devirt_specialized_conformance.swift index 9378417b852f3..ec97f85ef9b2f 100644 --- a/test/SILOptimizer/devirt_specialized_conformance.swift +++ b/test/SILOptimizer/devirt_specialized_conformance.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O %s -emit-sil -sil-verify-all | FileCheck %s +// RUN: %target-swift-frontend -O %s -emit-sil -sil-verify-all | %FileCheck %s // Make sure that we completely inline/devirtualize/substitute all the way down // to unknown1. diff --git a/test/SILOptimizer/devirt_specialized_inherited_interplay.swift b/test/SILOptimizer/devirt_specialized_inherited_interplay.swift index ce0d0c1716f4c..1b6a6ad627e8f 100644 --- a/test/SILOptimizer/devirt_specialized_inherited_interplay.swift +++ b/test/SILOptimizer/devirt_specialized_inherited_interplay.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sil-verify-all -O %s -emit-sil | FileCheck %s +// RUN: %target-swift-frontend -sil-verify-all -O %s -emit-sil | %FileCheck %s // This file consists of tests for making sure that protocol conformances and // inherited conformances work well together when applied to each other. The diff --git a/test/SILOptimizer/devirt_speculate.swift b/test/SILOptimizer/devirt_speculate.swift index c9f0ccde8462b..e2bfc6a122ed2 100644 --- a/test/SILOptimizer/devirt_speculate.swift +++ b/test/SILOptimizer/devirt_speculate.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -parse-as-library -O -emit-sil | FileCheck %s +// RUN: %target-swift-frontend %s -parse-as-library -O -emit-sil | %FileCheck %s // // Test speculative devirtualization. diff --git a/test/SILOptimizer/devirt_speculative.sil b/test/SILOptimizer/devirt_speculative.sil index 99fc383af79f8..61b8fd81aac0c 100644 --- a/test/SILOptimizer/devirt_speculative.sil +++ b/test/SILOptimizer/devirt_speculative.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -specdevirt | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -specdevirt | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/devirt_static_witness_method.sil b/test/SILOptimizer/devirt_static_witness_method.sil index 958b9f7f1fbc8..091fa72e62791 100644 --- a/test/SILOptimizer/devirt_static_witness_method.sil +++ b/test/SILOptimizer/devirt_static_witness_method.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | %FileCheck %s sil_stage canonical import Builtin diff --git a/test/SILOptimizer/devirt_try_apply.sil b/test/SILOptimizer/devirt_try_apply.sil index a29a8dc2414d9..0aa3beb7a1fd3 100644 --- a/test/SILOptimizer/devirt_try_apply.sil +++ b/test/SILOptimizer/devirt_try_apply.sil @@ -1,6 +1,6 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -devirtualizer -inline | FileCheck %s --check-prefix=CHECK-DEVIRT -// RUN: %target-sil-opt -enable-sil-verify-all %s -specdevirt | FileCheck %s --check-prefix=CHECK-SPECDEVIRT -// RUN: %target-sil-opt -enable-sil-verify-all %s -mandatory-inlining | FileCheck %s --check-prefix=CHECK-MANDATORY-INLINING +// RUN: %target-sil-opt -enable-sil-verify-all %s -devirtualizer -inline | %FileCheck %s --check-prefix=CHECK-DEVIRT +// RUN: %target-sil-opt -enable-sil-verify-all %s -specdevirt | %FileCheck %s --check-prefix=CHECK-SPECDEVIRT +// RUN: %target-sil-opt -enable-sil-verify-all %s -mandatory-inlining | %FileCheck %s --check-prefix=CHECK-MANDATORY-INLINING sil_stage canonical diff --git a/test/SILOptimizer/devirt_unbound_generic.swift b/test/SILOptimizer/devirt_unbound_generic.swift index 36b40d2bbb123..7f0210ef76608 100644 --- a/test/SILOptimizer/devirt_unbound_generic.swift +++ b/test/SILOptimizer/devirt_unbound_generic.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil -O %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil -O %s | %FileCheck %s // We used to crash on this when trying to devirtualize t.boo(a, 1), // because it is an "apply" with unbound generic arguments and diff --git a/test/SILOptimizer/devirt_value_metatypes.swift b/test/SILOptimizer/devirt_value_metatypes.swift index 356f1c32d3b01..92d2110848bd7 100644 --- a/test/SILOptimizer/devirt_value_metatypes.swift +++ b/test/SILOptimizer/devirt_value_metatypes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil -O %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil -O %s | %FileCheck %s open class A { @inline(never) diff --git a/test/SILOptimizer/devirtualize.sil b/test/SILOptimizer/devirtualize.sil index 9a1f78460a3bf..f6c3e1d01cdc9 100644 --- a/test/SILOptimizer/devirtualize.sil +++ b/test/SILOptimizer/devirtualize.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -devirtualizer -dce | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -devirtualizer -dce | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/devirtualize1.swift b/test/SILOptimizer/devirtualize1.swift index 072d9b4bef3c4..2a8dc1f3ae2ff 100644 --- a/test/SILOptimizer/devirtualize1.swift +++ b/test/SILOptimizer/devirtualize1.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -O -emit-sil | FileCheck %s +// RUN: %target-swift-frontend %s -O -emit-sil | %FileCheck %s class Bar { var m_x : Int diff --git a/test/SILOptimizer/devirtualize2.sil b/test/SILOptimizer/devirtualize2.sil index 648be81bf015b..9f2d3c43a4263 100644 --- a/test/SILOptimizer/devirtualize2.sil +++ b/test/SILOptimizer/devirtualize2.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -devirtualizer -dce | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -devirtualizer -dce | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/devirtualize_existential.swift b/test/SILOptimizer/devirtualize_existential.swift index c49514f085de2..04bbcafe4cb81 100644 --- a/test/SILOptimizer/devirtualize_existential.swift +++ b/test/SILOptimizer/devirtualize_existential.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend %s -O -emit-sil | not FileCheck %s +// RUN: %target-swift-frontend %s -O -emit-sil | %FileCheck %s + +// rdar://problem/27781174 +// XFAIL: * // FIXME: Existential devirtualization needs to be updated to work with // open_existential_addr instructions. rdar://problem/18506660 diff --git a/test/SILOptimizer/diagnose_unreachable.sil b/test/SILOptimizer/diagnose_unreachable.sil index adabd7ec58bcf..eebd62b834f27 100644 --- a/test/SILOptimizer/diagnose_unreachable.sil +++ b/test/SILOptimizer/diagnose_unreachable.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -diagnose-unreachable | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -diagnose-unreachable | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/diagnostic_constant_propagation_int.swift b/test/SILOptimizer/diagnostic_constant_propagation_int.swift index b6b53fe573c49..98049feb4a73e 100644 --- a/test/SILOptimizer/diagnostic_constant_propagation_int.swift +++ b/test/SILOptimizer/diagnostic_constant_propagation_int.swift @@ -1,4 +1,4 @@ -// RUN: not %target-swift-frontend -emit-sil %s 2>&1 | FileCheck --check-prefix=CHECK-%target-ptrsize %s +// RUN: not %target-swift-frontend -emit-sil %s 2>&1 | %FileCheck --check-prefix=CHECK-%target-ptrsize %s // FIXME: This test should be merged back into // diagnostic_constant_propagation.swift when we have fixed: diff --git a/test/SILOptimizer/eager_specialize.sil b/test/SILOptimizer/eager_specialize.sil index a45b455859595..a67cee4cea842 100644 --- a/test/SILOptimizer/eager_specialize.sil +++ b/test/SILOptimizer/eager_specialize.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -eager-specializer %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -eager-specializer %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/earlycodemotion.sil b/test/SILOptimizer/earlycodemotion.sil index 49508b854166b..a79ab00dc381c 100644 --- a/test/SILOptimizer/earlycodemotion.sil +++ b/test/SILOptimizer/earlycodemotion.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -module-name Swift -enable-sil-verify-all %s -early-codemotion -retain-sinking -disable-with-critical-edge=1 | FileCheck %s +// RUN: %target-sil-opt -module-name Swift -enable-sil-verify-all %s -early-codemotion -retain-sinking -disable-with-critical-edge=1 | %FileCheck %s import Builtin diff --git a/test/SILOptimizer/enum_jump_thread.sil b/test/SILOptimizer/enum_jump_thread.sil index ce8aa7c9f9029..0563bfbf62ee2 100644 --- a/test/SILOptimizer/enum_jump_thread.sil +++ b/test/SILOptimizer/enum_jump_thread.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-cfg -cse | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-cfg -cse | %FileCheck %s // Test if jump-threading is done to combine two enum instructions // into a single block. diff --git a/test/SILOptimizer/epilogue_arc_dumper.sil b/test/SILOptimizer/epilogue_arc_dumper.sil index cd8fc7e66301a..7730c947bf30f 100644 --- a/test/SILOptimizer/epilogue_arc_dumper.sil +++ b/test/SILOptimizer/epilogue_arc_dumper.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -sil-epilogue-arc-dumper %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -sil-epilogue-arc-dumper %s | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/epilogue_release_dumper.sil b/test/SILOptimizer/epilogue_release_dumper.sil index bb24c1765ce98..c02e7a50e6f0a 100644 --- a/test/SILOptimizer/epilogue_release_dumper.sil +++ b/test/SILOptimizer/epilogue_release_dumper.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -sil-epilogue-retain-release-dumper %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -sil-epilogue-retain-release-dumper %s | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/escape_analysis.sil b/test/SILOptimizer/escape_analysis.sil index 1509e0d1310df..baf9ad8f0fec5 100644 --- a/test/SILOptimizer/escape_analysis.sil +++ b/test/SILOptimizer/escape_analysis.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s -escapes-dump -o /dev/null | FileCheck %s +// RUN: %target-sil-opt %s -escapes-dump -o /dev/null | %FileCheck %s // REQUIRES: asserts diff --git a/test/SILOptimizer/existential_type_propagation.sil b/test/SILOptimizer/existential_type_propagation.sil index 903f724b8950a..a6b55caf2435c 100644 --- a/test/SILOptimizer/existential_type_propagation.sil +++ b/test/SILOptimizer/existential_type_propagation.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -inline -sil-combine | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -inline -sil-combine | %FileCheck %s // Check that type propagation is performed correctly for existentials. // The concrete type set in init_existential instructions should be propagated diff --git a/test/SILOptimizer/external_defs_to_decls.sil b/test/SILOptimizer/external_defs_to_decls.sil index 3337270d0e00d..891e0c602d984 100644 --- a/test/SILOptimizer/external_defs_to_decls.sil +++ b/test/SILOptimizer/external_defs_to_decls.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -external-defs-to-decls %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -external-defs-to-decls %s | %FileCheck %s // CHECK: sil @no_op : $@convention(thin) () -> () sil public_external @no_op : $@convention(thin) () -> () { diff --git a/test/SILOptimizer/fold_enums.sil b/test/SILOptimizer/fold_enums.sil index e391745c7f883..cb922fb66ef98 100644 --- a/test/SILOptimizer/fold_enums.sil +++ b/test/SILOptimizer/fold_enums.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s // Check that the optimizer can detect when an enum (e.g. Optional) is being deconstructed // and then recreated in the same form. It should replace it with the original value in diff --git a/test/SILOptimizer/function_order.sil b/test/SILOptimizer/function_order.sil index e902659d4b482..30853f7be88a7 100644 --- a/test/SILOptimizer/function_order.sil +++ b/test/SILOptimizer/function_order.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -function-order-printer -o /dev/null | FileCheck --check-prefix=CHECK %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -function-order-printer -o /dev/null | %FileCheck --check-prefix=CHECK %s sil_stage canonical diff --git a/test/SILOptimizer/functionsigopts.sil b/test/SILOptimizer/functionsigopts.sil index aa2a04ee18e23..947113237178a 100644 --- a/test/SILOptimizer/functionsigopts.sil +++ b/test/SILOptimizer/functionsigopts.sil @@ -1,5 +1,5 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -inline -function-signature-opts %s | FileCheck %s -// RUN: %target-sil-opt -enable-sil-verify-all -inline -function-signature-opts %s | FileCheck -check-prefix=CHECK-NEGATIVE %s +// RUN: %target-sil-opt -enable-sil-verify-all -inline -function-signature-opts %s | %FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -inline -function-signature-opts %s | %FileCheck -check-prefix=CHECK-NEGATIVE %s import Builtin import Swift diff --git a/test/SILOptimizer/functionsigopts_self.swift b/test/SILOptimizer/functionsigopts_self.swift index 2f07246fe47f1..c80ca665e21cc 100644 --- a/test/SILOptimizer/functionsigopts_self.swift +++ b/test/SILOptimizer/functionsigopts_self.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -O -sil-inline-threshold 0 -emit-sil -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -O -sil-inline-threshold 0 -emit-sil -primary-file %s | %FileCheck %s // // This is a .swift test because the SIL parser does not support Self. diff --git a/test/SILOptimizer/functionsigopts_sroa.sil b/test/SILOptimizer/functionsigopts_sroa.sil index a96fad1711689..abc8b2efb1e64 100644 --- a/test/SILOptimizer/functionsigopts_sroa.sil +++ b/test/SILOptimizer/functionsigopts_sroa.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -inline -function-signature-opts %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -inline -function-signature-opts %s | %FileCheck %s import Builtin diff --git a/test/SILOptimizer/global_property_opt.sil b/test/SILOptimizer/global_property_opt.sil index c778320f9f885..b4a3c0043effa 100644 --- a/test/SILOptimizer/global_property_opt.sil +++ b/test/SILOptimizer/global_property_opt.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -global-property-opt %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -global-property-opt %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/global_property_opt_objc.sil b/test/SILOptimizer/global_property_opt_objc.sil index c74fb16568ce8..100aa00cf4c6b 100644 --- a/test/SILOptimizer/global_property_opt_objc.sil +++ b/test/SILOptimizer/global_property_opt_objc.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -global-property-opt %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -global-property-opt %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILOptimizer/globalopt.sil b/test/SILOptimizer/globalopt.sil index 16a2a2274f351..f489fa341b0ec 100644 --- a/test/SILOptimizer/globalopt.sil +++ b/test/SILOptimizer/globalopt.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -global-opt | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -global-opt | %FileCheck %s // // ginit.cold has a hammock with an initializer call on the slow path. // ginit.loop has a loop containing an initializer call. diff --git a/test/SILOptimizer/globalopt_global_propagation.swift b/test/SILOptimizer/globalopt_global_propagation.swift index 507bc7e3af32c..a3c3edc5dd7dd 100644 --- a/test/SILOptimizer/globalopt_global_propagation.swift +++ b/test/SILOptimizer/globalopt_global_propagation.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -O -emit-sil %s | FileCheck %s -// RUN: %target-swift-frontend -O -wmo -emit-sil %s | FileCheck -check-prefix=CHECK-WMO %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -O -wmo -emit-sil %s | %FileCheck -check-prefix=CHECK-WMO %s // Check that values of internal and private global variables, which are provably assigned only // once, are propagated into their uses and enable further optimizations like constant diff --git a/test/SILOptimizer/globalopt_let_propagation.swift b/test/SILOptimizer/globalopt_let_propagation.swift index f781a1b26710a..932eb145c30b1 100644 --- a/test/SILOptimizer/globalopt_let_propagation.swift +++ b/test/SILOptimizer/globalopt_let_propagation.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil -primary-file %s | %FileCheck %s // Check that values of static let and global let variables are propagated into their uses // and enable further optimizations like constant propagation, simplifications, etc. diff --git a/test/SILOptimizer/high_level_cse.sil b/test/SILOptimizer/high_level_cse.sil index b7220653e1918..7f32d5b142019 100644 --- a/test/SILOptimizer/high_level_cse.sil +++ b/test/SILOptimizer/high_level_cse.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -high-level-cse | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -high-level-cse | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/high_level_licm.sil b/test/SILOptimizer/high_level_licm.sil index 2154eddc2d1b2..b24855dc33697 100644 --- a/test/SILOptimizer/high_level_licm.sil +++ b/test/SILOptimizer/high_level_licm.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -high-level-licm | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -high-level-licm | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/inline_addressor.swift b/test/SILOptimizer/inline_addressor.swift index 7bde39512046e..c78e0a25c5f41 100644 --- a/test/SILOptimizer/inline_addressor.swift +++ b/test/SILOptimizer/inline_addressor.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -parse-as-library -emit-sil -O | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -parse-as-library -emit-sil -O | %FileCheck %s var inputval = nonTrivialInit(false) diff --git a/test/SILOptimizer/inline_caches.sil b/test/SILOptimizer/inline_caches.sil index 2ba74043dbcc8..ebbf88bc076fa 100644 --- a/test/SILOptimizer/inline_caches.sil +++ b/test/SILOptimizer/inline_caches.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -specdevirt -code-sinking | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -specdevirt -code-sinking | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/inline_deep.swift b/test/SILOptimizer/inline_deep.swift index 59df8b30ea462..ffca360910227 100644 --- a/test/SILOptimizer/inline_deep.swift +++ b/test/SILOptimizer/inline_deep.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s class S { @inline(__always) func l0(_ x: T) -> T { return x } diff --git a/test/SILOptimizer/inline_devirtualize_specialize.sil b/test/SILOptimizer/inline_devirtualize_specialize.sil index 39b0c6f1d7892..5afa60d56c652 100644 --- a/test/SILOptimizer/inline_devirtualize_specialize.sil +++ b/test/SILOptimizer/inline_devirtualize_specialize.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -inline -devirtualizer -generic-specializer -dce | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -inline -devirtualizer -generic-specializer -dce | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/inline_heuristics.sil b/test/SILOptimizer/inline_heuristics.sil index db3d8b598f31d..da2fb4e8d56a5 100644 --- a/test/SILOptimizer/inline_heuristics.sil +++ b/test/SILOptimizer/inline_heuristics.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t -// RUN: %target-sil-opt -enable-sil-verify-all %s -inline -debug-only=sil-inliner 2>%t/log | FileCheck %s -// RUN: FileCheck %s --check-prefix=CHECK-LOG <%t/log +// RUN: %target-sil-opt -enable-sil-verify-all %s -inline -debug-only=sil-inliner 2>%t/log | %FileCheck %s +// RUN: %FileCheck %s --check-prefix=CHECK-LOG <%t/log // REQUIRES: asserts // This test checks the inline heuristics based on the debug log output of diff --git a/test/SILOptimizer/inline_recursive.swift b/test/SILOptimizer/inline_recursive.swift index bae5d6bc92fdc..360c3e33b288f 100644 --- a/test/SILOptimizer/inline_recursive.swift +++ b/test/SILOptimizer/inline_recursive.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -parse-as-library -emit-sil -O | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -parse-as-library -emit-sil -O | %FileCheck %s private func recFunc(_ x: Int32) -> Int32 { if x > 0 { diff --git a/test/SILOptimizer/inline_self.swift b/test/SILOptimizer/inline_self.swift index 652002c471647..e499be677efeb 100644 --- a/test/SILOptimizer/inline_self.swift +++ b/test/SILOptimizer/inline_self.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -O -emit-sil -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -O -emit-sil -primary-file %s | %FileCheck %s // // This is a .swift test because the SIL parser does not support Self. diff --git a/test/SILOptimizer/inline_semantics.sil b/test/SILOptimizer/inline_semantics.sil index c75c2b962548e..040983d69a301 100644 --- a/test/SILOptimizer/inline_semantics.sil +++ b/test/SILOptimizer/inline_semantics.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -early-inline -sil-inline-threshold=50 | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -early-inline -sil-inline-threshold=50 | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/inline_thunk.swift b/test/SILOptimizer/inline_thunk.swift index 80af7e705d60e..1fde85e3670b7 100644 --- a/test/SILOptimizer/inline_thunk.swift +++ b/test/SILOptimizer/inline_thunk.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -parse-as-library -emit-ir -O | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -parse-as-library -emit-ir -O | %FileCheck %s // Two thunks are generated: // 1. from function signature opts diff --git a/test/SILOptimizer/inline_tryApply.sil b/test/SILOptimizer/inline_tryApply.sil index 0fbdcb6bed28b..eb4474a095b9c 100644 --- a/test/SILOptimizer/inline_tryApply.sil +++ b/test/SILOptimizer/inline_tryApply.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -early-inline -sil-inline-threshold=50 | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -early-inline -sil-inline-threshold=50 | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/inlinecaches_arc.sil b/test/SILOptimizer/inlinecaches_arc.sil index e41b9765ee749..322734c4b2618 100644 --- a/test/SILOptimizer/inlinecaches_arc.sil +++ b/test/SILOptimizer/inlinecaches_arc.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -specdevirt -code-sinking -sil-sort-output | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -specdevirt -code-sinking -sil-sort-output | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/inlinecaches_objc.sil b/test/SILOptimizer/inlinecaches_objc.sil index 61e2244ca3fb7..1a184906cdb74 100644 --- a/test/SILOptimizer/inlinecaches_objc.sil +++ b/test/SILOptimizer/inlinecaches_objc.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -specdevirt -code-sinking | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -specdevirt -code-sinking | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/inliner_coldblocks.sil b/test/SILOptimizer/inliner_coldblocks.sil index fb05dfbda5458..e612cb283de9e 100644 --- a/test/SILOptimizer/inliner_coldblocks.sil +++ b/test/SILOptimizer/inliner_coldblocks.sil @@ -1,5 +1,5 @@ // RUN: rm -rf %t && mkdir -p %t -// RUN: %target-sil-opt -enable-sil-verify-all %s -inline | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -inline | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/inliner_spa.sil b/test/SILOptimizer/inliner_spa.sil index bb730d0275d13..fc58b67d70903 100644 --- a/test/SILOptimizer/inliner_spa.sil +++ b/test/SILOptimizer/inliner_spa.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-sil-opt %s -inline -print-shortest-path-info 2>%t/log >/dev/null -// RUN: FileCheck %s <%t/log +// RUN: %FileCheck %s <%t/log // REQUIRES: asserts sil_stage canonical diff --git a/test/SILOptimizer/inout_deshadow.sil b/test/SILOptimizer/inout_deshadow.sil index 7afbf78d6f3d9..8f87ff734a72f 100644 --- a/test/SILOptimizer/inout_deshadow.sil +++ b/test/SILOptimizer/inout_deshadow.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -inout-deshadow | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -inout-deshadow | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/inout_deshadow_integration.swift b/test/SILOptimizer/inout_deshadow_integration.swift index 998752c198d08..c80ecb1c349e4 100644 --- a/test/SILOptimizer/inout_deshadow_integration.swift +++ b/test/SILOptimizer/inout_deshadow_integration.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-sil | FileCheck %s +// RUN: %target-swift-frontend %s -emit-sil | %FileCheck %s // This is an integration check for the inout-deshadow pass, verifying that it // deshadows the inout variables in certain cases. These test should not be diff --git a/test/SILOptimizer/iv_info_printer.sil b/test/SILOptimizer/iv_info_printer.sil index a3911bf9c81f1..192ca1a5ee07c 100644 --- a/test/SILOptimizer/iv_info_printer.sil +++ b/test/SILOptimizer/iv_info_printer.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -iv-info-printer 2>&1 | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -iv-info-printer 2>&1 | %FileCheck %s // REQUIRES: asserts diff --git a/test/SILOptimizer/latecodemotion.sil b/test/SILOptimizer/latecodemotion.sil index eb92ceb0582ce..d8fb40a582b00 100644 --- a/test/SILOptimizer/latecodemotion.sil +++ b/test/SILOptimizer/latecodemotion.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -late-codemotion -release-hoisting -retain-sinking -disable-with-critical-edge=1 | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -late-codemotion -release-hoisting -retain-sinking -disable-with-critical-edge=1 | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/let_propagation.swift b/test/SILOptimizer/let_propagation.swift index 44c7a22c6fd65..f7b3cf11c7910 100644 --- a/test/SILOptimizer/let_propagation.swift +++ b/test/SILOptimizer/let_propagation.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-sil -O | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-sil -O | %FileCheck %s // Check that LoadStoreOpts can handle "let" variables properly. // Such variables should be loaded only once and their loaded values can be reused. diff --git a/test/SILOptimizer/let_properties_opts.swift b/test/SILOptimizer/let_properties_opts.swift index d485d2b700e42..c540d019f67b1 100644 --- a/test/SILOptimizer/let_properties_opts.swift +++ b/test/SILOptimizer/let_properties_opts.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend %s -O -emit-sil | FileCheck -check-prefix=CHECK-WMO %s -// RUN: %target-swift-frontend -primary-file %s -O -emit-sil | FileCheck %s +// RUN: %target-swift-frontend %s -O -emit-sil | %FileCheck -check-prefix=CHECK-WMO %s +// RUN: %target-swift-frontend -primary-file %s -O -emit-sil | %FileCheck %s // Test propagation of non-static let properties with compile-time constant values. diff --git a/test/SILOptimizer/let_properties_opts_runtime.swift b/test/SILOptimizer/let_properties_opts_runtime.swift index 74f6f3c759c69..24d053b2629fb 100644 --- a/test/SILOptimizer/let_properties_opts_runtime.swift +++ b/test/SILOptimizer/let_properties_opts_runtime.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -O %s -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s -check-prefix=CHECK-OUTPUT +// RUN: %target-run %t/a.out | %FileCheck %s -check-prefix=CHECK-OUTPUT // RUN: %target-build-swift -O -wmo %s -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s -check-prefix=CHECK-OUTPUT +// RUN: %target-run %t/a.out | %FileCheck %s -check-prefix=CHECK-OUTPUT // REQUIRES: executable_test // Check that in optimized builds the compiler generates correct code for diff --git a/test/SILOptimizer/licm.sil b/test/SILOptimizer/licm.sil index 2630ab025f0c5..65203c5c10f86 100644 --- a/test/SILOptimizer/licm.sil +++ b/test/SILOptimizer/licm.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -licm | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -licm | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/licm_apply.sil b/test/SILOptimizer/licm_apply.sil index a19b42940c80a..376e695e3e017 100644 --- a/test/SILOptimizer/licm_apply.sil +++ b/test/SILOptimizer/licm_apply.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -licm | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -licm | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/linker.swift b/test/SILOptimizer/linker.swift index 69d6b62b51414..87580bfe030b0 100644 --- a/test/SILOptimizer/linker.swift +++ b/test/SILOptimizer/linker.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module %S/Inputs/linker_pass_input.swift -o %t/Swift.swiftmodule -parse-stdlib -parse-as-library -module-name Swift -sil-serialize-all -module-link-name swiftCore -// RUN: %target-swift-frontend %s -O -I %t -sil-debug-serialization -o - -emit-sil | FileCheck %s +// RUN: %target-swift-frontend %s -O -I %t -sil-debug-serialization -o - -emit-sil | %FileCheck %s // CHECK: sil public_external [fragile] @_TFs11doSomethingFT_T_ : $@convention(thin) () -> () { doSomething() diff --git a/test/SILOptimizer/loop-region-analysis.sil b/test/SILOptimizer/loop-region-analysis.sil index 85cfcb98a3a4a..d64233ded9604 100644 --- a/test/SILOptimizer/loop-region-analysis.sil +++ b/test/SILOptimizer/loop-region-analysis.sil @@ -1,6 +1,6 @@ // All bbs should have IDs that match the rpo order put out when printing with -sil-sort-output -// RUN: %target-sil-opt %s -module-name Swift -loop-region-view-text -o /dev/null | FileCheck %s +// RUN: %target-sil-opt %s -module-name Swift -loop-region-view-text -o /dev/null | %FileCheck %s import Builtin diff --git a/test/SILOptimizer/loop_canonicalizer.sil b/test/SILOptimizer/loop_canonicalizer.sil index f2446e730831b..560fe218dfeef 100644 --- a/test/SILOptimizer/loop_canonicalizer.sil +++ b/test/SILOptimizer/loop_canonicalizer.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -compute-dominance-info -compute-loop-info -loop-canonicalizer %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -compute-dominance-info -compute-loop-info -loop-canonicalizer %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/loop_info_printer.sil b/test/SILOptimizer/loop_info_printer.sil index 166477dfe0b9f..09305d83be1e6 100644 --- a/test/SILOptimizer/loop_info_printer.sil +++ b/test/SILOptimizer/loop_info_printer.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -loop-info-printer 2>&1 | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -loop-info-printer 2>&1 | %FileCheck %s // REQUIRES: asserts diff --git a/test/SILOptimizer/loop_unroll.sil b/test/SILOptimizer/loop_unroll.sil index 2f55bdc9e3a31..100f8b5b4a109 100644 --- a/test/SILOptimizer/loop_unroll.sil +++ b/test/SILOptimizer/loop_unroll.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -loop-unroll %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -loop-unroll %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/looprotate.sil b/test/SILOptimizer/looprotate.sil index 8f90f649b66b8..5bd953224eeae 100644 --- a/test/SILOptimizer/looprotate.sil +++ b/test/SILOptimizer/looprotate.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -loop-rotate %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -loop-rotate %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/loweraggregateinstrs.sil b/test/SILOptimizer/loweraggregateinstrs.sil index 83c3f3320cb69..65f9785486193 100644 --- a/test/SILOptimizer/loweraggregateinstrs.sil +++ b/test/SILOptimizer/loweraggregateinstrs.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -lower-aggregate-instrs | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -lower-aggregate-instrs | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/lslocation_expansion.sil b/test/SILOptimizer/lslocation_expansion.sil index f84c7e0ed3369..5d7838a9d75b2 100644 --- a/test/SILOptimizer/lslocation_expansion.sil +++ b/test/SILOptimizer/lslocation_expansion.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s -lslocation-dump -ml=only-expansion | FileCheck %s +// RUN: %target-sil-opt %s -lslocation-dump -ml=only-expansion | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/lslocation_reduction.sil b/test/SILOptimizer/lslocation_reduction.sil index 909fedba50e1e..8249812cd81fb 100644 --- a/test/SILOptimizer/lslocation_reduction.sil +++ b/test/SILOptimizer/lslocation_reduction.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s -lslocation-dump -ml=only-reduction | FileCheck %s +// RUN: %target-sil-opt %s -lslocation-dump -ml=only-reduction | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/lslocation_type_only_expansion.sil b/test/SILOptimizer/lslocation_type_only_expansion.sil index 3bea193e13d20..3eb6e397d64e5 100644 --- a/test/SILOptimizer/lslocation_type_only_expansion.sil +++ b/test/SILOptimizer/lslocation_type_only_expansion.sil @@ -1,5 +1,5 @@ -// RUN: %target-sil-opt %s -lslocation-dump -ml=only-type-expansion | FileCheck %s -// RUN: %target-sil-opt %s -lslocation-dump-use-new-projection -lslocation-dump -ml=only-type-expansion | FileCheck %s +// RUN: %target-sil-opt %s -lslocation-dump -ml=only-type-expansion | %FileCheck %s +// RUN: %target-sil-opt %s -lslocation-dump-use-new-projection -lslocation-dump -ml=only-type-expansion | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/mandatory_inlining.sil b/test/SILOptimizer/mandatory_inlining.sil index 55a65a640e1d6..6cf6f84551f07 100644 --- a/test/SILOptimizer/mandatory_inlining.sil +++ b/test/SILOptimizer/mandatory_inlining.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -mandatory-inlining | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -mandatory-inlining | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/mandatory_inlining.swift b/test/SILOptimizer/mandatory_inlining.swift index 2345c5db103a4..15c9e01e2fac1 100644 --- a/test/SILOptimizer/mandatory_inlining.swift +++ b/test/SILOptimizer/mandatory_inlining.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-sil -o - -verify | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-sil -o - -verify | %FileCheck %s // These tests are deliberately shallow, because I do not want to depend on the // specifics of SIL generation, which might change for reasons unrelated to this diff --git a/test/SILOptimizer/mandatory_nil_comparison_inlining.swift b/test/SILOptimizer/mandatory_nil_comparison_inlining.swift index acd2398425b71..dbfd7123d4f92 100644 --- a/test/SILOptimizer/mandatory_nil_comparison_inlining.swift +++ b/test/SILOptimizer/mandatory_nil_comparison_inlining.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-sil -o - -verify | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-sil -o - -verify | %FileCheck %s // CHECK-LABEL: sil {{.*}} @{{.*}}generic_func diff --git a/test/SILOptimizer/mem-behavior.sil b/test/SILOptimizer/mem-behavior.sil index bfc885dbe1baf..a5cf0933be5e8 100644 --- a/test/SILOptimizer/mem-behavior.sil +++ b/test/SILOptimizer/mem-behavior.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s -aa=basic-aa -mem-behavior-dump -o /dev/null | FileCheck %s +// RUN: %target-sil-opt %s -aa=basic-aa -mem-behavior-dump -o /dev/null | %FileCheck %s // REQUIRES: asserts diff --git a/test/SILOptimizer/mem2reg.sil b/test/SILOptimizer/mem2reg.sil index 0e716f1904468..cf952034460c8 100644 --- a/test/SILOptimizer/mem2reg.sil +++ b/test/SILOptimizer/mem2reg.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -mem2reg | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -mem2reg | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/mem2reg_liveness.sil b/test/SILOptimizer/mem2reg_liveness.sil index 7833a24f3c27d..a12976bbb798b 100644 --- a/test/SILOptimizer/mem2reg_liveness.sil +++ b/test/SILOptimizer/mem2reg_liveness.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -mem2reg | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -mem2reg | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/mem2reg_simple.sil b/test/SILOptimizer/mem2reg_simple.sil index d6266a0d3e855..42a15108f58a0 100644 --- a/test/SILOptimizer/mem2reg_simple.sil +++ b/test/SILOptimizer/mem2reg_simple.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -mem2reg | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -mem2reg | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/merge_cond_fail.sil b/test/SILOptimizer/merge_cond_fail.sil index c2cf7bd2ea5c8..b298de26d8a4a 100644 --- a/test/SILOptimizer/merge_cond_fail.sil +++ b/test/SILOptimizer/merge_cond_fail.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -merge-cond_fails | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -merge-cond_fails | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/mm_inlinecaches_multiple.sil b/test/SILOptimizer/mm_inlinecaches_multiple.sil index fe93c191c07a1..f5168d0c76612 100644 --- a/test/SILOptimizer/mm_inlinecaches_multiple.sil +++ b/test/SILOptimizer/mm_inlinecaches_multiple.sil @@ -1,5 +1,5 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -specdevirt -code-sinking | FileCheck %s -// RUN: %target-sil-opt -enable-sil-verify-all %s -specdevirt -code-sinking -wmo | FileCheck --check-prefix=CHECK-WMO %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -specdevirt -code-sinking | %FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -specdevirt -code-sinking -wmo | %FileCheck --check-prefix=CHECK-WMO %s sil_stage canonical diff --git a/test/SILOptimizer/move_cond_fail.sil b/test/SILOptimizer/move_cond_fail.sil index 5c599707beea9..0e154dc8d3f8c 100644 --- a/test/SILOptimizer/move_cond_fail.sil +++ b/test/SILOptimizer/move_cond_fail.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -licm | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -licm | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/move_cond_fail_simplify_cfg.sil b/test/SILOptimizer/move_cond_fail_simplify_cfg.sil index ede272b6188b6..fc3dc1572ff6a 100644 --- a/test/SILOptimizer/move_cond_fail_simplify_cfg.sil +++ b/test/SILOptimizer/move_cond_fail_simplify_cfg.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -move-cond-fail-to-preds | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -move-cond-fail-to-preds | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/no-external-defs-onone.sil b/test/SILOptimizer/no-external-defs-onone.sil index e79bbb187a446..80494056da4b2 100644 --- a/test/SILOptimizer/no-external-defs-onone.sil +++ b/test/SILOptimizer/no-external-defs-onone.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -module-name=test -Onone -emit-ir %s | FileCheck %s +// RUN: %target-swift-frontend -module-name=test -Onone -emit-ir %s | %FileCheck %s // CHECK-DAG: define linkonce_odr hidden void @shared_external_test() // CHECK-DAG: declare void @public_external_test() diff --git a/test/SILOptimizer/no_opt.swift b/test/SILOptimizer/no_opt.swift index 675822ffd40ca..f6e20301ff885 100644 --- a/test/SILOptimizer/no_opt.swift +++ b/test/SILOptimizer/no_opt.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s func bar(_ x : Int) { } diff --git a/test/SILOptimizer/noreturn_folding.sil b/test/SILOptimizer/noreturn_folding.sil index b995c942da641..7cdbea8f657ad 100644 --- a/test/SILOptimizer/noreturn_folding.sil +++ b/test/SILOptimizer/noreturn_folding.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -module-name Swift -enable-sil-verify-all -noreturn-folding < %s | FileCheck %s +// RUN: %target-sil-opt -module-name Swift -enable-sil-verify-all -noreturn-folding < %s | %FileCheck %s import Builtin diff --git a/test/SILOptimizer/optimize_never.sil b/test/SILOptimizer/optimize_never.sil index 7a17a0638011a..dec22df70a63f 100644 --- a/test/SILOptimizer/optimize_never.sil +++ b/test/SILOptimizer/optimize_never.sil @@ -1,5 +1,5 @@ // RUN: %target-sil-opt -enable-sil-verify-all -inline -generic-specializer -inline %s > %t.sil -// RUN: %target-sil-opt -sil-full-demangle -enable-sil-verify-all -specdevirt %t.sil | FileCheck %s +// RUN: %target-sil-opt -sil-full-demangle -enable-sil-verify-all -specdevirt %t.sil | %FileCheck %s // Check that the @_semantics("optimize.sil.never") annotation prevents // any optimizations of the annotated function: diff --git a/test/SILOptimizer/pa_removal.sil b/test/SILOptimizer/pa_removal.sil index 5c23834aea196..29ad7874ac86a 100644 --- a/test/SILOptimizer/pa_removal.sil +++ b/test/SILOptimizer/pa_removal.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/peephole_thick_to_objc_metatype.sil b/test/SILOptimizer/peephole_thick_to_objc_metatype.sil index 88e3c4561a4de..136c56cc095b8 100644 --- a/test/SILOptimizer/peephole_thick_to_objc_metatype.sil +++ b/test/SILOptimizer/peephole_thick_to_objc_metatype.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILOptimizer/peephole_trunc_and_ext.sil b/test/SILOptimizer/peephole_trunc_and_ext.sil index 6d867f9b77235..c52280ea79007 100644 --- a/test/SILOptimizer/peephole_trunc_and_ext.sil +++ b/test/SILOptimizer/peephole_trunc_and_ext.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-sil -O -o - -verify | FileCheck %s +// RUN: %target-swift-frontend %s -emit-sil -O -o - -verify | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/performance_inliner.sil b/test/SILOptimizer/performance_inliner.sil index 245b83f9a56a7..d35b60fb8517d 100644 --- a/test/SILOptimizer/performance_inliner.sil +++ b/test/SILOptimizer/performance_inliner.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -inline -sil-combine | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -inline -sil-combine | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/polymorphic_inline_caches.sil b/test/SILOptimizer/polymorphic_inline_caches.sil index 83e159dfffd0c..b4311f942f43b 100644 --- a/test/SILOptimizer/polymorphic_inline_caches.sil +++ b/test/SILOptimizer/polymorphic_inline_caches.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -specdevirt -code-sinking -dce -early-codemotion -disable-sil-cm-rr-cm=0 -retain-sinking | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -specdevirt -code-sinking -dce -early-codemotion -disable-sil-cm-rr-cm=0 -retain-sinking | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/predictable_memopt.sil b/test/SILOptimizer/predictable_memopt.sil index 45298d0b5233d..4008e2a6f19be 100644 --- a/test/SILOptimizer/predictable_memopt.sil +++ b/test/SILOptimizer/predictable_memopt.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -predictable-memopt | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -predictable-memopt | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/predictable_memopt_unreferenceable_storage.swift b/test/SILOptimizer/predictable_memopt_unreferenceable_storage.swift index 829e844304015..df2f15263d52b 100644 --- a/test/SILOptimizer/predictable_memopt_unreferenceable_storage.swift +++ b/test/SILOptimizer/predictable_memopt_unreferenceable_storage.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-sil %s | %FileCheck %s import ctypes struct S { diff --git a/test/SILOptimizer/prespecialization_with_definition.sil b/test/SILOptimizer/prespecialization_with_definition.sil index fccad8f4b503d..eb94d9c77a657 100644 --- a/test/SILOptimizer/prespecialization_with_definition.sil +++ b/test/SILOptimizer/prespecialization_with_definition.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s -module-name main | FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s -module-name main | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/prespecialize.swift b/test/SILOptimizer/prespecialize.swift index c3d4b5dd60af3..96b9d08191a8b 100644 --- a/test/SILOptimizer/prespecialize.swift +++ b/test/SILOptimizer/prespecialize.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -Onone -emit-sil | FileCheck %s +// RUN: %target-swift-frontend %s -Onone -emit-sil | %FileCheck %s // REQUIRES: optimized_stdlib diff --git a/test/SILOptimizer/protocol_lookup.swift b/test/SILOptimizer/protocol_lookup.swift index 78e5f68b8c58d..5b9cb49d6d177 100644 --- a/test/SILOptimizer/protocol_lookup.swift +++ b/test/SILOptimizer/protocol_lookup.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil -primary-file %s | %FileCheck %s // Check that this file can be compiled using -O at all (it used to crash due to a bug in the SILCloner) // Check that it can be compiled correctly. diff --git a/test/SILOptimizer/pure_apply.swift b/test/SILOptimizer/pure_apply.swift index 9141f0bd5f3c1..6995a859199e4 100644 --- a/test/SILOptimizer/pure_apply.swift +++ b/test/SILOptimizer/pure_apply.swift @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/rcidentity.sil b/test/SILOptimizer/rcidentity.sil index 54b11889ddc6b..fcd7cdf240b7e 100644 --- a/test/SILOptimizer/rcidentity.sil +++ b/test/SILOptimizer/rcidentity.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -rc-id-dumper %s -o /dev/null | FileCheck %s +// RUN: %target-sil-opt -rc-id-dumper %s -o /dev/null | %FileCheck %s import Builtin diff --git a/test/SILOptimizer/recursive_func.sil b/test/SILOptimizer/recursive_func.sil index 5766e6cfbf5c3..d196e8b06c02c 100644 --- a/test/SILOptimizer/recursive_func.sil +++ b/test/SILOptimizer/recursive_func.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O %s -emit-sil | FileCheck %s +// RUN: %target-swift-frontend -O %s -emit-sil | %FileCheck %s // rdar://16761933 // Make sure we can handle recursive function within a class. diff --git a/test/SILOptimizer/recursive_single.sil b/test/SILOptimizer/recursive_single.sil index ccab97586cae3..d19bd6a0866c7 100644 --- a/test/SILOptimizer/recursive_single.sil +++ b/test/SILOptimizer/recursive_single.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O %s -emit-sil | FileCheck %s +// RUN: %target-swift-frontend -O %s -emit-sil | %FileCheck %s // rdar://16761933 // Make sure we can handle recursive function within a class that diff --git a/test/SILOptimizer/redundant_load_and_dead_store_elim.sil b/test/SILOptimizer/redundant_load_and_dead_store_elim.sil index c2303d56a57db..64d8ad602533b 100644 --- a/test/SILOptimizer/redundant_load_and_dead_store_elim.sil +++ b/test/SILOptimizer/redundant_load_and_dead_store_elim.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -redundant-load-elim -dead-store-elim | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -redundant-load-elim -dead-store-elim | %FileCheck %s // NOTE, the order redundant-load and dead-store are ran is important. we have a pass dependence for some // of the tests to work. diff --git a/test/SILOptimizer/redundant_load_elim.sil b/test/SILOptimizer/redundant_load_elim.sil index eb0a0abfe6f28..3401cde80136f 100644 --- a/test/SILOptimizer/redundant_load_elim.sil +++ b/test/SILOptimizer/redundant_load_elim.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -redundant-load-elim | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -redundant-load-elim | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/redundant_load_elim_with_casts.sil b/test/SILOptimizer/redundant_load_elim_with_casts.sil index 5639c12bc4a5b..1d483d5670fec 100644 --- a/test/SILOptimizer/redundant_load_elim_with_casts.sil +++ b/test/SILOptimizer/redundant_load_elim_with_casts.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -module-name Swift -redundant-load-elim | FileCheck -check-prefix=CHECK-FUTURE %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -module-name Swift -redundant-load-elim | %FileCheck -check-prefix=CHECK-FUTURE %s // // FIXME: Contains tests which are handled by old RLE, but not current one. Mostly due to casting. Eventually we probably should // handle these cases if they turn out to be important. diff --git a/test/SILOptimizer/ref_elt_addr.sil b/test/SILOptimizer/ref_elt_addr.sil index 473ff892accaf..37fe64ac90730 100644 --- a/test/SILOptimizer/ref_elt_addr.sil +++ b/test/SILOptimizer/ref_elt_addr.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -cse | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -cse | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/remove_pins.sil b/test/SILOptimizer/remove_pins.sil index 65f1f0eeac578..611cfda410c0e 100644 --- a/test/SILOptimizer/remove_pins.sil +++ b/test/SILOptimizer/remove_pins.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -remove-pins %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -remove-pins %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/remove_unused_func.sil b/test/SILOptimizer/remove_unused_func.sil index eb600f98dc41b..e3f5507e29a1e 100644 --- a/test/SILOptimizer/remove_unused_func.sil +++ b/test/SILOptimizer/remove_unused_func.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-deadfuncelim | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-deadfuncelim | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/retain_release_code_motion.sil b/test/SILOptimizer/retain_release_code_motion.sil index 5a4ca7e615bb6..eb4c903c8f19e 100644 --- a/test/SILOptimizer/retain_release_code_motion.sil +++ b/test/SILOptimizer/retain_release_code_motion.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -retain-sinking -late-release-hoisting %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -retain-sinking -late-release-hoisting %s | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/select_enum_addr_reads_memory.sil b/test/SILOptimizer/select_enum_addr_reads_memory.sil index 2995da1b38270..339e6c1bfaed5 100644 --- a/test/SILOptimizer/select_enum_addr_reads_memory.sil +++ b/test/SILOptimizer/select_enum_addr_reads_memory.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -loop-rotate %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -loop-rotate %s | %FileCheck %s import Builtin diff --git a/test/SILOptimizer/side-effect.sil b/test/SILOptimizer/side-effect.sil index 98b212d640793..80eae0365e028 100644 --- a/test/SILOptimizer/side-effect.sil +++ b/test/SILOptimizer/side-effect.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s -module-name Swift -side-effects-dump -o /dev/null | FileCheck %s +// RUN: %target-sil-opt %s -module-name Swift -side-effects-dump -o /dev/null | %FileCheck %s // REQUIRES: asserts diff --git a/test/SILOptimizer/sil_combine.sil b/test/SILOptimizer/sil_combine.sil index d5e06fde1fc34..3ab68194cf320 100644 --- a/test/SILOptimizer/sil_combine.sil +++ b/test/SILOptimizer/sil_combine.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -verify-skip-unreachable-must-be-last | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -verify-skip-unreachable-must-be-last | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/sil_combine_bitops.sil b/test/SILOptimizer/sil_combine_bitops.sil index fa00de7e2ccbf..41268466a1df4 100644 --- a/test/SILOptimizer/sil_combine_bitops.sil +++ b/test/SILOptimizer/sil_combine_bitops.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | %FileCheck %s // Test optimizations for binary bit operations. diff --git a/test/SILOptimizer/sil_combine_devirt.sil b/test/SILOptimizer/sil_combine_devirt.sil index adc3adae694ae..c819238b68f9e 100644 --- a/test/SILOptimizer/sil_combine_devirt.sil +++ b/test/SILOptimizer/sil_combine_devirt.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -devirtualizer | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -devirtualizer | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/sil_combine_enum_addr.sil b/test/SILOptimizer/sil_combine_enum_addr.sil index 5c2aa8d7cf8aa..9e6da8e1e2c4d 100644 --- a/test/SILOptimizer/sil_combine_enum_addr.sil +++ b/test/SILOptimizer/sil_combine_enum_addr.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -simplify-cfg | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -simplify-cfg | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/sil_combine_enums.sil b/test/SILOptimizer/sil_combine_enums.sil index e47f46763d0b2..b59c803a7cdb8 100644 --- a/test/SILOptimizer/sil_combine_enums.sil +++ b/test/SILOptimizer/sil_combine_enums.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/sil_combine_objc.sil b/test/SILOptimizer/sil_combine_objc.sil index e22bb164a2923..d92af47f556dc 100644 --- a/test/SILOptimizer/sil_combine_objc.sil +++ b/test/SILOptimizer/sil_combine_objc.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -verify-skip-unreachable-must-be-last | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -verify-skip-unreachable-must-be-last | %FileCheck %s // REQUIRES: objc_interop sil_stage canonical diff --git a/test/SILOptimizer/sil_combine_objc_bridge.sil b/test/SILOptimizer/sil_combine_objc_bridge.sil index 7f6b89b89a23b..58521dfd5c59b 100644 --- a/test/SILOptimizer/sil_combine_objc_bridge.sil +++ b/test/SILOptimizer/sil_combine_objc_bridge.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILOptimizer/sil_combine_same_ops.sil b/test/SILOptimizer/sil_combine_same_ops.sil index 512f8711c413c..33ba11328eca6 100644 --- a/test/SILOptimizer/sil_combine_same_ops.sil +++ b/test/SILOptimizer/sil_combine_same_ops.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | %FileCheck %s // Test optimization of various builtins which receive the same value in their first and second operand. diff --git a/test/SILOptimizer/sil_combine_uncheck.sil b/test/SILOptimizer/sil_combine_uncheck.sil index c5b425faf0e12..086c84206e895 100644 --- a/test/SILOptimizer/sil_combine_uncheck.sil +++ b/test/SILOptimizer/sil_combine_uncheck.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -remove-runtime-asserts | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -remove-runtime-asserts | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/sil_concat_string_literals.sil b/test/SILOptimizer/sil_concat_string_literals.sil index 1f1b1ff328dc8..96baeea330879 100644 --- a/test/SILOptimizer/sil_concat_string_literals.sil +++ b/test/SILOptimizer/sil_concat_string_literals.sil @@ -1,5 +1,5 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -sil-verify-without-invalidation | FileCheck %s -// RUN: %target-sil-opt -enable-sil-verify-all %s -diagnostic-constant-propagation -sil-verify-without-invalidation | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -sil-verify-without-invalidation | %FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -diagnostic-constant-propagation -sil-verify-without-invalidation | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/sil_locations.sil b/test/SILOptimizer/sil_locations.sil index 00df5742498e7..594cc6fd51dfb 100644 --- a/test/SILOptimizer/sil_locations.sil +++ b/test/SILOptimizer/sil_locations.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -mandatory-inlining -emit-verbose-sil %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -mandatory-inlining -emit-verbose-sil %s | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/sil_locations.swift b/test/SILOptimizer/sil_locations.swift index 36ab672cb6ece..e01280b0becc9 100644 --- a/test/SILOptimizer/sil_locations.swift +++ b/test/SILOptimizer/sil_locations.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-sil -emit-verbose-sil | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-sil -emit-verbose-sil | %FileCheck %s func searchForMe(_ x: Float) -> Float { return x diff --git a/test/SILOptimizer/sil_simplify_instrs.sil b/test/SILOptimizer/sil_simplify_instrs.sil index f6ab03893b7a6..1b4d9cc2e3216 100644 --- a/test/SILOptimizer/sil_simplify_instrs.sil +++ b/test/SILOptimizer/sil_simplify_instrs.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/sil_witness_tables_external_witnesstable.swift b/test/SILOptimizer/sil_witness_tables_external_witnesstable.swift index c806d84611363..7de56aad0d253 100644 --- a/test/SILOptimizer/sil_witness_tables_external_witnesstable.swift +++ b/test/SILOptimizer/sil_witness_tables_external_witnesstable.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module %S/Inputs/sil_witness_tables_external_input.swift -o %t/Swift.swiftmodule -parse-stdlib -parse-as-library -module-name Swift -sil-serialize-all -module-link-name swiftCore -// RUN: %target-swift-frontend -O -I %t %s -emit-sil | FileCheck %s +// RUN: %target-swift-frontend -O -I %t %s -emit-sil | %FileCheck %s import Swift diff --git a/test/SILOptimizer/simp_enum.sil b/test/SILOptimizer/simp_enum.sil index bf2f2de850857..91d1df2aba6c0 100644 --- a/test/SILOptimizer/simp_enum.sil +++ b/test/SILOptimizer/simp_enum.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/simplify_cfg.sil b/test/SILOptimizer/simplify_cfg.sil index 7458a6521bb9b..56dea14eee8a3 100644 --- a/test/SILOptimizer/simplify_cfg.sil +++ b/test/SILOptimizer/simplify_cfg.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-cfg | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-cfg | %FileCheck %s // FIXME: Update for select_enum change. import Builtin diff --git a/test/SILOptimizer/simplify_cfg_and_combine.sil b/test/SILOptimizer/simplify_cfg_and_combine.sil index ece4f88808c51..54a56a230353f 100644 --- a/test/SILOptimizer/simplify_cfg_and_combine.sil +++ b/test/SILOptimizer/simplify_cfg_and_combine.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-cfg -sil-combine -simplify-cfg -sil-combine | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-cfg -sil-combine -simplify-cfg -sil-combine | %FileCheck %s // These require both SimplifyCFG and SILCombine diff --git a/test/SILOptimizer/simplify_cfg_args.sil b/test/SILOptimizer/simplify_cfg_args.sil index 77238cf6662eb..c9f9a2d58a000 100644 --- a/test/SILOptimizer/simplify_cfg_args.sil +++ b/test/SILOptimizer/simplify_cfg_args.sil @@ -1,5 +1,5 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-cfg | FileCheck %s -// RUN: %target-sil-opt -enable-sil-verify-all %s -late-codemotion -simplify-cfg | FileCheck %s --check-prefix=CHECK_WITH_CODEMOTION +// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-cfg | %FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -late-codemotion -simplify-cfg | %FileCheck %s --check-prefix=CHECK_WITH_CODEMOTION sil_stage raw diff --git a/test/SILOptimizer/simplify_cfg_args_crash.sil b/test/SILOptimizer/simplify_cfg_args_crash.sil index d4f499bc00e72..670606cc9404c 100644 --- a/test/SILOptimizer/simplify_cfg_args_crash.sil +++ b/test/SILOptimizer/simplify_cfg_args_crash.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-bb-args -sroa-bb-args | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-bb-args -sroa-bb-args | %FileCheck %s sil_stage canonical import Builtin diff --git a/test/SILOptimizer/simplify_cfg_jump_thread_crash.sil b/test/SILOptimizer/simplify_cfg_jump_thread_crash.sil index d73c21283099f..0be1574ed1283 100644 --- a/test/SILOptimizer/simplify_cfg_jump_thread_crash.sil +++ b/test/SILOptimizer/simplify_cfg_jump_thread_crash.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-cfg | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-cfg | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/simplify_cfg_select_enum.sil b/test/SILOptimizer/simplify_cfg_select_enum.sil index 68613334966ef..a6d807e3f8d3b 100644 --- a/test/SILOptimizer/simplify_cfg_select_enum.sil +++ b/test/SILOptimizer/simplify_cfg_select_enum.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-cfg | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -simplify-cfg | %FileCheck %s // Two select_enum instructions must not be considered as the same "condition", // even if they have the same enum operand. diff --git a/test/SILOptimizer/sink.sil b/test/SILOptimizer/sink.sil index 96e716f001baf..01677f72af11b 100644 --- a/test/SILOptimizer/sink.sil +++ b/test/SILOptimizer/sink.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -code-sinking | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -code-sinking | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/spec_archetype_method.swift b/test/SILOptimizer/spec_archetype_method.swift index 93740b462367d..511c6bc2ba7e2 100644 --- a/test/SILOptimizer/spec_archetype_method.swift +++ b/test/SILOptimizer/spec_archetype_method.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass="Function Signature Optimization" -disable-arc-opts -emit-sil -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass="Function Signature Optimization" -disable-arc-opts -emit-sil -primary-file %s | %FileCheck %s // We can't deserialize apply_inst with subst lists. When radar://14443304 // is fixed then we should convert this test to a SIL test. diff --git a/test/SILOptimizer/spec_conf1.swift b/test/SILOptimizer/spec_conf1.swift index ccac17c39bc7b..7b620e6b21eee 100644 --- a/test/SILOptimizer/spec_conf1.swift +++ b/test/SILOptimizer/spec_conf1.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass="Function Signature Optimization" -disable-arc-opts -emit-sil -Xllvm -enable-destroyhoisting=false %s | FileCheck %s +// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass="Function Signature Optimization" -disable-arc-opts -emit-sil -Xllvm -enable-destroyhoisting=false %s | %FileCheck %s // We can't deserialize apply_inst with subst lists. When radar://14443304 // is fixed then we should convert this test to a SIL test. diff --git a/test/SILOptimizer/spec_conf2.swift b/test/SILOptimizer/spec_conf2.swift index 0aa9764c1f9db..99540d2d1a8a2 100644 --- a/test/SILOptimizer/spec_conf2.swift +++ b/test/SILOptimizer/spec_conf2.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass="Function Signature Optimization" -disable-arc-opts -emit-sil -Xllvm -enable-destroyhoisting=false %s | FileCheck %s +// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass="Function Signature Optimization" -disable-arc-opts -emit-sil -Xllvm -enable-destroyhoisting=false %s | %FileCheck %s // We can't deserialize apply_inst with subst lists. When radar://14443304 // is fixed then we should convert this test to a SIL test. diff --git a/test/SILOptimizer/spec_recursion.swift b/test/SILOptimizer/spec_recursion.swift index 6278d72fa285c..95e1a830a2b0a 100644 --- a/test/SILOptimizer/spec_recursion.swift +++ b/test/SILOptimizer/spec_recursion.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s // Make sure we are not looping forever. diff --git a/test/SILOptimizer/specialization_of_stdlib_binary_only.swift b/test/SILOptimizer/specialization_of_stdlib_binary_only.swift index a7016d2b30321..dd814f5525046 100644 --- a/test/SILOptimizer/specialization_of_stdlib_binary_only.swift +++ b/test/SILOptimizer/specialization_of_stdlib_binary_only.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -parse-stdlib -parse-as-library -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -O -parse-stdlib -parse-as-library -emit-sil %s | %FileCheck %s // Make sure specialization of stdlib_binary_only functions are not marked // shared. Marking them shared would make their visibility hidden. Because diff --git a/test/SILOptimizer/specialize.sil b/test/SILOptimizer/specialize.sil index 8c72dfb25fdf5..37fdb8859c465 100644 --- a/test/SILOptimizer/specialize.sil +++ b/test/SILOptimizer/specialize.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -generic-specializer %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -generic-specializer %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/specialize_anyobject.swift b/test/SILOptimizer/specialize_anyobject.swift index 336385c33a12e..72909cb994a5d 100644 --- a/test/SILOptimizer/specialize_anyobject.swift +++ b/test/SILOptimizer/specialize_anyobject.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -sil-inline-threshold 0 -emit-sil -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -O -sil-inline-threshold 0 -emit-sil -primary-file %s | %FileCheck %s // rdar://problem/20338028 protocol PA: class { } diff --git a/test/SILOptimizer/specialize_apply_conf.swift b/test/SILOptimizer/specialize_apply_conf.swift index 772f365bea583..a0d9d5156a562 100644 --- a/test/SILOptimizer/specialize_apply_conf.swift +++ b/test/SILOptimizer/specialize_apply_conf.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -sil-inline-threshold 0 -emit-sil -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -O -sil-inline-threshold 0 -emit-sil -primary-file %s | %FileCheck %s // We can't deserialize apply_inst with subst lists. When radar://14443304 // is fixed then we should convert this test to a SIL test. diff --git a/test/SILOptimizer/specialize_cg_update_crash.sil b/test/SILOptimizer/specialize_cg_update_crash.sil index 76b07d2fd3157..77cdf3b42befd 100644 --- a/test/SILOptimizer/specialize_cg_update_crash.sil +++ b/test/SILOptimizer/specialize_cg_update_crash.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend -parse-stdlib -parse-as-library -module-name TestMod -sil-serialize-all %S/Inputs/TestMod.sil -emit-module-path %t/TestMod.swiftmodule -// RUN: %target-sil-opt -enable-sil-verify-all -inline -I %t %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -inline -I %t %s | %FileCheck %s // Test if the CG is updated correctly during specialization and // there is no crash because of a missing CG node for a deserialized function. diff --git a/test/SILOptimizer/specialize_chain.swift b/test/SILOptimizer/specialize_chain.swift index 430e63b7d3ee7..f946abf9b5cea 100644 --- a/test/SILOptimizer/specialize_chain.swift +++ b/test/SILOptimizer/specialize_chain.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass="Function Signature Optimization" -emit-sil -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass="Function Signature Optimization" -emit-sil -primary-file %s | %FileCheck %s // We can't deserialize apply_inst with subst lists. When radar://14443304 // is fixed then we should convert this test to a SIL test. diff --git a/test/SILOptimizer/specialize_checked_cast_branch.swift b/test/SILOptimizer/specialize_checked_cast_branch.swift index ee48516776a1a..63d1584b85403 100644 --- a/test/SILOptimizer/specialize_checked_cast_branch.swift +++ b/test/SILOptimizer/specialize_checked_cast_branch.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -emit-sil -O -sil-inline-threshold 0 %s -o - | not FileCheck %s +// RUN: %target-swift-frontend -emit-sil -O -sil-inline-threshold 0 %s -o - | %FileCheck %s + +// rdar://problem/27781189 +// XFAIL: * // FIXME: rdar://problem/18603827 diff --git a/test/SILOptimizer/specialize_class_inherits_base_inherits_protocol.swift b/test/SILOptimizer/specialize_class_inherits_base_inherits_protocol.swift index d6af9cc16f930..9a98d311249c2 100644 --- a/test/SILOptimizer/specialize_class_inherits_base_inherits_protocol.swift +++ b/test/SILOptimizer/specialize_class_inherits_base_inherits_protocol.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil -O %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil -O %s | %FileCheck %s protocol P { func p() -> Any.Type } protocol Q: P { } diff --git a/test/SILOptimizer/specialize_deep_generics.swift b/test/SILOptimizer/specialize_deep_generics.swift index 31c3edb71ef6b..f9d8d00199d0a 100644 --- a/test/SILOptimizer/specialize_deep_generics.swift +++ b/test/SILOptimizer/specialize_deep_generics.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s // Check that this Church Numerals inspired example does not hang // a compiler in the generic specializer. diff --git a/test/SILOptimizer/specialize_default_witness.sil b/test/SILOptimizer/specialize_default_witness.sil index b95262966fadd..16533c9d3db6b 100644 --- a/test/SILOptimizer/specialize_default_witness.sil +++ b/test/SILOptimizer/specialize_default_witness.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -generic-specializer %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -generic-specializer %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/specialize_ext.swift b/test/SILOptimizer/specialize_ext.swift index be510e97a8f20..44ce9d7244978 100644 --- a/test/SILOptimizer/specialize_ext.swift +++ b/test/SILOptimizer/specialize_ext.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil -primary-file %s | %FileCheck %s struct XXX { init(t : T) {m_t = t} diff --git a/test/SILOptimizer/specialize_inherited.sil b/test/SILOptimizer/specialize_inherited.sil index 6e42562893fbe..51969ddb6b1db 100644 --- a/test/SILOptimizer/specialize_inherited.sil +++ b/test/SILOptimizer/specialize_inherited.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -generic-specializer -module-name inherit | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -generic-specializer -module-name inherit | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/specialize_metatypes_with_nondefault_representation.sil b/test/SILOptimizer/specialize_metatypes_with_nondefault_representation.sil index b3edfdfa1bee3..77051889b6269 100644 --- a/test/SILOptimizer/specialize_metatypes_with_nondefault_representation.sil +++ b/test/SILOptimizer/specialize_metatypes_with_nondefault_representation.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -generic-specializer | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -generic-specializer | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILOptimizer/specialize_partial_apply.swift b/test/SILOptimizer/specialize_partial_apply.swift index 54f96873be179..bf5fed2bbfcfe 100644 --- a/test/SILOptimizer/specialize_partial_apply.swift +++ b/test/SILOptimizer/specialize_partial_apply.swift @@ -1,10 +1,10 @@ // First check the SIL. -// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass="Function Signature Optimization" -module-name=test -emit-sil -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass="Function Signature Optimization" -module-name=test -emit-sil -primary-file %s | %FileCheck %s // Also do an end-to-end test to check all components, including IRGen. // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -O -Xllvm -sil-disable-pass="Function Signature Optimization" -module-name=test %s -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck %s -check-prefix=CHECK-OUTPUT +// RUN: %target-run %t/a.out | %FileCheck %s -check-prefix=CHECK-OUTPUT // REQUIRES: executable_test struct MyError : Error { diff --git a/test/SILOptimizer/specialize_property_behavior.swift b/test/SILOptimizer/specialize_property_behavior.swift index 22f8800a5c411..70dc89e79e958 100644 --- a/test/SILOptimizer/specialize_property_behavior.swift +++ b/test/SILOptimizer/specialize_property_behavior.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil -parse-as-library -O -enable-experimental-property-behaviors %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil -parse-as-library -O -enable-experimental-property-behaviors %s | %FileCheck %s @inline(never) func whatever() -> T { fatalError("") } diff --git a/test/SILOptimizer/specialize_reabstraction.sil b/test/SILOptimizer/specialize_reabstraction.sil index be63d0f25a763..1b6f4a94b84b5 100644 --- a/test/SILOptimizer/specialize_reabstraction.sil +++ b/test/SILOptimizer/specialize_reabstraction.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -generic-specializer %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -generic-specializer %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/specialize_recursive_generics.sil b/test/SILOptimizer/specialize_recursive_generics.sil index 4cfc7e7473aa8..540eb8af02be9 100644 --- a/test/SILOptimizer/specialize_recursive_generics.sil +++ b/test/SILOptimizer/specialize_recursive_generics.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -generic-specializer -cse | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -generic-specializer -cse | %FileCheck %s // Check that SIL cloner can correctly handle specialization of recursive // functions with generic arguments. diff --git a/test/SILOptimizer/specialize_self.swift b/test/SILOptimizer/specialize_self.swift index dd1cdf3e3e956..a93067facb71a 100644 --- a/test/SILOptimizer/specialize_self.swift +++ b/test/SILOptimizer/specialize_self.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -O -sil-inline-threshold 0 -emit-sil -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -O -sil-inline-threshold 0 -emit-sil -primary-file %s | %FileCheck %s // CHECK-NOT: generic specialization of specialize_self.cast (A) -> Swift.Optional diff --git a/test/SILOptimizer/specialize_unconditional_checked_cast.swift b/test/SILOptimizer/specialize_unconditional_checked_cast.swift index 6b07e281eae0d..aa3f7a9c525f5 100644 --- a/test/SILOptimizer/specialize_unconditional_checked_cast.swift +++ b/test/SILOptimizer/specialize_unconditional_checked_cast.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -sil-disable-pass="Function Signature Optimization" -emit-sil -o - -O %s | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-disable-pass="Function Signature Optimization" -emit-sil -o - -O %s | %FileCheck %s ////////////////// // Declarations // diff --git a/test/SILOptimizer/split_critical_edges.sil b/test/SILOptimizer/split_critical_edges.sil index 76ce59a656de8..89a68599a4be3 100644 --- a/test/SILOptimizer/split_critical_edges.sil +++ b/test/SILOptimizer/split_critical_edges.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -split-critical-edges | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -split-critical-edges | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/sroa.sil b/test/SILOptimizer/sroa.sil index 729f2578db758..3b6875de44bc6 100644 --- a/test/SILOptimizer/sroa.sil +++ b/test/SILOptimizer/sroa.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -sroa %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -sroa %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/sroa_bbargs.sil b/test/SILOptimizer/sroa_bbargs.sil index aa2702c87dbd0..8a087514bc81c 100644 --- a/test/SILOptimizer/sroa_bbargs.sil +++ b/test/SILOptimizer/sroa_bbargs.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -sroa-bb-args %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -sroa-bb-args %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/sroa_unreferenced_members.swift b/test/SILOptimizer/sroa_unreferenced_members.swift index 7b626e4b1dd2e..cce1ea7ac3224 100644 --- a/test/SILOptimizer/sroa_unreferenced_members.swift +++ b/test/SILOptimizer/sroa_unreferenced_members.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -O -emit-sil -I %S/Inputs -enable-source-import -primary-file %s | FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -O -emit-sil -I %S/Inputs -enable-source-import -primary-file %s | %FileCheck %s import gizmo diff --git a/test/SILOptimizer/stack_promotion.sil b/test/SILOptimizer/stack_promotion.sil index a6b1cc7fa993f..30c6d66322f48 100644 --- a/test/SILOptimizer/stack_promotion.sil +++ b/test/SILOptimizer/stack_promotion.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -stack-promotion -enable-sil-verify-all %s | FileCheck %s +// RUN: %target-sil-opt -stack-promotion -enable-sil-verify-all %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/stack_promotion_escaping.swift b/test/SILOptimizer/stack_promotion_escaping.swift index 39cb4c69b1e8a..692e0a5415322 100644 --- a/test/SILOptimizer/stack_promotion_escaping.swift +++ b/test/SILOptimizer/stack_promotion_escaping.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -O -module-name=test %s -emit-sil | FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -O -module-name=test %s -emit-sil | %FileCheck %s final class Item {} diff --git a/test/SILOptimizer/static_initializer.sil b/test/SILOptimizer/static_initializer.sil index 420ca5d55075f..ae746cce74118 100644 --- a/test/SILOptimizer/static_initializer.sil +++ b/test/SILOptimizer/static_initializer.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all %s -global-opt | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %s -global-opt | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/strip_debug_info.sil b/test/SILOptimizer/strip_debug_info.sil index 4ecddbba249d5..351d37f79669e 100644 --- a/test/SILOptimizer/strip_debug_info.sil +++ b/test/SILOptimizer/strip_debug_info.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -strip-debug-info %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -strip-debug-info %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/super_class_method.swift b/test/SILOptimizer/super_class_method.swift index be112e97d4991..873261a8d24aa 100644 --- a/test/SILOptimizer/super_class_method.swift +++ b/test/SILOptimizer/super_class_method.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil %s | %FileCheck %s class Parent { @inline(never) diff --git a/test/SILOptimizer/super_init.swift b/test/SILOptimizer/super_init.swift index 388251b67885a..3d7dd4dbcdbd5 100644 --- a/test/SILOptimizer/super_init.swift +++ b/test/SILOptimizer/super_init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil %s | %FileCheck %s // CHECK-LABEL: sil hidden [noinline] @_TFC10super_init3FooCfSiS0_ : $@convention(method) (Int, @thick Foo.Type) -> @owned Foo // CHECK-NOT: class_method diff --git a/test/SILOptimizer/super_method.swift b/test/SILOptimizer/super_method.swift index e83b790079585..c8c0f2882db77 100644 --- a/test/SILOptimizer/super_method.swift +++ b/test/SILOptimizer/super_method.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil %s | %FileCheck %s class Parent { @inline(never) diff --git a/test/SILOptimizer/super_objc_class_method.swift b/test/SILOptimizer/super_objc_class_method.swift index d16d20470fc3c..a18ee3b97e0cb 100644 --- a/test/SILOptimizer/super_objc_class_method.swift +++ b/test/SILOptimizer/super_objc_class_method.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -emit-sil %s | FileCheck %s -// RUN: %target-swift-frontend -emit-sil -I %S/Inputs -enable-source-import %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILOptimizer/swap_refcnt.swift b/test/SILOptimizer/swap_refcnt.swift index 69c0dcfcdbfbf..6abfc1732b7d5 100644 --- a/test/SILOptimizer/swap_refcnt.swift +++ b/test/SILOptimizer/swap_refcnt.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -O -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s // REQUIRES: rdar:27506150> SILOptimizer/swap_refcnt.swift fails after noreturn -> Never changes // Make sure we can swap two values in an array without retaining anything. diff --git a/test/SILOptimizer/throw_inline.swift b/test/SILOptimizer/throw_inline.swift index a6ac0c88e7afc..cbfe9fbf0edc5 100644 --- a/test/SILOptimizer/throw_inline.swift +++ b/test/SILOptimizer/throw_inline.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil %s | %FileCheck %s // Make sure that we are able to inline try-apply instructions. diff --git a/test/SILOptimizer/typed-access-tb-aa.sil b/test/SILOptimizer/typed-access-tb-aa.sil index 47af2fbc41a4c..94242f2798076 100644 --- a/test/SILOptimizer/typed-access-tb-aa.sil +++ b/test/SILOptimizer/typed-access-tb-aa.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt %s -aa=typed-access-tb-aa -aa-dump -o /dev/null | FileCheck %s +// RUN: %target-sil-opt %s -aa=typed-access-tb-aa -aa-dump -o /dev/null | %FileCheck %s // REQUIRES: asserts diff --git a/test/SILOptimizer/unexpected_error.sil b/test/SILOptimizer/unexpected_error.sil index 9be8ffd78299e..e57a4afb77914 100644 --- a/test/SILOptimizer/unexpected_error.sil +++ b/test/SILOptimizer/unexpected_error.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -dce %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -dce %s | %FileCheck %s import Swift // CHECK-LABEL: sil @unexpected_error : $@convention(thin) (Error) -> () { diff --git a/test/SILOptimizer/unreachable_dealloc_stack.sil b/test/SILOptimizer/unreachable_dealloc_stack.sil index 7cfbf09da0960..2ccff1bf1e82f 100644 --- a/test/SILOptimizer/unreachable_dealloc_stack.sil +++ b/test/SILOptimizer/unreachable_dealloc_stack.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -module-name Swift -enable-sil-verify-all %s -diagnostics | FileCheck %s +// RUN: %target-sil-opt -module-name Swift -enable-sil-verify-all %s -diagnostics | %FileCheck %s sil_stage raw diff --git a/test/SILOptimizer/unsafe_guaranteed_peephole.sil b/test/SILOptimizer/unsafe_guaranteed_peephole.sil index ec9549077beb3..c5aee94a082b5 100644 --- a/test/SILOptimizer/unsafe_guaranteed_peephole.sil +++ b/test/SILOptimizer/unsafe_guaranteed_peephole.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -enable-sil-verify-all -unsafe-guaranteed-peephole %s | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all -unsafe-guaranteed-peephole %s | %FileCheck %s sil_stage canonical import Builtin diff --git a/test/SILOptimizer/unused_containers.swift b/test/SILOptimizer/unused_containers.swift index 858d449e22d86..69e5f37cc4b37 100644 --- a/test/SILOptimizer/unused_containers.swift +++ b/test/SILOptimizer/unused_containers.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -O -emit-sil | grep -v 'builtin "onFastPath"' | FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -O -emit-sil | grep -v 'builtin "onFastPath"' | %FileCheck %s // REQUIRES: swift_stdlib_no_asserts diff --git a/test/SILOptimizer/verifier_reject.sil b/test/SILOptimizer/verifier_reject.sil index 28fb40fe02aa7..ecfeaccd49916 100644 --- a/test/SILOptimizer/verifier_reject.sil +++ b/test/SILOptimizer/verifier_reject.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: not --crash %target-sil-opt -enable-sil-verify-all %s 2> %t/err.txt -// RUN: FileCheck %s < %t/err.txt +// RUN: %FileCheck %s < %t/err.txt // REQUIRES: asserts diff --git a/test/Sanitizers/asan.swift b/test/Sanitizers/asan.swift index 08fe17eb3e04c..732c060be99bc 100644 --- a/test/Sanitizers/asan.swift +++ b/test/Sanitizers/asan.swift @@ -1,5 +1,5 @@ // RUN: %target-swiftc_driver %s -g -sanitize=address -o %t_tsan-binary -// RUN: not env ASAN_OPTIONS=abort_on_error=0 %target-run %t_tsan-binary 2>&1 | FileCheck %s +// RUN: not env ASAN_OPTIONS=abort_on_error=0 %target-run %t_tsan-binary 2>&1 | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop // REQUIRES: asan_runtime diff --git a/test/Sanitizers/tsan.swift b/test/Sanitizers/tsan.swift index 776a3aa23ab66..af7f98fdde35b 100644 --- a/test/Sanitizers/tsan.swift +++ b/test/Sanitizers/tsan.swift @@ -1,5 +1,5 @@ // RUN: %target-swiftc_driver %s -g -sanitize=thread -o %t_tsan-binary -// RUN: not env TSAN_OPTIONS=abort_on_error=0 %target-run %t_tsan-binary 2>&1 | FileCheck %s +// RUN: not env TSAN_OPTIONS=abort_on_error=0 %target-run %t_tsan-binary 2>&1 | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop // REQUIRES: CPU=x86_64 diff --git a/test/Sema/availability_refinement_contexts.swift b/test/Sema/availability_refinement_contexts.swift index 9336681d1f487..f1e8af0865b16 100644 --- a/test/Sema/availability_refinement_contexts.swift +++ b/test/Sema/availability_refinement_contexts.swift @@ -1,5 +1,5 @@ // RUN: %target-swift-frontend -parse -dump-type-refinement-contexts %s > %t.dump 2>&1 -// RUN: FileCheck --strict-whitespace %s < %t.dump +// RUN: %FileCheck --strict-whitespace %s < %t.dump // REQUIRES: OS=macosx diff --git a/test/Sema/availability_versions.swift b/test/Sema/availability_versions.swift index 894147e2a42ef..7b5fd1e5cb1d7 100644 --- a/test/Sema/availability_versions.swift +++ b/test/Sema/availability_versions.swift @@ -1,8 +1,8 @@ // RUN: %target-parse-verify-swift -target x86_64-apple-macosx10.50 -disable-objc-attr-requires-foundation-module -// RUN: not %target-swift-frontend -target x86_64-apple-macosx10.50 -disable-objc-attr-requires-foundation-module -parse %s 2>&1 | FileCheck %s '--implicit-check-not=:0' +// RUN: not %target-swift-frontend -target x86_64-apple-macosx10.50 -disable-objc-attr-requires-foundation-module -parse %s 2>&1 | %FileCheck %s '--implicit-check-not=:0' // Make sure we do not emit availability errors or warnings when -disable-availability-checking is passed -// RUN: not %target-swift-frontend -target x86_64-apple-macosx10.50 -parse -disable-objc-attr-requires-foundation-module -disable-availability-checking %s 2>&1 | FileCheck %s '--implicit-check-not=error:' '--implicit-check-not=warning:' +// RUN: not %target-swift-frontend -target x86_64-apple-macosx10.50 -parse -disable-objc-attr-requires-foundation-module -disable-availability-checking %s 2>&1 | %FileCheck %s '--implicit-check-not=error:' '--implicit-check-not=warning:' // REQUIRES: OS=macosx diff --git a/test/Sema/availability_versions_objc_api.swift b/test/Sema/availability_versions_objc_api.swift index 06821305fb546..1fae4415cd69a 100644 --- a/test/Sema/availability_versions_objc_api.swift +++ b/test/Sema/availability_versions_objc_api.swift @@ -1,5 +1,5 @@ // RUN: %target-parse-verify-swift %clang-importer-sdk -I %S/Inputs/custom-modules -// RUN: not %target-swift-frontend -parse %clang-importer-sdk -I %S/Inputs/custom-modules %s 2>&1 | FileCheck %s +// RUN: not %target-swift-frontend -parse %clang-importer-sdk -I %S/Inputs/custom-modules %s 2>&1 | %FileCheck %s // REQUIRES: OS=macosx // REQUIRES: objc_interop diff --git a/test/Sema/check_unnecessary_typecheck.swift b/test/Sema/check_unnecessary_typecheck.swift index de9c4ae188c74..73cdcb07fba23 100644 --- a/test/Sema/check_unnecessary_typecheck.swift +++ b/test/Sema/check_unnecessary_typecheck.swift @@ -1,6 +1,6 @@ // This test will crash if we end up doing unnecessary typechecking from the secondary file. -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-sil -primary-file %s %S/Inputs/forbid_typecheck_2.swift -debug-forbid-typecheck-prefix NOTYPECHECK | FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-sil -primary-file %s %S/Inputs/forbid_typecheck_2.swift -debug-forbid-typecheck-prefix NOTYPECHECK | %FileCheck %s // CHECK: check_unnecessary_typecheck.globalPrim let globalPrim = globalSec diff --git a/test/Sema/deprecation_osx.swift b/test/Sema/deprecation_osx.swift index abe19ad920d1f..3b50e6f11f2d6 100644 --- a/test/Sema/deprecation_osx.swift +++ b/test/Sema/deprecation_osx.swift @@ -1,5 +1,5 @@ // RUN: %swift -parse -parse-as-library -target x86_64-apple-macosx10.51 %clang-importer-sdk -I %S/Inputs/custom-modules %s -verify -// RUN: %swift -parse -parse-as-library -target x86_64-apple-macosx10.51 %clang-importer-sdk -I %S/Inputs/custom-modules %s 2>&1 | FileCheck %s '--implicit-check-not=:0' +// RUN: %swift -parse -parse-as-library -target x86_64-apple-macosx10.51 %clang-importer-sdk -I %S/Inputs/custom-modules %s 2>&1 | %FileCheck %s '--implicit-check-not=:0' // // This test requires a target of OS X 10.51 or later to test deprecation // diagnostics because (1) we only emit deprecation warnings if a symbol is diff --git a/test/Serialization/alignment.swift b/test/Serialization/alignment.swift index 193e445b8c690..4b5877494899c 100644 --- a/test/Serialization/alignment.swift +++ b/test/Serialization/alignment.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend %s -emit-module -parse-as-library -o %t -// RUN: %target-sil-opt -enable-sil-verify-all %t/alignment.swiftmodule -o - | FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %t/alignment.swiftmodule -o - | %FileCheck %s //CHECK: @_alignment(16) struct Foo { @_alignment(16) struct Foo {} diff --git a/test/Serialization/always_inline.swift b/test/Serialization/always_inline.swift index 4816fdab7c65b..fb8a0309022e3 100644 --- a/test/Serialization/always_inline.swift +++ b/test/Serialization/always_inline.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -sil-serialize-all -o %t %S/Inputs/def_always_inline.swift -// RUN: llvm-bcanalyzer %t/def_always_inline.swiftmodule | FileCheck %s -// RUN: %target-swift-frontend -emit-silgen -sil-link-all -I %t %s | FileCheck %s -check-prefix=SIL +// RUN: llvm-bcanalyzer %t/def_always_inline.swiftmodule | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -sil-link-all -I %t %s | %FileCheck %s -check-prefix=SIL // CHECK-NOT: UnknownCode diff --git a/test/Serialization/array.swift b/test/Serialization/array.swift index b87fb8eaa5115..b1a71171ab998 100644 --- a/test/Serialization/array.swift +++ b/test/Serialization/array.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/has_array.swift -// RUN: llvm-bcanalyzer %t/has_array.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %t/has_array.swiftmodule | %FileCheck %s // RUN: %target-swift-frontend -emit-silgen -I %t %s -o /dev/null // XFAIL: * diff --git a/test/Serialization/autolinking.swift b/test/Serialization/autolinking.swift index 8a67b8fc9bee5..fb664c0f5e56e 100644 --- a/test/Serialization/autolinking.swift +++ b/test/Serialization/autolinking.swift @@ -2,23 +2,23 @@ // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -parse-stdlib -o %t -module-name someModule -module-link-name module %S/../Inputs/empty.swift // RUN: %target-swift-frontend -emit-ir -lmagic %s -I %t > %t/out.txt -// RUN: FileCheck %s < %t/out.txt -// RUN: FileCheck -check-prefix=NO-FORCE-LOAD %s < %t/out.txt +// RUN: %FileCheck %s < %t/out.txt +// RUN: %FileCheck -check-prefix=NO-FORCE-LOAD %s < %t/out.txt // RUN: mkdir -p %t/someModule.framework/Modules/someModule.swiftmodule/ // RUN: mv %t/someModule.swiftmodule %t/someModule.framework/Modules/someModule.swiftmodule/%target-swiftmodule-name // RUN: %target-swift-frontend -emit-ir -lmagic %s -F %t > %t/framework.txt -// RUN: FileCheck -check-prefix=FRAMEWORK %s < %t/framework.txt -// RUN: FileCheck -check-prefix=NO-FORCE-LOAD %s < %t/framework.txt +// RUN: %FileCheck -check-prefix=FRAMEWORK %s < %t/framework.txt +// RUN: %FileCheck -check-prefix=NO-FORCE-LOAD %s < %t/framework.txt // RUN: %target-swift-frontend -emit-module -parse-stdlib -o %t -module-name someModule -module-link-name module %S/../Inputs/empty.swift -autolink-force-load // RUN: %target-swift-frontend -emit-ir -lmagic %s -I %t > %t/force-load.txt -// RUN: FileCheck %s < %t/force-load.txt -// RUN: FileCheck -check-prefix=FORCE-LOAD-CLIENT %s < %t/force-load.txt +// RUN: %FileCheck %s < %t/force-load.txt +// RUN: %FileCheck -check-prefix=FORCE-LOAD-CLIENT %s < %t/force-load.txt -// RUN: %target-swift-frontend -emit-ir -parse-stdlib -module-name someModule -module-link-name module %S/../Inputs/empty.swift | FileCheck --check-prefix=NO-FORCE-LOAD %s -// RUN: %target-swift-frontend -emit-ir -parse-stdlib -module-name someModule -module-link-name module %S/../Inputs/empty.swift -autolink-force-load | FileCheck --check-prefix=FORCE-LOAD %s -// RUN: %target-swift-frontend -emit-ir -parse-stdlib -module-name someModule -module-link-name 0module %S/../Inputs/empty.swift -autolink-force-load | FileCheck --check-prefix=FORCE-LOAD-HEX %s +// RUN: %target-swift-frontend -emit-ir -parse-stdlib -module-name someModule -module-link-name module %S/../Inputs/empty.swift | %FileCheck --check-prefix=NO-FORCE-LOAD %s +// RUN: %target-swift-frontend -emit-ir -parse-stdlib -module-name someModule -module-link-name module %S/../Inputs/empty.swift -autolink-force-load | %FileCheck --check-prefix=FORCE-LOAD %s +// RUN: %target-swift-frontend -emit-ir -parse-stdlib -module-name someModule -module-link-name 0module %S/../Inputs/empty.swift -autolink-force-load | %FileCheck --check-prefix=FORCE-LOAD-HEX %s // Linux uses a different autolinking mechanism, based on // swift-autolink-extract. This file tests the Darwin mechanism. diff --git a/test/Serialization/basic_sil.swift b/test/Serialization/basic_sil.swift index 3d10937e98a52..f51e95b611640 100644 --- a/test/Serialization/basic_sil.swift +++ b/test/Serialization/basic_sil.swift @@ -1,13 +1,13 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-build-swift -emit-module -Xfrontend -disable-diagnostic-passes -Xfrontend -sil-serialize-all -force-single-frontend-invocation -o %t/def_basic.swiftmodule %S/Inputs/def_basic.sil -// RUN: llvm-bcanalyzer %t/def_basic.swiftmodule | FileCheck %s -// RUN: %target-build-swift -emit-silgen -Xfrontend -sil-link-all -I %t %s | FileCheck %S/Inputs/def_basic.sil +// RUN: llvm-bcanalyzer %t/def_basic.swiftmodule | %FileCheck %s +// RUN: %target-build-swift -emit-silgen -Xfrontend -sil-link-all -I %t %s | %FileCheck %S/Inputs/def_basic.sil // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-build-swift -emit-module -Xfrontend -disable-diagnostic-passes -force-single-frontend-invocation -Xfrontend -sil-serialize-all -o %t/def_basic.swiftmodule %S/Inputs/def_basic.sil -// RUN: %target-build-swift -emit-silgen -Xfrontend -sil-link-all -I %t %s | FileCheck -check-prefix=CHECK_DECL %S/Inputs/def_basic.sil +// RUN: %target-build-swift -emit-silgen -Xfrontend -sil-link-all -I %t %s | %FileCheck -check-prefix=CHECK_DECL %S/Inputs/def_basic.sil // This test currently is written such that no optimizations are assumed. // REQUIRES: swift_test_mode_optimize_none diff --git a/test/Serialization/basic_sil_objc.swift b/test/Serialization/basic_sil_objc.swift index 998f110b39ee9..36afc629c7570 100644 --- a/test/Serialization/basic_sil_objc.swift +++ b/test/Serialization/basic_sil_objc.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-build-swift -Xfrontend %clang-importer-sdk -I %S/../Inputs/clang-importer-sdk/swift-modules -emit-module -Xfrontend -disable-diagnostic-passes -Xfrontend -sil-serialize-all -force-single-frontend-invocation -o %t/def_basic_objc.swiftmodule %S/Inputs/def_basic_objc.sil -// RUN: llvm-bcanalyzer %t/def_basic_objc.swiftmodule | FileCheck %s -// RUN: %target-build-swift -Xfrontend %clang-importer-sdk -emit-silgen -Xfrontend -sil-link-all -I %t %s | FileCheck %S/Inputs/def_basic_objc.sil +// RUN: llvm-bcanalyzer %t/def_basic_objc.swiftmodule | %FileCheck %s +// RUN: %target-build-swift -Xfrontend %clang-importer-sdk -emit-silgen -Xfrontend -sil-link-all -I %t %s | %FileCheck %S/Inputs/def_basic_objc.sil // This test currently is written such that no optimizations are assumed. // REQUIRES: swift_test_mode_optimize_none diff --git a/test/Serialization/builtin.swift b/test/Serialization/builtin.swift index 51bd5cb018157..44f94a8e222ef 100644 --- a/test/Serialization/builtin.swift +++ b/test/Serialization/builtin.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -parse-stdlib -o %t %S/Inputs/alias_builtin.swift -// RUN: llvm-bcanalyzer %t/alias_builtin.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %t/alias_builtin.swiftmodule | %FileCheck %s // RUN: %target-swift-frontend -I %t -parse %s -verify // CHECK-NOT: UnknownCode diff --git a/test/Serialization/class-roundtrip-module.swift b/test/Serialization/class-roundtrip-module.swift index 2351c851586c1..186f23d217e89 100644 --- a/test/Serialization/class-roundtrip-module.swift +++ b/test/Serialization/class-roundtrip-module.swift @@ -2,6 +2,6 @@ // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -module-name def_class -o %t/stage1.swiftmodule %S/Inputs/def_class.swift -disable-objc-attr-requires-foundation-module // RUN: %target-swift-frontend -emit-module -parse-as-library -o %t/def_class.swiftmodule %t/stage1.swiftmodule -// RUN: %target-swift-frontend -emit-sil -Xllvm -sil-disable-pass="External Defs To Decls" -sil-debug-serialization -I %t %S/class.swift | FileCheck %s -check-prefix=SIL +// RUN: %target-swift-frontend -emit-sil -Xllvm -sil-disable-pass="External Defs To Decls" -sil-debug-serialization -I %t %S/class.swift | %FileCheck %s -check-prefix=SIL // SIL-LABEL: sil public_external [transparent] [fragile] @_TFsoi1pFTSiSi_Si : $@convention(thin) (Int, Int) -> Int { diff --git a/test/Serialization/class.swift b/test/Serialization/class.swift index 49ce16a97dc2e..e2a09cae55b1c 100644 --- a/test/Serialization/class.swift +++ b/test/Serialization/class.swift @@ -1,9 +1,9 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-object -emit-module -o %t %S/Inputs/def_class.swift -disable-objc-attr-requires-foundation-module -// RUN: llvm-bcanalyzer %t/def_class.swiftmodule | FileCheck %s -// RUN: %target-swift-frontend -emit-sil -Xllvm -sil-disable-pass="External Defs To Decls" -sil-debug-serialization -I %t %s | FileCheck %s -check-prefix=SIL -// RUN: echo "import def_class; struct A : ClassProto {}" | not %target-swift-frontend -parse -I %t - 2>&1 | FileCheck %s -check-prefix=CHECK-STRUCT +// RUN: llvm-bcanalyzer %t/def_class.swiftmodule | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -Xllvm -sil-disable-pass="External Defs To Decls" -sil-debug-serialization -I %t %s | %FileCheck %s -check-prefix=SIL +// RUN: echo "import def_class; struct A : ClassProto {}" | not %target-swift-frontend -parse -I %t - 2>&1 | %FileCheck %s -check-prefix=CHECK-STRUCT // CHECK-NOT: UnknownCode // CHECK-STRUCT: non-class type 'A' cannot conform to class protocol 'ClassProto' diff --git a/test/Serialization/comments-framework.swift b/test/Serialization/comments-framework.swift index ba254bac6274c..1bbf3fc8d1930 100644 --- a/test/Serialization/comments-framework.swift +++ b/test/Serialization/comments-framework.swift @@ -2,10 +2,10 @@ // RUN: mkdir -p %t/comments.framework/Modules/comments.swiftmodule/ // RUN: %target-swift-frontend -module-name comments -emit-module -emit-module-path %t/comments.framework/Modules/comments.swiftmodule/%target-swiftmodule-name -emit-module-doc-path %t/comments.framework/Modules/comments.swiftmodule/%target-swiftdoc-name %s -// RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -source-filename %s -F %t | FileCheck %s +// RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -source-filename %s -F %t | %FileCheck %s // RUN: cp -r %t/comments.framework/Modules/comments.swiftmodule %t/comments.swiftmodule -// RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -source-filename %s -I %t | FileCheck %s +// RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -source-filename %s -I %t | %FileCheck %s // XFAIL: linux diff --git a/test/Serialization/comments-hidden.swift b/test/Serialization/comments-hidden.swift index e5d045c25ed29..04b01a3af8825 100644 --- a/test/Serialization/comments-hidden.swift +++ b/test/Serialization/comments-hidden.swift @@ -4,8 +4,8 @@ // RUN: mkdir %t // RUN: %target-swift-frontend -module-name comments -emit-module -emit-module-path %t/comments.swiftmodule -emit-module-doc -emit-module-doc-path %t/comments.swiftdoc %s // RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -source-filename %s -I %t > %t.normal.txt -// RUN: FileCheck %s -check-prefix=NORMAL < %t.normal.txt -// RUN: FileCheck %s -check-prefix=NORMAL-NEGATIVE < %t.normal.txt +// RUN: %FileCheck %s -check-prefix=NORMAL < %t.normal.txt +// RUN: %FileCheck %s -check-prefix=NORMAL-NEGATIVE < %t.normal.txt // Test the case when we compile with -enable-testing // @@ -13,8 +13,8 @@ // RUN: mkdir %t // RUN: %target-swift-frontend -enable-testing -module-name comments -emit-module -emit-module-path %t/comments.swiftmodule -emit-module-doc -emit-module-doc-path %t/comments.swiftdoc %s // RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -source-filename %s -I %t > %t.testing.txt -// RUN: FileCheck %s -check-prefix=TESTING < %t.testing.txt -// RUN: FileCheck %s -check-prefix=TESTING-NEGATIVE < %t.testing.txt +// RUN: %FileCheck %s -check-prefix=TESTING < %t.testing.txt +// RUN: %FileCheck %s -check-prefix=TESTING-NEGATIVE < %t.testing.txt /// PublicClass Documentation public class PublicClass { diff --git a/test/Serialization/comments.swift b/test/Serialization/comments.swift index f4fb601c6c82d..6430235f0626d 100644 --- a/test/Serialization/comments.swift +++ b/test/Serialization/comments.swift @@ -3,9 +3,9 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -module-name comments -emit-module -emit-module-path %t/comments.swiftmodule -emit-module-doc -emit-module-doc-path %t/comments.swiftdoc %s -// RUN: llvm-bcanalyzer %t/comments.swiftmodule | FileCheck %s -check-prefix=BCANALYZER -// RUN: llvm-bcanalyzer %t/comments.swiftdoc | FileCheck %s -check-prefix=BCANALYZER -// RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -source-filename %s -I %t | FileCheck %s -check-prefix=FIRST +// RUN: llvm-bcanalyzer %t/comments.swiftmodule | %FileCheck %s -check-prefix=BCANALYZER +// RUN: llvm-bcanalyzer %t/comments.swiftdoc | %FileCheck %s -check-prefix=BCANALYZER +// RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -source-filename %s -I %t | %FileCheck %s -check-prefix=FIRST // Test the case when we have a multiple files in a module. // @@ -14,11 +14,11 @@ // RUN: %target-swift-frontend -module-name comments -emit-module -emit-module-path %t/first.swiftmodule -emit-module-doc -emit-module-doc-path %t/first.swiftdoc -primary-file %s %S/Inputs/def_comments.swift // RUN: %target-swift-frontend -module-name comments -emit-module -emit-module-path %t/second.swiftmodule -emit-module-doc -emit-module-doc-path %t/second.swiftdoc %s -primary-file %S/Inputs/def_comments.swift // RUN: %target-swift-frontend -module-name comments -emit-module -emit-module-path %t/comments.swiftmodule -emit-module-doc -emit-module-doc-path %t/comments.swiftdoc %t/first.swiftmodule %t/second.swiftmodule -// RUN: llvm-bcanalyzer %t/comments.swiftmodule | FileCheck %s -check-prefix=BCANALYZER -// RUN: llvm-bcanalyzer %t/comments.swiftdoc | FileCheck %s -check-prefix=BCANALYZER +// RUN: llvm-bcanalyzer %t/comments.swiftmodule | %FileCheck %s -check-prefix=BCANALYZER +// RUN: llvm-bcanalyzer %t/comments.swiftdoc | %FileCheck %s -check-prefix=BCANALYZER // RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -source-filename %s -I %t > %t.printed.txt -// RUN: FileCheck %s -check-prefix=FIRST < %t.printed.txt -// RUN: FileCheck %s -check-prefix=SECOND < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=FIRST < %t.printed.txt +// RUN: %FileCheck %s -check-prefix=SECOND < %t.printed.txt // BCANALYZER-NOT: UnknownCode diff --git a/test/Serialization/default_silfunction_deserializationfrom_stdlib.swift b/test/Serialization/default_silfunction_deserializationfrom_stdlib.swift index 15b53fba7584c..5f5debeb97f03 100644 --- a/test/Serialization/default_silfunction_deserializationfrom_stdlib.swift +++ b/test/Serialization/default_silfunction_deserializationfrom_stdlib.swift @@ -1,6 +1,6 @@ // FIXME: depends on brittle stdlib implementation details // XFAIL: * -// RUN: %target-swift-frontend %s -emit-sil -O -o - -sil-debug-serialization | FileCheck %s +// RUN: %target-swift-frontend %s -emit-sil -O -o - -sil-debug-serialization | %FileCheck %s // CHECK-DAG: sil public_external [transparent] @_TFsoi1pU__FT3lhsGVs13UnsafeMutablePointerQ__3rhsSi_GS_Q__ : $@convention(thin) (UnsafeMutablePointer, Int) -> UnsafeMutablePointer { // CHECK-DAG: sil public_external @_TFVs13UnsafeMutablePointerCU__fMGS_Q__FT5valueBp_GS_Q__ : $@convention(thin) (Builtin.RawPointer, @thin UnsafeMutablePointer.Type) -> UnsafeMutablePointer { diff --git a/test/Serialization/empty.swift b/test/Serialization/empty.swift index 8892a8ab90dae..299b2425f0723 100644 --- a/test/Serialization/empty.swift +++ b/test/Serialization/empty.swift @@ -2,8 +2,8 @@ // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -parse-stdlib -o %t %s // RUN: llvm-bcanalyzer -dump %t/empty.swiftmodule > %t/empty.dump.txt -// RUN: FileCheck %s < %t/empty.dump.txt -// RUN: FileCheck -check-prefix=NEGATIVE %s < %t/empty.dump.txt +// RUN: %FileCheck %s < %t/empty.dump.txt +// RUN: %FileCheck -check-prefix=NEGATIVE %s < %t/empty.dump.txt // CHECK: // CHECK: blob data = 'empty' diff --git a/test/Serialization/enum.swift b/test/Serialization/enum.swift index f006129114f0b..58511dc965046 100644 --- a/test/Serialization/enum.swift +++ b/test/Serialization/enum.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -module-name def_enum -o %t %S/Inputs/def_enum.swift %S/Inputs/def_enum_derived.swift -// RUN: llvm-bcanalyzer %t/def_enum.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %t/def_enum.swiftmodule | %FileCheck %s // RUN: %target-swift-frontend -parse -I %t %s -o /dev/null // RUN: %target-swift-frontend -emit-sil -I %t %s -o /dev/null diff --git a/test/Serialization/function.swift b/test/Serialization/function.swift index 5316fe9816052..6c7a8d87514bb 100644 --- a/test/Serialization/function.swift +++ b/test/Serialization/function.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/def_func.swift -// RUN: llvm-bcanalyzer %t/def_func.swiftmodule | FileCheck %s -// RUN: %target-swift-frontend -emit-silgen -I %t %s | FileCheck %s -check-prefix=SIL +// RUN: llvm-bcanalyzer %t/def_func.swiftmodule | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -I %t %s | %FileCheck %s -check-prefix=SIL // CHECK-NOT: FALL_BACK_TO_TRANSLATION_UNIT // CHECK-NOT: UnknownCode diff --git a/test/Serialization/generic_extension.swift b/test/Serialization/generic_extension.swift index 160e35dea8053..be4aab5fc4fdc 100644 --- a/test/Serialization/generic_extension.swift +++ b/test/Serialization/generic_extension.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/generic_extension_1.swift -// RUN: %target-swift-frontend -emit-sil -I %t %s | FileCheck %s +// RUN: %target-swift-frontend -emit-sil -I %t %s | %FileCheck %s // We have to perform IRGen to actually check that the generic substitutions // are being used. diff --git a/test/Serialization/generic_witness.swift b/test/Serialization/generic_witness.swift index ea8f2dbdd6a63..b2e2b9d67b959 100644 --- a/test/Serialization/generic_witness.swift +++ b/test/Serialization/generic_witness.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/has_generic_witness.swift -// RUN: llvm-bcanalyzer %t/has_generic_witness.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %t/has_generic_witness.swiftmodule | %FileCheck %s // RUN: %target-swift-frontend -emit-ir -I %t %s -o /dev/null // We have to perform IRGen to actually check that the generic substitutions diff --git a/test/Serialization/global_init.swift b/test/Serialization/global_init.swift index 062e6eb5ee0dd..a059efb12c9e3 100644 --- a/test/Serialization/global_init.swift +++ b/test/Serialization/global_init.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -parse-as-library -sil-serialize-all -o %t %s -// RUN: llvm-bcanalyzer %t/global_init.swiftmodule | FileCheck %s -check-prefix=BCANALYZER -// RUN: %target-sil-opt -enable-sil-verify-all %t/global_init.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %t/global_init.swiftmodule | %FileCheck %s -check-prefix=BCANALYZER +// RUN: %target-sil-opt -enable-sil-verify-all %t/global_init.swiftmodule | %FileCheck %s // BCANALYZER-NOT: UnknownCode diff --git a/test/Serialization/import_source.swift b/test/Serialization/import_source.swift index af834aeccc405..7f506a16e6e36 100644 --- a/test/Serialization/import_source.swift +++ b/test/Serialization/import_source.swift @@ -1,6 +1,6 @@ // RUN: not %target-swift-frontend -parse -I %S/Inputs %s 2>%t.txt -// RUN: FileCheck %s < %t.txt -// RUN: FileCheck %s -check-prefix=NEGATIVE < %t.txt +// RUN: %FileCheck %s < %t.txt +// RUN: %FileCheck %s -check-prefix=NEGATIVE < %t.txt // FIXME: We need to type-check transparent functions if they are used. // XFAIL: * diff --git a/test/Serialization/load-wrong-name.swift b/test/Serialization/load-wrong-name.swift index 007a3f6f1e328..d587c65b7ac9c 100644 --- a/test/Serialization/load-wrong-name.swift +++ b/test/Serialization/load-wrong-name.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/def_func.swift -module-name new_module -// RUN: not %target-swift-frontend %s -parse -I %t -show-diagnostics-after-fatal 2>&1 | FileCheck %s +// RUN: not %target-swift-frontend %s -parse -I %t -show-diagnostics-after-fatal 2>&1 | %FileCheck %s import swift // CHECK: error: {{cannot load module 'Swift' as 'swift'|no such module 'swift'}} import NEW_MODULE // CHECK: error: {{cannot load module 'new_module' as 'NEW_MODULE'|no such module 'NEW_MODULE'}} diff --git a/test/Serialization/multi-file.swift b/test/Serialization/multi-file.swift index 8a60b8a2bccaf..460b4396f285e 100644 --- a/test/Serialization/multi-file.swift +++ b/test/Serialization/multi-file.swift @@ -3,14 +3,14 @@ // RUN: %target-swift-frontend -emit-module -module-name Multi -o %t/multi-file.swiftmodule -primary-file %s %S/Inputs/multi-file-2.swift // RUN: %target-swift-frontend -emit-module -module-name Multi -o %t/multi-file-2.swiftmodule %s -primary-file %S/Inputs/multi-file-2.swift -// RUN: llvm-bcanalyzer %t/multi-file.swiftmodule | FileCheck %s -check-prefix=THIS-FILE -// RUN: llvm-bcanalyzer %t/multi-file.swiftmodule | FileCheck %s -check-prefix=THIS-FILE-NEG -// RUN: llvm-bcanalyzer %t/multi-file-2.swiftmodule | FileCheck %s -check-prefix=OTHER-FILE -// RUN: llvm-bcanalyzer %t/multi-file-2.swiftmodule | FileCheck %s -check-prefix=OTHER-FILE-NEG +// RUN: llvm-bcanalyzer %t/multi-file.swiftmodule | %FileCheck %s -check-prefix=THIS-FILE +// RUN: llvm-bcanalyzer %t/multi-file.swiftmodule | %FileCheck %s -check-prefix=THIS-FILE-NEG +// RUN: llvm-bcanalyzer %t/multi-file-2.swiftmodule | %FileCheck %s -check-prefix=OTHER-FILE +// RUN: llvm-bcanalyzer %t/multi-file-2.swiftmodule | %FileCheck %s -check-prefix=OTHER-FILE-NEG // RUN: %target-swift-frontend -emit-module -module-name Multi %t/multi-file.swiftmodule %t/multi-file-2.swiftmodule -o %t -// RUN: llvm-bcanalyzer %t/Multi.swiftmodule | FileCheck %s -check-prefix=THIS-FILE -// RUN: llvm-bcanalyzer %t/Multi.swiftmodule | FileCheck %s -check-prefix=OTHER-FILE +// RUN: llvm-bcanalyzer %t/Multi.swiftmodule | %FileCheck %s -check-prefix=THIS-FILE +// RUN: llvm-bcanalyzer %t/Multi.swiftmodule | %FileCheck %s -check-prefix=OTHER-FILE // Do not put any enums in this file. It's part of the test that no enums // get serialized here. diff --git a/test/Serialization/noinline.swift b/test/Serialization/noinline.swift index 4b582b2833748..cc8ae969d6ffd 100644 --- a/test/Serialization/noinline.swift +++ b/test/Serialization/noinline.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -sil-serialize-all -o %t %S/Inputs/def_noinline.swift -// RUN: llvm-bcanalyzer %t/def_noinline.swiftmodule | FileCheck %s -// RUN: %target-swift-frontend -emit-silgen -sil-link-all -I %t %s | FileCheck %s -check-prefix=SIL +// RUN: llvm-bcanalyzer %t/def_noinline.swiftmodule | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -sil-link-all -I %t %s | %FileCheck %s -check-prefix=SIL // CHECK-NOT: UnknownCode diff --git a/test/Serialization/objc.swift b/test/Serialization/objc.swift index 5cc360a0c6708..1fe5cc593cc5a 100644 --- a/test/Serialization/objc.swift +++ b/test/Serialization/objc.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/def_objc.swift -disable-objc-attr-requires-foundation-module -// RUN: llvm-bcanalyzer %t/def_objc.swiftmodule | FileCheck %s -// RUN: %target-swift-frontend -emit-silgen -I %t %s -o - | FileCheck %s -check-prefix=SIL +// RUN: llvm-bcanalyzer %t/def_objc.swiftmodule | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -I %t %s -o - | %FileCheck %s -check-prefix=SIL // CHECK-NOT: UnknownCode diff --git a/test/Serialization/objc_method_table.swift b/test/Serialization/objc_method_table.swift index e38495e824173..6eec2eaa240d5 100644 --- a/test/Serialization/objc_method_table.swift +++ b/test/Serialization/objc_method_table.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -disable-objc-attr-requires-foundation-module -o %t %S/Inputs/objc_method_decls.swift -// RUN: llvm-bcanalyzer %t/objc_method_decls.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %t/objc_method_decls.swiftmodule | %FileCheck %s // RUN: %target-swift-frontend -parse -disable-objc-attr-requires-foundation-module -I %t %s -verify // REQUIRES: objc_interop diff --git a/test/Serialization/operator.swift b/test/Serialization/operator.swift index 1b284c54b84b6..17e882b0ae91d 100644 --- a/test/Serialization/operator.swift +++ b/test/Serialization/operator.swift @@ -1,9 +1,9 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/def_operator.swift -// RUN: llvm-bcanalyzer %t/def_operator.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %t/def_operator.swiftmodule | %FileCheck %s // RUN: %target-swift-frontend -parse -I%t %s -// RUN: %target-swift-frontend -interpret -I %t -DINTERP %s | FileCheck --check-prefix=OUTPUT %s +// RUN: %target-swift-frontend -interpret -I %t -DINTERP %s | %FileCheck --check-prefix=OUTPUT %s // REQUIRES: swift_interpreter diff --git a/test/Serialization/override.swift b/test/Serialization/override.swift index d9ad1a25136dc..320345bfdacf1 100644 --- a/test/Serialization/override.swift +++ b/test/Serialization/override.swift @@ -2,7 +2,7 @@ // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/def_class.swift -disable-objc-attr-requires-foundation-module // RUN: %target-swift-frontend -emit-module -o %t -I %t %S/Inputs/def_override.swift -// RUN: llvm-bcanalyzer %t/def_override.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %t/def_override.swiftmodule | %FileCheck %s // RUN: %target-swift-frontend -parse -I %t %s -verify // CHECK-NOT: UnknownCode diff --git a/test/Serialization/print.swift b/test/Serialization/print.swift index f329ff78ce49f..92f63dee158ad 100644 --- a/test/Serialization/print.swift +++ b/test/Serialization/print.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module -o %t %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-module -skip-deinit=false -module-to-print=print -I %t -source-filename=%s | FileCheck %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-module -skip-deinit=false -module-to-print=print -I %t -source-filename=%s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/Serialization/resilience.swift b/test/Serialization/resilience.swift index e690e4bd0a75c..d01e5f56bbf4b 100644 --- a/test/Serialization/resilience.swift +++ b/test/Serialization/resilience.swift @@ -5,17 +5,17 @@ // RUN: %target-swift-frontend -emit-module -o %t %s // RUN: llvm-bcanalyzer -dump %t/resilience.swiftmodule > %t/resilience.dump.txt -// RUN: FileCheck -check-prefix=CHECK -check-prefix=DEFAULT %s < %t/resilience.dump.txt +// RUN: %FileCheck -check-prefix=CHECK -check-prefix=DEFAULT %s < %t/resilience.dump.txt // RUN: %target-swift-frontend -emit-module -o %t -enable-resilience %s // RUN: llvm-bcanalyzer -dump %t/resilience.swiftmodule > %t/resilience2.dump.txt -// RUN: FileCheck -check-prefix=CHECK -check-prefix=RESILIENCE %s < %t/resilience2.dump.txt +// RUN: %FileCheck -check-prefix=CHECK -check-prefix=RESILIENCE %s < %t/resilience2.dump.txt // RUN: %target-swift-frontend -emit-module -o %t -sil-serialize-all %s // RUN: llvm-bcanalyzer -dump %t/resilience.swiftmodule > %t/resilience3.dump.txt -// RUN: FileCheck -check-prefix=CHECK -check-prefix=FRAGILE %s < %t/resilience3.dump.txt +// RUN: %FileCheck -check-prefix=CHECK -check-prefix=FRAGILE %s < %t/resilience3.dump.txt -// RUN: FileCheck -check-prefix=NEGATIVE %s < %t/resilience2.dump.txt +// RUN: %FileCheck -check-prefix=NEGATIVE %s < %t/resilience2.dump.txt // CHECK: // RESILIENCE: diff --git a/test/Serialization/search-paths-relative.swift b/test/Serialization/search-paths-relative.swift index b0b9421c594c9..fccf2bf7a4faa 100644 --- a/test/Serialization/search-paths-relative.swift +++ b/test/Serialization/search-paths-relative.swift @@ -8,8 +8,8 @@ // Check the actual serialized search paths. // RUN: llvm-bcanalyzer -dump %t/has_xref.swiftmodule > %t/has_xref.swiftmodule.txt -// RUN: FileCheck %s < %t/has_xref.swiftmodule.txt -// RUN: FileCheck -check-prefix=NEGATIVE %s < %t/has_xref.swiftmodule.txt +// RUN: %FileCheck %s < %t/has_xref.swiftmodule.txt +// RUN: %FileCheck -check-prefix=NEGATIVE %s < %t/has_xref.swiftmodule.txt // XFAIL: linux diff --git a/test/Serialization/search-paths.swift b/test/Serialization/search-paths.swift index cb102cf4a9949..7211c05b73898 100644 --- a/test/Serialization/search-paths.swift +++ b/test/Serialization/search-paths.swift @@ -19,10 +19,10 @@ // Make sure we don't end up with duplicate search paths. // RUN: %target-swiftc_driver -emit-module -o %t/has_xref.swiftmodule -I %t/secret -F %t/Frameworks -parse-as-library %S/Inputs/has_xref.swift %S/../Inputs/empty.swift -Xfrontend -serialize-debugging-options // RUN: %target-swift-frontend %s -parse -I %t -// RUN: llvm-bcanalyzer -dump %t/has_xref.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer -dump %t/has_xref.swiftmodule | %FileCheck %s // RUN: %target-swift-frontend %s -emit-module -o %t/main.swiftmodule -I %t -I %t/secret -F %t/Frameworks -// RUN: llvm-bcanalyzer -dump %t/main.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer -dump %t/main.swiftmodule | %FileCheck %s // XFAIL: linux diff --git a/test/Serialization/serialize_attr.swift b/test/Serialization/serialize_attr.swift index 5cb18cbc259ec..e7cba59f34042 100644 --- a/test/Serialization/serialize_attr.swift +++ b/test/Serialization/serialize_attr.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -parse-as-library -sil-serialize-all -o %t %s -// RUN: llvm-bcanalyzer %t/serialize_attr.swiftmodule | FileCheck %s -check-prefix=BCANALYZER -// RUN: %target-sil-opt -enable-sil-verify-all %t/serialize_attr.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %t/serialize_attr.swiftmodule | %FileCheck %s -check-prefix=BCANALYZER +// RUN: %target-sil-opt -enable-sil-verify-all %t/serialize_attr.swiftmodule | %FileCheck %s // BCANALYZER-NOT: UnknownCode diff --git a/test/Serialization/struct.swift b/test/Serialization/struct.swift index 73f34747d7c81..eb6c073ebd927 100644 --- a/test/Serialization/struct.swift +++ b/test/Serialization/struct.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/def_struct.swift -// RUN: llvm-bcanalyzer %t/def_struct.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %t/def_struct.swiftmodule | %FileCheck %s // RUN: %target-swift-frontend -emit-silgen -I %t %s -o /dev/null // CHECK-NOT: UnknownCode diff --git a/test/Serialization/target-incompatible.swift b/test/Serialization/target-incompatible.swift index faaeb4b614e8f..6f306c7778b02 100644 --- a/test/Serialization/target-incompatible.swift +++ b/test/Serialization/target-incompatible.swift @@ -2,11 +2,11 @@ // RUN: %swift -target x86_64-unknown-darwin14 -o %t/mips-template.swiftmodule -parse-stdlib -emit-module -module-name mips %S/../Inputs/empty.swift // RUN: %S/Inputs/binary_sub.py x86_64-unknown-darwin14 mips64-unknown-darwin14 < %t/mips-template.swiftmodule > %t/mips.swiftmodule -// RUN: not %target-swift-frontend -I %t -parse -parse-stdlib %s -DMIPS 2>&1 | FileCheck -check-prefix=CHECK-MIPS %s +// RUN: not %target-swift-frontend -I %t -parse -parse-stdlib %s -DMIPS 2>&1 | %FileCheck -check-prefix=CHECK-MIPS %s // RUN: %swift -target x86_64-unknown-darwin14 -o %t/solaris-template.swiftmodule -parse-stdlib -emit-module -module-name solaris %S/../Inputs/empty.swift // RUN: %S/Inputs/binary_sub.py x86_64-unknown-darwin14 x86_64-unknown-solaris8 < %t/solaris-template.swiftmodule > %t/solaris.swiftmodule -// RUN: not %target-swift-frontend -I %t -parse -parse-stdlib %s -DSOLARIS 2>&1 | FileCheck -check-prefix=CHECK-SOLARIS %s +// RUN: not %target-swift-frontend -I %t -parse -parse-stdlib %s -DSOLARIS 2>&1 | %FileCheck -check-prefix=CHECK-SOLARIS %s #if MIPS // CHECK-MIPS: :[[@LINE+1]]:8: error: module file was created for incompatible target mips64-unknown-darwin14: {{.*}}mips.swiftmodule{{$}} diff --git a/test/Serialization/target-too-new.swift b/test/Serialization/target-too-new.swift index afdae9542fb15..17e4d682706fe 100644 --- a/test/Serialization/target-too-new.swift +++ b/test/Serialization/target-too-new.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-swift-frontend -target x86_64-apple-macosx10.50 -emit-module -parse-stdlib %S/../Inputs/empty.swift -o %t -// RUN: not %target-swift-frontend -I %t -parse %s 2>&1 | FileCheck %s +// RUN: not %target-swift-frontend -I %t -parse %s 2>&1 | %FileCheck %s // RUN: %target-swift-frontend -I %t -parse %s -disable-target-os-checking // RUN: %target-swift-frontend -target x86_64-apple-macosx10.50 -I %t -parse %s // RUN: %target-swift-frontend -target x86_64-apple-macosx10.50.1 -I %t -parse %s diff --git a/test/Serialization/testability.swift b/test/Serialization/testability.swift index f57b82db8837b..e39e51a0608ee 100644 --- a/test/Serialization/testability.swift +++ b/test/Serialization/testability.swift @@ -5,12 +5,12 @@ // RUN: %target-swift-frontend -emit-module -DBASE -o %t %s // RUN: llvm-bcanalyzer -dump %t/testability.swiftmodule > %t/testability.dump.txt -// RUN: FileCheck -check-prefix=CHECK -check-prefix=NO-TESTING %s < %t/testability.dump.txt +// RUN: %FileCheck -check-prefix=CHECK -check-prefix=NO-TESTING %s < %t/testability.dump.txt // RUN: %target-swift-frontend -emit-module -DBASE -o %t -enable-testing %s // RUN: llvm-bcanalyzer -dump %t/testability.swiftmodule > %t/testability2.dump.txt -// RUN: FileCheck -check-prefix=CHECK -check-prefix=TESTING %s < %t/testability2.dump.txt -// RUN: FileCheck -check-prefix=NEGATIVE %s < %t/testability2.dump.txt +// RUN: %FileCheck -check-prefix=CHECK -check-prefix=TESTING %s < %t/testability2.dump.txt +// RUN: %FileCheck -check-prefix=NEGATIVE %s < %t/testability2.dump.txt // ...but the second block checks that a module that /depends/ on a testable // module can still be loaded. This is what happens when debugging a unit test. diff --git a/test/Serialization/top-level-code.swift b/test/Serialization/top-level-code.swift index 443e28db8b7bd..d15fd83d4a357 100644 --- a/test/Serialization/top-level-code.swift +++ b/test/Serialization/top-level-code.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend -emit-module -o %t %s -module-name Test -// RUN: llvm-bcanalyzer %t/Test.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %t/Test.swiftmodule | %FileCheck %s // RUN: cp %s %t/main.swift // RUN: %target-swift-frontend -parse -verify %t/main.swift -primary-file %S/Inputs/top-level-code-other.swift diff --git a/test/Serialization/transparent-std.swift b/test/Serialization/transparent-std.swift index 09f755e6df59a..1cea520da420a 100644 --- a/test/Serialization/transparent-std.swift +++ b/test/Serialization/transparent-std.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -parse-stdlib -o %t %S/Inputs/def_transparent_std.swift -// RUN: llvm-bcanalyzer %t/def_transparent_std.swiftmodule | FileCheck %s -// RUN: %target-swift-frontend -emit-sil -Xllvm -sil-disable-pass="External Defs To Decls" -sil-debug-serialization -parse-stdlib -I %t %s | FileCheck %s -check-prefix=SIL +// RUN: llvm-bcanalyzer %t/def_transparent_std.swiftmodule | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -Xllvm -sil-disable-pass="External Defs To Decls" -sil-debug-serialization -parse-stdlib -I %t %s | %FileCheck %s -check-prefix=SIL // CHECK-NOT: UnknownCode diff --git a/test/Serialization/transparent.swift b/test/Serialization/transparent.swift index e3f0dd30cd0db..6b16c417567be 100644 --- a/test/Serialization/transparent.swift +++ b/test/Serialization/transparent.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-swift-frontend -emit-module -sil-serialize-all -o %t %S/Inputs/def_transparent.swift -// RUN: llvm-bcanalyzer %t/def_transparent.swiftmodule | FileCheck %s -// RUN: %target-swift-frontend -emit-silgen -sil-link-all -I %t %s | FileCheck %s -check-prefix=SIL +// RUN: llvm-bcanalyzer %t/def_transparent.swiftmodule | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -sil-link-all -I %t %s | %FileCheck %s -check-prefix=SIL // CHECK-NOT: UnknownCode diff --git a/test/Serialization/typealias.swift b/test/Serialization/typealias.swift index 5337f7e5715d7..f4218ff53068a 100644 --- a/test/Serialization/typealias.swift +++ b/test/Serialization/typealias.swift @@ -1,9 +1,9 @@ // RUN: rm -rf %t // RUN: mkdir %t // RUN: %target-build-swift -module-name alias -emit-module -o %t %S/Inputs/alias.swift -// RUN: llvm-bcanalyzer %t/alias.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %t/alias.swiftmodule | %FileCheck %s // RUN: %target-build-swift -I %t %s -o %t/a.out -// RUN: %target-run %t/a.out | FileCheck -check-prefix=OUTPUT %s +// RUN: %target-run %t/a.out | %FileCheck -check-prefix=OUTPUT %s // REQUIRES: executable_test // CHECK-NOT: UnknownCode diff --git a/test/Serialization/version-mismatches.swift b/test/Serialization/version-mismatches.swift index 933a80e7e5269..49ada5681b4f5 100644 --- a/test/Serialization/version-mismatches.swift +++ b/test/Serialization/version-mismatches.swift @@ -1,7 +1,7 @@ -// RUN: not %target-swift-frontend %s -parse -I %S/Inputs/too-old/ -show-diagnostics-after-fatal 2>&1 | FileCheck -check-prefix CHECK -check-prefix TOO-OLD %s -// RUN: not %target-swift-frontend %s -parse -I %S/Inputs/too-new/ -show-diagnostics-after-fatal 2>&1 | FileCheck -check-prefix CHECK -check-prefix TOO-NEW %s -// RUN: not %target-swift-frontend %s -parse -I %S/Inputs/too-old-language/ -show-diagnostics-after-fatal 2>&1 | FileCheck -check-prefix CHECK -check-prefix LANGUAGE %s -// RUN: not %target-swift-frontend %s -parse -I %S/Inputs/too-new-language/ -show-diagnostics-after-fatal 2>&1 | FileCheck -check-prefix CHECK -check-prefix LANGUAGE %s +// RUN: not %target-swift-frontend %s -parse -I %S/Inputs/too-old/ -show-diagnostics-after-fatal 2>&1 | %FileCheck -check-prefix CHECK -check-prefix TOO-OLD %s +// RUN: not %target-swift-frontend %s -parse -I %S/Inputs/too-new/ -show-diagnostics-after-fatal 2>&1 | %FileCheck -check-prefix CHECK -check-prefix TOO-NEW %s +// RUN: not %target-swift-frontend %s -parse -I %S/Inputs/too-old-language/ -show-diagnostics-after-fatal 2>&1 | %FileCheck -check-prefix CHECK -check-prefix LANGUAGE %s +// RUN: not %target-swift-frontend %s -parse -I %S/Inputs/too-new-language/ -show-diagnostics-after-fatal 2>&1 | %FileCheck -check-prefix CHECK -check-prefix LANGUAGE %s import Library // TOO-OLD: :[[@LINE-1]]:8: error: module file was created by an older version of the compiler; rebuild 'Library' and try again: {{.*}}too-old/Library.swiftmodule{{$}} diff --git a/test/Serialization/xref-multi-file.swift b/test/Serialization/xref-multi-file.swift index 16b79e9da9773..e6df4b31492db 100644 --- a/test/Serialization/xref-multi-file.swift +++ b/test/Serialization/xref-multi-file.swift @@ -2,7 +2,7 @@ // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/struct_with_operators.swift // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/alias.swift -module-name has_alias // RUN: %target-swift-frontend -emit-module -o %t -I %t %S/Inputs/has_xref.swift -// RUN: llvm-bcanalyzer %t/has_xref.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %t/has_xref.swiftmodule | %FileCheck %s // RUN: %target-swift-frontend -emit-silgen -I %t -primary-file %s %S/Inputs/xref-multi-file-other.swift -module-name main > /dev/null // CHECK-NOT: UnknownCode diff --git a/test/Serialization/xref.swift b/test/Serialization/xref.swift index a313331eccbea..bd9f89312ea8d 100644 --- a/test/Serialization/xref.swift +++ b/test/Serialization/xref.swift @@ -4,7 +4,7 @@ // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/alias.swift -module-name has_alias // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/xref_distraction.swift // RUN: %target-swift-frontend -emit-module -o %t -I %t %S/Inputs/has_xref.swift -// RUN: llvm-bcanalyzer %t/has_xref.swiftmodule | FileCheck %s +// RUN: llvm-bcanalyzer %t/has_xref.swiftmodule | %FileCheck %s // RUN: %target-swift-frontend -emit-silgen -I %t %s > /dev/null // CHECK-NOT: UnknownCode diff --git a/test/SourceKit/CodeComplete/complete_big_array.swift b/test/SourceKit/CodeComplete/complete_big_array.swift index 65af851ca5857..a28b3080f74ca 100644 --- a/test/SourceKit/CodeComplete/complete_big_array.swift +++ b/test/SourceKit/CodeComplete/complete_big_array.swift @@ -1,4 +1,4 @@ -// RUN: %sourcekitd-test -req=complete -pos=45:1 %S/../Inputs/big_array.swift -- %S/../Inputs/big_array.swift | FileCheck %s +// RUN: %sourcekitd-test -req=complete -pos=45:1 %S/../Inputs/big_array.swift -- %S/../Inputs/big_array.swift | %FileCheck %s // CHECK: key.kind: source.lang.swift.decl.var.global // CHECK: key.name: "gCubeVertexData" // CHECK: key.sourcetext: "gCubeVertexData" diff --git a/test/SourceKit/CodeComplete/complete_cache.swift b/test/SourceKit/CodeComplete/complete_cache.swift index 97ade8e085e12..8601fbb90ac79 100644 --- a/test/SourceKit/CodeComplete/complete_cache.swift +++ b/test/SourceKit/CodeComplete/complete_cache.swift @@ -12,13 +12,13 @@ import Foo // RUN: -req=complete -pos=2:1 %s -- %s -F %S/../Inputs/libIDE-mock-sdk > %t.completions2 // Sanity check the results -// RUN: FileCheck %s < %t.completions1 -// RUN: FileCheck %s < %t.completions2 +// RUN: %FileCheck %s < %t.completions1 +// RUN: %FileCheck %s < %t.completions2 // CHECK: key.name: "FooStruct -// RUN: %complete-test -raw -tok=VOID_1 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=VOID_1 -// RUN: %complete-test -raw -tok=VOID_2 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=VOID_1 -// RUN: %complete-test -raw -tok=VOID_3 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=VOID_3 +// RUN: %complete-test -raw -tok=VOID_1 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=VOID_1 +// RUN: %complete-test -raw -tok=VOID_2 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=VOID_1 +// RUN: %complete-test -raw -tok=VOID_3 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=VOID_3 func test1() { _ = #^VOID_1,fooFunc^# } diff --git a/test/SourceKit/CodeComplete/complete_custom.swift b/test/SourceKit/CodeComplete/complete_custom.swift index e3cbb9a53d7f7..f35892594a46b 100644 --- a/test/SourceKit/CodeComplete/complete_custom.swift +++ b/test/SourceKit/CodeComplete/complete_custom.swift @@ -6,31 +6,31 @@ func test() { // ===--- Errors -// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error1.json | FileCheck %s -check-prefix=ERROR-MISSING-RESULTS -// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error2.json | FileCheck %s -check-prefix=ERROR-MISSING-RESULTS +// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error1.json | %FileCheck %s -check-prefix=ERROR-MISSING-RESULTS +// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error2.json | %FileCheck %s -check-prefix=ERROR-MISSING-RESULTS // ERROR-MISSING-RESULTS: missing 'key.results' -// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error3.json | FileCheck %s -check-prefix=ERROR-MISSING-NAME -// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error4.json | FileCheck %s -check-prefix=ERROR-MISSING-NAME +// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error3.json | %FileCheck %s -check-prefix=ERROR-MISSING-NAME +// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error4.json | %FileCheck %s -check-prefix=ERROR-MISSING-NAME // ERROR-MISSING-NAME: missing 'key.name' -// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error5.json | FileCheck %s -check-prefix=ERROR-MISSING-KIND -// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error6.json | FileCheck %s -check-prefix=ERROR-MISSING-KIND +// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error5.json | %FileCheck %s -check-prefix=ERROR-MISSING-KIND +// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error6.json | %FileCheck %s -check-prefix=ERROR-MISSING-KIND // ERROR-MISSING-KIND: missing 'key.kind' -// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error7.json | FileCheck %s -check-prefix=ERROR-MISSING-CONTEXT -// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error8.json | FileCheck %s -check-prefix=ERROR-MISSING-CONTEXT -// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error9.json | FileCheck %s -check-prefix=ERROR-MISSING-CONTEXT +// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error7.json | %FileCheck %s -check-prefix=ERROR-MISSING-CONTEXT +// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error8.json | %FileCheck %s -check-prefix=ERROR-MISSING-CONTEXT +// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error9.json | %FileCheck %s -check-prefix=ERROR-MISSING-CONTEXT // ERROR-MISSING-CONTEXT: missing 'key.context' -// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error10.json | FileCheck %s -check-prefix=ERROR-INVALID-CONTEXT +// RUN: not %sourcekitd-test -json-request-path %S/Inputs/custom-completion/error10.json | %FileCheck %s -check-prefix=ERROR-INVALID-CONTEXT // ERROR-INVALID-CONTEXT: invalid value for 'key.context' // ===--- Custom completions // RUN: %sourcekitd-test -json-request-path %S/Inputs/custom-completion/custom.json == \ -// RUN: -req=complete.open -pos=2:1 %s -- %s | FileCheck %s -check-prefix=STMT +// RUN: -req=complete.open -pos=2:1 %s -- %s | %FileCheck %s -check-prefix=STMT // STMT-NOT: myuid // STMT: key.kind: myuid.customExprOrStmtOrType @@ -41,7 +41,7 @@ func test() { // STMT-NOT: myuid // RUN: %sourcekitd-test -json-request-path %S/Inputs/custom-completion/custom.json == \ -// RUN: -req=complete.open -pos=3:4 %s -- %s | FileCheck %s -check-prefix=EXPR +// RUN: -req=complete.open -pos=3:4 %s -- %s | %FileCheck %s -check-prefix=EXPR // EXPR-NOT: myuid // EXPR: key.kind: myuid.customExpr @@ -52,7 +52,7 @@ func test() { // EXPR-NOT: myuid // RUN: %sourcekitd-test -json-request-path %S/Inputs/custom-completion/custom.json == \ -// RUN: -req=complete.open -pos=4:12 %s -- %s | FileCheck %s -check-prefix=TYPE +// RUN: -req=complete.open -pos=4:12 %s -- %s | %FileCheck %s -check-prefix=TYPE // TYPE-NOT: myuid // TYPE: key.kind: myuid.customExprOrStmtOrType @@ -65,8 +65,8 @@ func test() { // ===--- Filtering. // RUN: %sourcekitd-test -json-request-path %S/Inputs/custom-completion/custom.json == \ -// RUN: -req=complete.open -pos=3:4 %s -req-opts=filtertext=custExp -- %s | FileCheck %s -check-prefix=EXPR +// RUN: -req=complete.open -pos=3:4 %s -req-opts=filtertext=custExp -- %s | %FileCheck %s -check-prefix=EXPR // RUN: %sourcekitd-test -json-request-path %S/Inputs/custom-completion/custom.json == \ -// RUN: -req=complete.open -pos=3:4 %s -req-opts=filtertext=asdffdsa -- %s | FileCheck %s -check-prefix=NOCUSTOM +// RUN: -req=complete.open -pos=3:4 %s -req-opts=filtertext=asdffdsa -- %s | %FileCheck %s -check-prefix=NOCUSTOM // NOCUSTOM-NOT: myuid diff --git a/test/SourceKit/CodeComplete/complete_filter.swift b/test/SourceKit/CodeComplete/complete_filter.swift index e61b7faa54860..3836c23d3c113 100644 --- a/test/SourceKit/CodeComplete/complete_filter.swift +++ b/test/SourceKit/CodeComplete/complete_filter.swift @@ -13,7 +13,7 @@ func foo() { // XFAIL: broken_std_regex // RUN: %sourcekitd-test -req=complete.open -pos=11:5 %s -- %s > %t.all -// FileCheck -check-prefix=CHECK-ALL %s < %t.all +// RUN: %FileCheck -check-prefix=CHECK-ALL %s < %t.all // CHECK-ALL: key.name: "aaa // CHECK-ALL: key.name: "aab // CHECK-ALL: key.name: "abc @@ -22,7 +22,7 @@ func foo() { // RUN: %sourcekitd-test -req=complete.open -pos=11:5 \ // RUN: -req-opts=filtertext=a %s -- %s > %t.a -// RUN: FileCheck -check-prefix=CHECKA %s < %t.a +// RUN: %FileCheck -check-prefix=CHECKA %s < %t.a // CHECKA-NOT: key.name // CHECKA: key.name: "aaa @@ -38,7 +38,7 @@ func foo() { // RUN: %sourcekitd-test -req=complete.open -pos=11:5 \ // RUN: -req-opts=filtertext=b %s -- %s > %t.b -// RUN: FileCheck -check-prefix=CHECKB %s < %t.b +// RUN: %FileCheck -check-prefix=CHECKB %s < %t.b // CHECKB-NOT: key.name // CHECKB: key.name: "b @@ -46,14 +46,14 @@ func foo() { // RUN: %sourcekitd-test -req=complete.open -pos=11:5 \ // RUN: -req-opts=filtertext=c %s -- %s > %t.c -// RUN: FileCheck -check-prefix=CHECKC %s < %t.c +// RUN: %FileCheck -check-prefix=CHECKC %s < %t.c // CHECKC-NOT: key.name // CHECKC: key.name: "c // RUN: %sourcekitd-test -req=complete.open -pos=11:5 \ // RUN: -req-opts=filtertext=d %s -- %s > %t.d -// RUN: FileCheck -check-prefix=CHECKD %s < %t.d +// RUN: %FileCheck -check-prefix=CHECKD %s < %t.d // CHECKD-NOT: key.name // CHECKD: ], @@ -63,7 +63,7 @@ func foo() { // CHECKD-NEXT: } -// RUN: %complete-test -tok=FOO %s | FileCheck %s +// RUN: %complete-test -tok=FOO %s | %FileCheck %s // CHECK-LABEL: Results for filterText: [ // CHECK-NEXT: aaa() // CHECK-NEXT: aab() @@ -95,7 +95,7 @@ func test() { #^OVER,over,overload,overloadp^# } // Don't create empty groups, or groups with one element -// RUN: %complete-test -group=overloads -tok=OVER %s | FileCheck -check-prefix=GROUP %s +// RUN: %complete-test -group=overloads -tok=OVER %s | %FileCheck -check-prefix=GROUP %s // GROUP-LABEL: Results for filterText: over [ // GROUP: overload: // GROUP-NEXT: overload() @@ -115,7 +115,7 @@ struct UnnamedArgs { } } -// RUN: %complete-test -tok=UNNAMED_ARGS_0 %s | FileCheck %s -check-prefix=UNNAMED_ARGS_0 +// RUN: %complete-test -tok=UNNAMED_ARGS_0 %s | %FileCheck %s -check-prefix=UNNAMED_ARGS_0 // UNNAMED_ARGS_0: Results for filterText: dont [ // UNNAMED_ARGS_0-NEXT: dontMatchAgainst(unnamed: Int, arguments: Int, unnamed2: Int) // UNNAMED_ARGS_0-NEXT: ] diff --git a/test/SourceKit/CodeComplete/complete_filter_rules.swift b/test/SourceKit/CodeComplete/complete_filter_rules.swift index 645a14dc64992..9e65fdb7c7cf4 100644 --- a/test/SourceKit/CodeComplete/complete_filter_rules.swift +++ b/test/SourceKit/CodeComplete/complete_filter_rules.swift @@ -12,12 +12,12 @@ struct TestHideName { // REQUIRES: objc_interop -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideNames.json -tok=HIDE_NAMES_1 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=HIDE_NAMES +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideNames.json -tok=HIDE_NAMES_1 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=HIDE_NAMES func testHideName01() { #^HIDE_NAMES_1,hidethis^# } -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideNames.json -tok=HIDE_NAMES_2 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=HIDE_NAMES +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideNames.json -tok=HIDE_NAMES_2 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=HIDE_NAMES func testHideName02() { self.#^HIDE_NAMES_2,hidethis^# } @@ -26,7 +26,7 @@ struct TestHideName { // HIDE_NAMES-NEXT: ] } -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideKeywords.json -tok=HIDE_KEYWORDS_1 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=HIDE_LET +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideKeywords.json -tok=HIDE_KEYWORDS_1 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=HIDE_LET func testHideKeyword01() { #^HIDE_KEYWORDS_1^# // HIDE_LET-NOT: let @@ -34,7 +34,7 @@ func testHideKeyword01() { // HIDE_LET-NOT: let } -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showKeywords.json -tok=HIDE_KEYWORDS_2 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=SHOW_FUNC +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showKeywords.json -tok=HIDE_KEYWORDS_2 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=SHOW_FUNC func testHideKeyword02() { #^HIDE_KEYWORDS_2^# // SHOW_FUNC-NOT: let @@ -44,7 +44,7 @@ func testHideKeyword02() { // SHOW_FUNC-NOT: let } -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideLiterals.json -tok=HIDE_LITERALS_1 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=HIDE_NIL +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideLiterals.json -tok=HIDE_LITERALS_1 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=HIDE_NIL func testHideLiteral01() { let x = #^HIDE_LITERALS_1^# // HIDE_NIL-NOT: nil @@ -52,7 +52,7 @@ func testHideLiteral01() { // HIDE_NIL-NOT: nil } -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showLiterals.json -tok=HIDE_LITERALS_2 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=SHOW_STRING +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showLiterals.json -tok=HIDE_LITERALS_2 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=SHOW_STRING func testHideLiteral02() { let x = #^HIDE_LITERALS_2^# // SHOW_STRING-NOT: [ @@ -64,7 +64,7 @@ func testHideLiteral02() { // FIXME: custom completions -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideModules.json -tok=HIDE_MODULES_1 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=HIDE_FOO +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideModules.json -tok=HIDE_MODULES_1 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=HIDE_FOO func testHideModule01() { let x: #^HIDE_MODULES_1^# // FIXME: submodules @@ -79,7 +79,7 @@ func testHideModule01() { func myFunFunction1() {} func myFunFunction2() {} -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showSpecific.json -tok=SHOW_SPECIFIC_1 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=SHOW_SPECIFIC_1 +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showSpecific.json -tok=SHOW_SPECIFIC_1 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=SHOW_SPECIFIC_1 func testShowSpecific01() { #^SHOW_SPECIFIC_1,fun^# // SHOW_SPECIFIC_1-LABEL: Results for filterText: fun [ @@ -88,7 +88,7 @@ func testShowSpecific01() { // SHOW_SPECIFIC_1-NEXT: ] } -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showSpecific.json -tok=HIDE_OP_1 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=HIDE_OP +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showSpecific.json -tok=HIDE_OP_1 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=HIDE_OP func testHideOp1() { var local = 1 #^HIDE_OP_1,local^# @@ -96,13 +96,13 @@ func testHideOp1() { // HIDE_OP-NOT: . // HIDE_OP-NOT: = -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showSpecific.json -tok=HIDE_OP_2 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=HIDE_OP -allow-empty +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showSpecific.json -tok=HIDE_OP_2 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=HIDE_OP -allow-empty func testHideOp2() { var local = 1 local#^HIDE_OP_2^# } -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showOp.json -tok=SHOW_OP_1 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=SHOW_OP_1 +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showOp.json -tok=SHOW_OP_1 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=SHOW_OP_1 func testShowOp1() { var local = 1 #^SHOW_OP_1,local^# @@ -110,7 +110,7 @@ func testShowOp1() { // SHOW_OP_1: local.{{$}} // SHOW_OP_1: local={{$}} -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showOp.json -tok=SHOW_OP_2 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=SHOW_OP_2 +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showOp.json -tok=SHOW_OP_2 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=SHOW_OP_2 func testShowOp2() { var local = 1 local#^SHOW_OP_2^# @@ -118,31 +118,31 @@ func testShowOp2() { // SHOW_OP_2: {{^}}.{{$}} // SHOW_OP_2: {{^}}={{$}} -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showOp.json -tok=HIDE_OP_3 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=HIDE_OP +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showOp.json -tok=HIDE_OP_3 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=HIDE_OP func testHideOp3() { let local = TestHideName() // Implicitly hidden because we hide all the members. #^HIDE_OP_3,local^# } -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showOp.json -tok=HIDE_OP_4 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=HIDE_OP -allow-empty +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showOp.json -tok=HIDE_OP_4 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=HIDE_OP -allow-empty func testHideOp4() { let local = TestHideName() // Implicitly hidden because we hide all the members. local#^HIDE_OP_4^# } -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showOp.json -tok=SHOW_OP_3 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=SHOW_OP_1 +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showOp.json -tok=SHOW_OP_3 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=SHOW_OP_1 func testShowOp3() { var local = 1 #^SHOW_OP_3,local^# } -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showOp.json -tok=SHOW_OP_4 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=SHOW_OP_2 +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/showOp.json -tok=SHOW_OP_4 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=SHOW_OP_2 func testShowOp4() { var local = 1 local#^SHOW_OP_4^# } -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideInnerOp.json -tok=HIDE_OP_5 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=HIDE_OP_5 -allow-empty +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideInnerOp.json -tok=HIDE_OP_5 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=HIDE_OP_5 -allow-empty func testHideOp5() { var local = 1 #^HIDE_OP_5,local^# @@ -151,19 +151,19 @@ func testHideOp5() { // HIDE_OP_5-NOT: local?. // HIDE_OP_5-NOT: local( -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideInnerOp.json -tok=HIDE_OP_6 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=HIDE_OP_5 -allow-empty +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideInnerOp.json -tok=HIDE_OP_6 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=HIDE_OP_5 -allow-empty func testHideOp6() { var local: Int? = 1 #^HIDE_OP_6,local^# } -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideInnerOp.json -tok=HIDE_OP_7 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=HIDE_OP_5 -allow-empty +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideInnerOp.json -tok=HIDE_OP_7 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=HIDE_OP_5 -allow-empty func testHideOp7() { struct local {} #^HIDE_OP_7,local^# } -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideInnerOp.json -tok=HIDE_OP_8 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=HIDE_OP_8 -allow-empty +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideInnerOp.json -tok=HIDE_OP_8 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=HIDE_OP_8 -allow-empty func testHideOp8() { var local = 1 local#^HIDE_OP_8^# @@ -172,13 +172,13 @@ func testHideOp8() { // HIDE_OP_8-NOT: {{^}}?. // HIDE_OP_8-NOT: {{^}}( -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideInnerOp.json -tok=HIDE_OP_9 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=HIDE_OP_8 -allow-empty +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideInnerOp.json -tok=HIDE_OP_9 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=HIDE_OP_8 -allow-empty func testHideOp9() { var local: Int? = 1 local#^HIDE_OP_9^# } -// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideInnerOp.json -tok=HIDE_OP_10 %s -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=HIDE_OP_8 -allow-empty +// RUN: %complete-test -filter-rules=%S/Inputs/filter-rules/hideInnerOp.json -tok=HIDE_OP_10 %s -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=HIDE_OP_8 -allow-empty func testHideOp10() { struct local {} local#^HIDE_OP_10^# diff --git a/test/SourceKit/CodeComplete/complete_forbid_typecheck.swift b/test/SourceKit/CodeComplete/complete_forbid_typecheck.swift index d9692dece3db4..d3db8f7bef6c6 100644 --- a/test/SourceKit/CodeComplete/complete_forbid_typecheck.swift +++ b/test/SourceKit/CodeComplete/complete_forbid_typecheck.swift @@ -1,4 +1,4 @@ -// RUN: %sourcekitd-test -req=complete -pos=4:1 %S/Inputs/forbid_typecheck_primary.swift -- -Xfrontend -debug-forbid-typecheck-prefix -Xfrontend NOTYPECHECK %S/Inputs/forbid_typecheck_2.swift %S/Inputs/forbid_typecheck_primary.swift | FileCheck %s +// RUN: %sourcekitd-test -req=complete -pos=4:1 %S/Inputs/forbid_typecheck_primary.swift -- -Xfrontend -debug-forbid-typecheck-prefix -Xfrontend NOTYPECHECK %S/Inputs/forbid_typecheck_2.swift %S/Inputs/forbid_typecheck_primary.swift | %FileCheck %s // CHECK-DAG: key.name: "globalPrim" // CHECK-DAG: key.name: "globalSec" @@ -6,6 +6,6 @@ // CHECK-DAG: key.name: "SSec" // CHECK-DAG: key.name: "primFn()" -// RUN: %sourcekitd-test -req=complete -pos=5:20 %S/Inputs/forbid_typecheck_primary.swift -- -Xfrontend -debug-forbid-typecheck-prefix -Xfrontend NOTYPECHECK %S/Inputs/forbid_typecheck_2.swift %S/Inputs/forbid_typecheck_primary.swift | FileCheck %s -check-prefix=MEMBER +// RUN: %sourcekitd-test -req=complete -pos=5:20 %S/Inputs/forbid_typecheck_primary.swift -- -Xfrontend -debug-forbid-typecheck-prefix -Xfrontend NOTYPECHECK %S/Inputs/forbid_typecheck_2.swift %S/Inputs/forbid_typecheck_primary.swift | %FileCheck %s -check-prefix=MEMBER // MEMBER: key.name: "member" diff --git a/test/SourceKit/CodeComplete/complete_from_clang_module.swift b/test/SourceKit/CodeComplete/complete_from_clang_module.swift index 12db29060c35c..f366089c1c583 100644 --- a/test/SourceKit/CodeComplete/complete_from_clang_module.swift +++ b/test/SourceKit/CodeComplete/complete_from_clang_module.swift @@ -1,7 +1,7 @@ import Foo // REQUIRES: objc_interop -// RUN: %sourcekitd-test -req=complete -pos=2:1 %s -- %mcp_opt -F %S/../Inputs/libIDE-mock-sdk %s | FileCheck %s +// RUN: %sourcekitd-test -req=complete -pos=2:1 %s -- %mcp_opt -F %S/../Inputs/libIDE-mock-sdk %s | %FileCheck %s // CHECK-LABEL: key.name: "fooIntVar", // CHECK-NEXT: key.sourcetext: "fooIntVar", diff --git a/test/SourceKit/CodeComplete/complete_fuzzy.swift b/test/SourceKit/CodeComplete/complete_fuzzy.swift index 013c113c7feec..5b93ae884154c 100644 --- a/test/SourceKit/CodeComplete/complete_fuzzy.swift +++ b/test/SourceKit/CodeComplete/complete_fuzzy.swift @@ -11,8 +11,8 @@ func footastic() {} // XFAIL: broken_std_regex -// RUN: %complete-test %s -group=stems -tok=TOP_LEVEL_NO_FILTER | FileCheck %s -check-prefix=TOP_LEVEL_NO_FILTER -// RUN: %complete-test %s -group=stems -fuzz -tok=TOP_LEVEL_NO_FILTER | FileCheck %s -check-prefix=TOP_LEVEL_NO_FILTER +// RUN: %complete-test %s -group=stems -tok=TOP_LEVEL_NO_FILTER | %FileCheck %s -check-prefix=TOP_LEVEL_NO_FILTER +// RUN: %complete-test %s -group=stems -fuzz -tok=TOP_LEVEL_NO_FILTER | %FileCheck %s -check-prefix=TOP_LEVEL_NO_FILTER func test1() { #^TOP_LEVEL_NO_FILTER^# // TOP_LEVEL_NO_FILTER: fooBar: @@ -20,8 +20,8 @@ func test1() { // TOP_LEVEL_NO_FILTER: fooBarTastic() // TOP_LEVEL_NO_FILTER: footastic() } -// RUN: %complete-test %s -group=stems -tok=S1_QUAL_NO_FILTER | FileCheck %s -check-prefix=S1_QUAL_NO_FILTER -// RUN: %complete-test %s -group=stems -fuzz -tok=S1_QUAL_NO_FILTER | FileCheck %s -check-prefix=S1_QUAL_NO_FILTER +// RUN: %complete-test %s -group=stems -tok=S1_QUAL_NO_FILTER | %FileCheck %s -check-prefix=S1_QUAL_NO_FILTER +// RUN: %complete-test %s -group=stems -fuzz -tok=S1_QUAL_NO_FILTER | %FileCheck %s -check-prefix=S1_QUAL_NO_FILTER func test2(x: S1) { x.#^S1_QUAL_NO_FILTER^# // Without a filter, we group. @@ -32,9 +32,9 @@ func test2(x: S1) { } // ===- Basic filter checks. -// RUN: %complete-test %s -no-fuzz -group=stems -tok=TOP_LEVEL_1 | FileCheck %s -check-prefix=TOP_LEVEL_1_PREFIX -// RUN: %complete-test %s -fuzz -group=stems -tok=TOP_LEVEL_1 | FileCheck %s -check-prefix=TOP_LEVEL_1_FUZZ -// RUN: %complete-test %s -fuzz -group=none -tok=TOP_LEVEL_1 | FileCheck %s -check-prefix=TOP_LEVEL_1_FUZZ_NO_GROUP +// RUN: %complete-test %s -no-fuzz -group=stems -tok=TOP_LEVEL_1 | %FileCheck %s -check-prefix=TOP_LEVEL_1_PREFIX +// RUN: %complete-test %s -fuzz -group=stems -tok=TOP_LEVEL_1 | %FileCheck %s -check-prefix=TOP_LEVEL_1_FUZZ +// RUN: %complete-test %s -fuzz -group=none -tok=TOP_LEVEL_1 | %FileCheck %s -check-prefix=TOP_LEVEL_1_FUZZ_NO_GROUP func test3() { #^TOP_LEVEL_1,bar^# // TOP_LEVEL_1_PREFIX-NOT: foo @@ -48,8 +48,8 @@ func test3() { // TOP_LEVEL_1_FUZZ_NO_GROUP-NOT: footastic } -// RUN: %complete-test %s -group=stems -no-fuzz -tok=S1_QUAL_1 | FileCheck %s -check-prefix=S1_QUAL_1_PREFIX -// RUN: %complete-test %s -group=stems -fuzz -tok=S1_QUAL_1 | FileCheck %s -check-prefix=S1_QUAL_1_FUZZ +// RUN: %complete-test %s -group=stems -no-fuzz -tok=S1_QUAL_1 | %FileCheck %s -check-prefix=S1_QUAL_1_PREFIX +// RUN: %complete-test %s -group=stems -fuzz -tok=S1_QUAL_1 | %FileCheck %s -check-prefix=S1_QUAL_1_FUZZ func test3() { #^S1_QUAL_1,foo,bar,tast,footast^# // S1_QUAL_1_PREFIX-LABEL: Results for filterText: foo [ @@ -89,10 +89,10 @@ func test3() { // S1_QUAL_1_FUZZ: ] } -// RUN: %complete-test %s -fuzz -tok=CONTEXT_SORT_1 | FileCheck %s -check-prefix=CONTEXT_SORT_1 -// RUN: %complete-test %s -fuzz -fuzzy-weight=1 -tok=CONTEXT_SORT_1 | FileCheck %s -check-prefix=CONTEXT_SORT_4 -// RUN: %complete-test %s -fuzz -fuzzy-weight=100 -tok=CONTEXT_SORT_1 | FileCheck %s -check-prefix=CONTEXT_SORT_2 -// RUN: %complete-test %s -fuzz -fuzzy-weight=10000 -no-inner-results -tok=CONTEXT_SORT_1 | FileCheck %s -check-prefix=CONTEXT_SORT_3 +// RUN: %complete-test %s -fuzz -tok=CONTEXT_SORT_1 | %FileCheck %s -check-prefix=CONTEXT_SORT_1 +// RUN: %complete-test %s -fuzz -fuzzy-weight=1 -tok=CONTEXT_SORT_1 | %FileCheck %s -check-prefix=CONTEXT_SORT_4 +// RUN: %complete-test %s -fuzz -fuzzy-weight=100 -tok=CONTEXT_SORT_1 | %FileCheck %s -check-prefix=CONTEXT_SORT_2 +// RUN: %complete-test %s -fuzz -fuzzy-weight=10000 -no-inner-results -tok=CONTEXT_SORT_1 | %FileCheck %s -check-prefix=CONTEXT_SORT_3 let myVar = 1 struct Test4 { let myVarTest4 = 2 @@ -122,7 +122,7 @@ struct Test4 { } } -// RUN: %complete-test %s -fuzz -tok=DONT_FILTER_TYPES_1 | FileCheck %s -check-prefix=DONT_FILTER_TYPES_1 +// RUN: %complete-test %s -fuzz -tok=DONT_FILTER_TYPES_1 | %FileCheck %s -check-prefix=DONT_FILTER_TYPES_1 struct Test5 { func dontFilterTypes(a: Int, b: Int, ccc: String) {} func dontFilterTypes(a: Int, b: Int, ddd: Float) {} @@ -141,7 +141,7 @@ func test5(x: Test5) { // DONT_FILTER_TYPES_1-LABEL: Results for filterText: flo [ // DONT_FILTER_TYPES_1-NEXT: ] -// RUN: %complete-test %s -fuzz -tok=MIN_LENGTH_1 | FileCheck %s -check-prefix=MIN_LENGTH_1 +// RUN: %complete-test %s -fuzz -tok=MIN_LENGTH_1 | %FileCheck %s -check-prefix=MIN_LENGTH_1 func test6(x: S1) { x.#^MIN_LENGTH_1,f,o,b^# } @@ -155,7 +155,7 @@ func test6(x: S1) { // MIN_LENGTH_1-LABEL: Results for filterText: b [ // MIN_LENGTH_1-NEXT: ] -// RUN: %complete-test %s -fuzz -tok=MAP | FileCheck %s -check-prefix=MAP +// RUN: %complete-test %s -fuzz -tok=MAP | %FileCheck %s -check-prefix=MAP protocol P { func map() } diff --git a/test/SourceKit/CodeComplete/complete_group_overloads.swift b/test/SourceKit/CodeComplete/complete_group_overloads.swift index 80eca0a6e820d..a3414a07879d8 100644 --- a/test/SourceKit/CodeComplete/complete_group_overloads.swift +++ b/test/SourceKit/CodeComplete/complete_group_overloads.swift @@ -13,7 +13,7 @@ func aab() {} func test001() { #^TOP_LEVEL_0,aa^# } -// RUN: %complete-test -group=overloads -tok=TOP_LEVEL_0 %s | FileCheck -check-prefix=TOP_LEVEL_0 %s +// RUN: %complete-test -group=overloads -tok=TOP_LEVEL_0 %s | %FileCheck -check-prefix=TOP_LEVEL_0 %s // TOP_LEVEL_0-LABEL: aaa: // TOP_LEVEL_0-NEXT: aaa() // TOP_LEVEL_0-NEXT: aaa(x: A) @@ -36,7 +36,7 @@ struct Foo { func test002() { Foo().#^FOO_INSTANCE_0^# } -// RUN: %complete-test -group=overloads -tok=FOO_INSTANCE_0 %s | FileCheck -check-prefix=FOO_INSTANCE_0 %s +// RUN: %complete-test -group=overloads -tok=FOO_INSTANCE_0 %s | %FileCheck -check-prefix=FOO_INSTANCE_0 %s // FOO_INSTANCE_0-LABEL: aaa: // FOO_INSTANCE_0-NEXT: aaa() // FOO_INSTANCE_0-NEXT: aaa(x: A) @@ -55,7 +55,7 @@ extension Foo { func test003() { Foo.#^FOO_QUAL_0^# } -// RUN: %complete-test -group=overloads -tok=FOO_QUAL_0 %s | FileCheck -check-prefix=FOO_QUAL_0 %s +// RUN: %complete-test -group=overloads -tok=FOO_QUAL_0 %s | %FileCheck -check-prefix=FOO_QUAL_0 %s // FOO_QUAL_0-LABEL: bbb: // FOO_QUAL_0-NEXT: bbb() // FOO_QUAL_0-NEXT: bbb(x: A) @@ -69,7 +69,7 @@ extension Foo { func test004() { Foo()#^FOO_SUBSCRIPT_0^# } -// RUN: %complete-test -group=overloads -tok=FOO_SUBSCRIPT_0 %s | FileCheck -check-prefix=FOO_SUBSCRIPT_0 %s +// RUN: %complete-test -group=overloads -tok=FOO_SUBSCRIPT_0 %s | %FileCheck -check-prefix=FOO_SUBSCRIPT_0 %s // FOO_SUBSCRIPT_0-LABEL: [: // FOO_SUBSCRIPT_0-NEXT: [A] // FOO_SUBSCRIPT_0-NEXT: [B] @@ -84,7 +84,7 @@ func test005() { Bar#^BAR_INIT_0^# } // Inline a lonely group -// RUN: %complete-test -group=overloads -add-inner-results -no-inner-operators -tok=BAR_INIT_0 %s | FileCheck -check-prefix=BAR_INIT_0 %s +// RUN: %complete-test -group=overloads -add-inner-results -no-inner-operators -tok=BAR_INIT_0 %s | %FileCheck -check-prefix=BAR_INIT_0 %s // BAR_INIT_0-NOT: (: // BAR_INIT_0: () // BAR_INIT_0-NEXT: (x: A) @@ -97,7 +97,7 @@ extension Bar { func test006() { Bar#^BAR_INIT_1^# } -// RUN: %complete-test -group=overloads -add-inner-results -no-inner-operators -tok=BAR_INIT_1 %s | FileCheck -check-prefix=BAR_INIT_1 %s +// RUN: %complete-test -group=overloads -add-inner-results -no-inner-operators -tok=BAR_INIT_1 %s | %FileCheck -check-prefix=BAR_INIT_1 %s // BAR_INIT_1-LABEL: (: // BAR_INIT_1-NEXT: () // BAR_INIT_1-NEXT: (x: A) @@ -106,7 +106,7 @@ func test006() { func test007() { #^BAR_INIT_2^# -// RUN: %complete-test -add-inits-to-top-level -group=overloads -tok=BAR_INIT_2 %s | FileCheck -check-prefix=BAR_INIT_2 %s +// RUN: %complete-test -add-inits-to-top-level -group=overloads -tok=BAR_INIT_2 %s | %FileCheck -check-prefix=BAR_INIT_2 %s // BAR_INIT_2-LABEL: Bar: // BAR_INIT_2-NEXT: Bar // BAR_INIT_2-NEXT: Bar() diff --git a/test/SourceKit/CodeComplete/complete_hide_low_priority.swift b/test/SourceKit/CodeComplete/complete_hide_low_priority.swift index 1b1bf17614c19..b80b89d8f7ec1 100644 --- a/test/SourceKit/CodeComplete/complete_hide_low_priority.swift +++ b/test/SourceKit/CodeComplete/complete_hide_low_priority.swift @@ -2,11 +2,11 @@ // RUN: %complete-test -hide-low-priority=1 -tok=TOP_LEVEL_0 %s -- -I %S/Inputs > %t.on // RUN: %complete-test -hide-low-priority=0 -tok=TOP_LEVEL_0 %s -- -I %S/Inputs > %t.off -// RUN: FileCheck %s -check-prefix=HIDE < %t.on -// RUN: FileCheck %s -check-prefix=NOHIDE < %t.off +// RUN: %FileCheck %s -check-prefix=HIDE < %t.on +// RUN: %FileCheck %s -check-prefix=NOHIDE < %t.off -// RUN: %complete-test -hide-by-name=1 -hide-low-priority=1 -tok=TOP_LEVEL_TYPE_0 %s -- -I %S/Inputs | FileCheck %s -check-prefix=TYPES-HIDENAME -// RUN: %complete-test -hide-by-name=0 -hide-low-priority=1 -tok=TOP_LEVEL_TYPE_0 %s -- -I %S/Inputs | FileCheck %s -check-prefix=TYPES-NOHIDENAME +// RUN: %complete-test -hide-by-name=1 -hide-low-priority=1 -tok=TOP_LEVEL_TYPE_0 %s -- -I %S/Inputs | %FileCheck %s -check-prefix=TYPES-HIDENAME +// RUN: %complete-test -hide-by-name=0 -hide-low-priority=1 -tok=TOP_LEVEL_TYPE_0 %s -- -I %S/Inputs | %FileCheck %s -check-prefix=TYPES-NOHIDENAME import PopularAPI let x = 1 diff --git a/test/SourceKit/CodeComplete/complete_import_module_flag.swift b/test/SourceKit/CodeComplete/complete_import_module_flag.swift index ab907b6480ae1..48c80db71cc00 100644 --- a/test/SourceKit/CodeComplete/complete_import_module_flag.swift +++ b/test/SourceKit/CodeComplete/complete_import_module_flag.swift @@ -1,8 +1,8 @@ // XFAIL: broken_std_regex // RUN: mkdir -p %t // RUN: %swift -Xcc -I%S/Inputs -emit-module -o %t/auxiliary_file.swiftmodule %S/Inputs/auxiliary_file.swift -// RUN: %complete-test -group=none -hide-none -raw -tok=TOP_LEVEL_0 %s -- -import-module auxiliary_file -I %t -I %S/Inputs | FileCheck %s -// RUN: %complete-test -group=none -tok=TOP_LEVEL_0 %s -- -import-module auxiliary_file -I %t -I %S/Inputs | FileCheck %s -check-prefix=WITH_HIDING +// RUN: %complete-test -group=none -hide-none -raw -tok=TOP_LEVEL_0 %s -- -import-module auxiliary_file -I %t -I %S/Inputs | %FileCheck %s +// RUN: %complete-test -group=none -tok=TOP_LEVEL_0 %s -- -import-module auxiliary_file -I %t -I %S/Inputs | %FileCheck %s -check-prefix=WITH_HIDING func fromMainModule() {} func test() { diff --git a/test/SourceKit/CodeComplete/complete_inner.swift b/test/SourceKit/CodeComplete/complete_inner.swift index aa88157a4af10..aca4e5e2a8e7f 100644 --- a/test/SourceKit/CodeComplete/complete_inner.swift +++ b/test/SourceKit/CodeComplete/complete_inner.swift @@ -17,7 +17,7 @@ class FooBar { func test001() { #^TOP_LEVEL_0,fo,foo,foob,foobar^# } -// RUN: %complete-test %s -no-fuzz -group=none -add-inner-results -tok=TOP_LEVEL_0 | FileCheck %s -check-prefix=TOP_LEVEL_0 +// RUN: %complete-test %s -no-fuzz -group=none -add-inner-results -tok=TOP_LEVEL_0 | %FileCheck %s -check-prefix=TOP_LEVEL_0 // TOP_LEVEL_0-LABEL: Results for filterText: fo [ // TOP_LEVEL_0-NEXT: for // TOP_LEVEL_0-NEXT: Foo @@ -48,7 +48,7 @@ func test001() { func test002(abc: FooBar, abd: Base) { #^TOP_LEVEL_1,ab,abc,abd^# } -// RUN: %complete-test %s -no-fuzz -group=none -add-inner-results -tok=TOP_LEVEL_1 | FileCheck %s -check-prefix=TOP_LEVEL_1 +// RUN: %complete-test %s -no-fuzz -group=none -add-inner-results -tok=TOP_LEVEL_1 | %FileCheck %s -check-prefix=TOP_LEVEL_1 // TOP_LEVEL_1-LABEL: Results for filterText: ab [ // TOP_LEVEL_1-NEXT: abc // TOP_LEVEL_1-NEXT: abd @@ -74,7 +74,7 @@ func test002(abc: FooBar, abd: Base) { func test003(x: FooBar) { x.#^FOOBAR_QUALIFIED,pro,prop,prop.^# } -// RUN: %complete-test %s -group=none -add-inner-results -tok=FOOBAR_QUALIFIED | FileCheck %s -check-prefix=FOOBAR_QUALIFIED +// RUN: %complete-test %s -group=none -add-inner-results -tok=FOOBAR_QUALIFIED | %FileCheck %s -check-prefix=FOOBAR_QUALIFIED // FOOBAR_QUALIFIED-LABEL: Results for filterText: pro [ // FOOBAR_QUALIFIED-NEXT: prop // FOOBAR_QUALIFIED-NEXT: ] @@ -90,7 +90,7 @@ func test003(x: FooBar) { // FOOBAR_QUALIFIED-LABEL: Results for filterText: prop. [ // FOOBAR_QUALIFIED-NEXT: ] -// RUN: %complete-test %s -group=none -no-inner-results -inner-operators -tok=FOOBAR_QUALIFIED | FileCheck %s -check-prefix=FOOBAR_QUALIFIED_OP +// RUN: %complete-test %s -group=none -no-inner-results -inner-operators -tok=FOOBAR_QUALIFIED | %FileCheck %s -check-prefix=FOOBAR_QUALIFIED_OP // FOOBAR_QUALIFIED_OP-LABEL: Results for filterText: pro [ // FOOBAR_QUALIFIED_OP-NEXT: prop // FOOBAR_QUALIFIED_OP-NEXT: ] @@ -99,7 +99,7 @@ func test003(x: FooBar) { // FOOBAR_QUALIFIED_OP-NEXT: prop. // FOOBAR_QUALIFIED_OP: ] -// RUN: %complete-test %s -group=none -add-inner-results -no-inner-operators -tok=FOOBAR_QUALIFIED | FileCheck %s -check-prefix=FOOBAR_QUALIFIED_NOOP +// RUN: %complete-test %s -group=none -add-inner-results -no-inner-operators -tok=FOOBAR_QUALIFIED | %FileCheck %s -check-prefix=FOOBAR_QUALIFIED_NOOP // FOOBAR_QUALIFIED_NOOP-LABEL: Results for filterText: pro [ // FOOBAR_QUALIFIED_NOOP-NEXT: prop // FOOBAR_QUALIFIED_NOOP-NEXT: ] @@ -109,7 +109,7 @@ func test003(x: FooBar) { // FOOBAR_QUALIFIED_NOOP-NEXT: prop.prop // FOOBAR_QUALIFIED_NOOP-NEXT: ] -// RUN: %complete-test %s -group=none -no-include-exact-match -add-inner-results -no-inner-operators -tok=FOOBAR_QUALIFIED | FileCheck %s -check-prefix=FOOBAR_QUALIFIED_NOEXACT +// RUN: %complete-test %s -group=none -no-include-exact-match -add-inner-results -no-inner-operators -tok=FOOBAR_QUALIFIED | %FileCheck %s -check-prefix=FOOBAR_QUALIFIED_NOEXACT // FOOBAR_QUALIFIED_NOEXACT-LABEL: Results for filterText: prop [ // FOOBAR_QUALIFIED_NOEXACT-NEXT: prop.method() // FOOBAR_QUALIFIED_NOEXACT-NEXT: prop.prop @@ -118,14 +118,14 @@ func test003(x: FooBar) { func test004() { FooBar#^FOOBAR_POSTFIX^# } -// RUN: %complete-test %s -group=none -no-inner-results -inner-operators -tok=FOOBAR_POSTFIX | FileCheck %s -check-prefix=FOOBAR_POSTFIX_OP +// RUN: %complete-test %s -group=none -no-inner-results -inner-operators -tok=FOOBAR_POSTFIX | %FileCheck %s -check-prefix=FOOBAR_POSTFIX_OP // FOOBAR_POSTFIX_OP: {{^}}.{{$}} // FOOBAR_POSTFIX_OP: {{^}}({{$}} func test005(x: FooBar) { x#^FOOBAR_INSTANCE_POSTFIX^# } -// RUN: %complete-test %s -group=none -no-inner-results -inner-operators -tok=FOOBAR_INSTANCE_POSTFIX | FileCheck %s -check-prefix=FOOBAR_INSTANCE_POSTFIX_OP +// RUN: %complete-test %s -group=none -no-inner-results -inner-operators -tok=FOOBAR_INSTANCE_POSTFIX | %FileCheck %s -check-prefix=FOOBAR_INSTANCE_POSTFIX_OP // FOOBAR_INSTANCE_POSTFIX_OP: . // FIXME: We should probably just have '[' here - rdar://22702955 // FOOBAR_INSTANCE_POSTFIX_OP: [Foo] @@ -133,11 +133,11 @@ func test005(x: FooBar) { func test005(x: Base?) { x#^OPTIONAL_POSTFIX^# } -// RUN: %complete-test %s -group=none -no-inner-results -inner-operators -tok=OPTIONAL_POSTFIX | FileCheck %s -check-prefix=OPTIONAL_POSTFIX_OP +// RUN: %complete-test %s -group=none -no-inner-results -inner-operators -tok=OPTIONAL_POSTFIX | %FileCheck %s -check-prefix=OPTIONAL_POSTFIX_OP // OPTIONAL_POSTFIX_OP: . // OPTIONAL_POSTFIX_OP: ?. -// RUN: %complete-test %s -group=none -no-inner-results -inner-operators -tok=KEYWORD_0 | FileCheck %s -check-prefix=KEYWORD_0 +// RUN: %complete-test %s -group=none -no-inner-results -inner-operators -tok=KEYWORD_0 | %FileCheck %s -check-prefix=KEYWORD_0 func test006() { #^KEYWORD_0,for^# } diff --git a/test/SourceKit/CodeComplete/complete_literals.swift b/test/SourceKit/CodeComplete/complete_literals.swift index 177f026179bd5..f2ca73031feac 100644 --- a/test/SourceKit/CodeComplete/complete_literals.swift +++ b/test/SourceKit/CodeComplete/complete_literals.swift @@ -2,9 +2,9 @@ let var1 = 1 let var2: Int = 1 // XFAIL: broken_std_regex -// RUN: %sourcekitd-test -req=complete -pos=1:2 %s -- %s | FileCheck %s -check-prefix=COMPLETE_1 -// RUN: %sourcekitd-test -req=complete -pos=2:12 %s -- %s | FileCheck %s -check-prefix=COMPLETE_1 -// RUN: %sourcekitd-test -req=complete -pos=3:17 %s -- %s | FileCheck %s -check-prefix=COMPLETE_2 +// RUN: %sourcekitd-test -req=complete -pos=1:2 %s -- %s | %FileCheck %s -check-prefix=COMPLETE_1 +// RUN: %sourcekitd-test -req=complete -pos=2:12 %s -- %s | %FileCheck %s -check-prefix=COMPLETE_1 +// RUN: %sourcekitd-test -req=complete -pos=3:17 %s -- %s | %FileCheck %s -check-prefix=COMPLETE_2 // COMPLETE_1-NOT: source.lang.swift.literal // COMPLETE_1: source.lang.swift.literal.color @@ -17,7 +17,7 @@ let var2: Int = 1 // COMPLETE_2: key.name: "nil" // COMPLETE_2-NOT: source.lang.swift.literal -// RUN: %sourcekitd-test -req=complete.open -pos=1:2 %s -- %s | FileCheck %s -check-prefix=LITERALS +// RUN: %sourcekitd-test -req=complete.open -pos=1:2 %s -- %s | %FileCheck %s -check-prefix=LITERALS // LITERALS: key.kind: source.lang.swift.literal.string // LITERALS: key.sourcetext: "\"<#{{.*}}#>\"" // LITERALS: key.kind: source.lang.swift.literal.boolean @@ -29,9 +29,9 @@ let var2: Int = 1 // LITERALS: key.sourcetext: "(<#{{.*}}#>)" // LITERALS: key.kind: source.lang.swift.literal.nil -// RUN: %complete-test -tok=STMT1 %s -raw | FileCheck %s -check-prefix=STMT -// RUN: %complete-test -tok=STMT2 %s -raw | FileCheck %s -check-prefix=STMT -// RUN: %complete-test -tok=STMT3 %s -raw | FileCheck %s -check-prefix=STMT +// RUN: %complete-test -tok=STMT1 %s -raw | %FileCheck %s -check-prefix=STMT +// RUN: %complete-test -tok=STMT2 %s -raw | %FileCheck %s -check-prefix=STMT +// RUN: %complete-test -tok=STMT3 %s -raw | %FileCheck %s -check-prefix=STMT // STMT-NOT: source.lang.swift.literal #^STMT1^# @@ -43,26 +43,26 @@ func foo(_ x: Int) { #^STMT3^# } -// RUN: %complete-test -tok=EXPR1 %s -raw | FileCheck %s -check-prefix=LITERALS -// RUN: %complete-test -tok=EXPR2 %s -raw | FileCheck %s -check-prefix=LITERALS -// RUN: %complete-test -tok=EXPR3 %s -raw | FileCheck %s -check-prefix=LITERALS +// RUN: %complete-test -tok=EXPR1 %s -raw | %FileCheck %s -check-prefix=LITERALS +// RUN: %complete-test -tok=EXPR2 %s -raw | %FileCheck %s -check-prefix=LITERALS +// RUN: %complete-test -tok=EXPR3 %s -raw | %FileCheck %s -check-prefix=LITERALS let x1 = #^EXPR1^# x1 + #^EXPR2^# if #^EXPR3^# { } -// RUN: %complete-test -tok=EXPR4 %s -raw | FileCheck %s -check-prefix=LITERAL_INT +// RUN: %complete-test -tok=EXPR4 %s -raw | %FileCheck %s -check-prefix=LITERAL_INT foo(#^EXPR4^#) // LITERAL_INT-NOT: source.lang.swift.literal // LITERAL_INT: key.kind: source.lang.swift.literal.integer // LITERAL_INT-NOT: source.lang.swift.literal -// RUN: %complete-test -tok=EXPR5 %s -raw | FileCheck %s -check-prefix=LITERAL_TUPLE +// RUN: %complete-test -tok=EXPR5 %s -raw | %FileCheck %s -check-prefix=LITERAL_TUPLE let x2: (String, Int) = #^EXPR5^# // LITERAL_TUPLE-NOT: source.lang.swift.literal // LITERAL_TUPLE: key.kind: source.lang.swift.literal.tuple // LITERAL_TUPLE-NOT: source.lang.swift.literal -// RUN: %complete-test -tok=EXPR6 %s -raw | FileCheck %s -check-prefix=LITERAL_NO_TYPE +// RUN: %complete-test -tok=EXPR6 %s -raw | %FileCheck %s -check-prefix=LITERAL_NO_TYPE // When there is a type context that doesn't match, we should see no literals // except the keywords and they should be prioritized like keywords not // literals. diff --git a/test/SourceKit/CodeComplete/complete_member.swift b/test/SourceKit/CodeComplete/complete_member.swift index ad55791d42499..5610737e4eba3 100644 --- a/test/SourceKit/CodeComplete/complete_member.swift +++ b/test/SourceKit/CodeComplete/complete_member.swift @@ -42,8 +42,8 @@ func testOverrideUSR() { // RUN: %sourcekitd-test -req=complete -pos=15:5 %s -- %s > %t.response // RUN: diff -u %s.response %t.response // -// RUN: %sourcekitd-test -req=complete -pos=19:5 %s -- %s | FileCheck %s -check-prefix=CHECK-OPTIONAL -// RUN: %sourcekitd-test -req=complete.open -pos=19:5 %s -- %s | FileCheck %s -check-prefix=CHECK-OPTIONAL-OPEN +// RUN: %sourcekitd-test -req=complete -pos=19:5 %s -- %s | %FileCheck %s -check-prefix=CHECK-OPTIONAL +// RUN: %sourcekitd-test -req=complete.open -pos=19:5 %s -- %s | %FileCheck %s -check-prefix=CHECK-OPTIONAL-OPEN // CHECK-OPTIONAL: { // CHECK-OPTIONAL: key.kind: source.lang.swift.decl.function.method.instance, // CHECK-OPTIONAL: key.name: "fooInstanceFunc0()", @@ -56,15 +56,15 @@ func testOverrideUSR() { // CHECK-OPTIONAL-NEXT: key.modulename: "complete_member" // CHECK-OPTIONAL-NEXT: }, -// RUN: %sourcekitd-test -req=complete.open -pos=19:5 %s -- %s | FileCheck %s -check-prefix=CHECK-OPTIONAL-OPEN +// RUN: %sourcekitd-test -req=complete.open -pos=19:5 %s -- %s | %FileCheck %s -check-prefix=CHECK-OPTIONAL-OPEN // CHECK-OPTIONAL-OPEN-NOT: key.description: "fooInstanceFunc1 // CHECK-OPTIONAL-OPEN: key.description: "?.fooInstanceFunc1(a: Int)", // CHECK-OPTIONAL-OPEN-NOT: key.description: "fooInstanceFunc1 -// RUN: %sourcekitd-test -req=complete -pos=27:5 %s -- %s | FileCheck %s -check-prefix=CHECK-UNAVAIL +// RUN: %sourcekitd-test -req=complete -pos=27:5 %s -- %s | %FileCheck %s -check-prefix=CHECK-UNAVAIL // CHECK-UNAVAIL-NOT: key.name: "unavail()", -// RUN: %sourcekitd-test -req=complete -pos=39:15 %s -- %s | FileCheck %s -check-prefix=CHECK-OVERRIDE_USR +// RUN: %sourcekitd-test -req=complete -pos=39:15 %s -- %s | %FileCheck %s -check-prefix=CHECK-OVERRIDE_USR // CHECK-OVERRIDE_USR: { // CHECK-OVERRIDE_USR: key.kind: source.lang.swift.decl.function.method.instance, // CHECK-OVERRIDE_USR-NEXT: key.name: "foo()", diff --git a/test/SourceKit/CodeComplete/complete_moduleimportdepth.swift b/test/SourceKit/CodeComplete/complete_moduleimportdepth.swift index ec175258246b6..a4184ac7a8e76 100644 --- a/test/SourceKit/CodeComplete/complete_moduleimportdepth.swift +++ b/test/SourceKit/CodeComplete/complete_moduleimportdepth.swift @@ -7,7 +7,7 @@ func test() { // XFAIL: broken_std_regex // RUN: %complete-test -hide-none -group=none -tok=A %s -raw -- -I %S/Inputs -F %S/../Inputs/libIDE-mock-sdk > %t -// RUN: FileCheck %s < %t +// RUN: %FileCheck %s < %t // Swift == 1 // CHECK-LABEL: key.name: "abs(:)", diff --git a/test/SourceKit/CodeComplete/complete_name.swift b/test/SourceKit/CodeComplete/complete_name.swift index 9eaaf79521384..40927a90baeee 100644 --- a/test/SourceKit/CodeComplete/complete_name.swift +++ b/test/SourceKit/CodeComplete/complete_name.swift @@ -1,6 +1,6 @@ // XFAIL: broken_std_regex -// RUN: %complete-test -raw -tok=INIT_NAME %s | FileCheck %s -check-prefix=INIT_NAME -// RUN: %complete-test -raw -tok=METHOD_NAME %s | FileCheck %s -check-prefix=METHOD_NAME +// RUN: %complete-test -raw -tok=INIT_NAME %s | %FileCheck %s -check-prefix=INIT_NAME +// RUN: %complete-test -raw -tok=METHOD_NAME %s | %FileCheck %s -check-prefix=METHOD_NAME struct S { init(a: Int, b: Int, _ c: Int) {} diff --git a/test/SourceKit/CodeComplete/complete_open.swift b/test/SourceKit/CodeComplete/complete_open.swift index 67de57b564f23..97c3ba1ae8c19 100644 --- a/test/SourceKit/CodeComplete/complete_open.swift +++ b/test/SourceKit/CodeComplete/complete_open.swift @@ -9,7 +9,7 @@ func foo() { // in comment } -// RUN: %sourcekitd-test -req=complete.open -pos=8:5 %s -- %s | FileCheck %s +// RUN: %sourcekitd-test -req=complete.open -pos=8:5 %s -- %s | %FileCheck %s // CHECK: key.results: [ // CHECK: key.name: "advancedFeatures // ... @@ -22,45 +22,45 @@ func foo() { // RUN: == -req=complete.close -pos=8:5 %s -- %s \ // RUN: == -req=complete.open -pos=8:5 %s -- %s \ // RUN: == -req=complete.close -pos=8:5 %s -- %s > %t.close -// RUN: FileCheck -check-prefix=CLOSE %s < %t.close +// RUN: %FileCheck -check-prefix=CLOSE %s < %t.close // CLOSE: key.name: "advancedFeatures // CLOSE: key.name: "advancedFeatures // RUN: %sourcekitd-test -req=complete.open -pos=8:5 %s -- %s \ // RUN: == -req=complete.open -pos=7:1 %s -- %s > %t.open2diff -// RUN: FileCheck -check-prefix=OPEN2DIFF %s < %t.open2diff +// RUN: %FileCheck -check-prefix=OPEN2DIFF %s < %t.open2diff // OPEN2DIFF: key.name: "advancedFeatures // OPEN2DIFF: key.name: "foo() // OPEN2DIFF-NOT: key.name: "advancedFeatures // RUN: not %sourcekitd-test -req=complete.open -pos=8:5 %s -- %s \ // RUN: == -req=complete.open -pos=8:5 %s -- %s 2> %t.open2 -// RUN: FileCheck -check-prefix=OPEN2 %s < %t.open2 +// RUN: %FileCheck -check-prefix=OPEN2 %s < %t.open2 // OPEN2: error response (Request Failed): codecomplete.open: code completion session for '{{.*}}', {{.*}} already exists // RUN: not %sourcekitd-test -req=complete.close -pos=7:1 %s -- %s 2> %t.closefail1 -// RUN: FileCheck -check-prefix=CLOSEFAIL %s < %t.closefail1 +// RUN: %FileCheck -check-prefix=CLOSEFAIL %s < %t.closefail1 // RUN: not %sourcekitd-test -req=complete.open -pos=8:5 %s -- %s \ // RUN: == -req=complete.close -pos=7:1 %s -- %s 2> %t.closefail2 -// RUN: FileCheck -check-prefix=CLOSEFAIL %s < %t.closefail2 +// RUN: %FileCheck -check-prefix=CLOSEFAIL %s < %t.closefail2 // RUN: not %sourcekitd-test -req=complete.open -pos=8:5 %s -- %s \ // RUN: == -req=complete.close -pos=8:5 %s -- %s \ // RUN: == -req=complete.close -pos=8:5 %s -- %s 2> %t.closefail3 -// RUN: FileCheck -check-prefix=CLOSEFAIL %s < %t.closefail3 +// RUN: %FileCheck -check-prefix=CLOSEFAIL %s < %t.closefail3 // CLOSEFAIL: error response (Request Failed): codecomplete.close: no code completion session for '{{.*}}' // RUN: not %sourcekitd-test -req=complete.update -pos=7:1 %s -- %s 2> %t.updatefail1 -// RUN: FileCheck -check-prefix=UPDATEFAIL %s < %t.updatefail1 +// RUN: %FileCheck -check-prefix=UPDATEFAIL %s < %t.updatefail1 // RUN: not %sourcekitd-test -req=complete.open -pos=8:5 %s -- %s \ // RUN: == -req=complete.update -pos=7:1 %s -- %s 2> %t.updatefail2 -// RUN: FileCheck -check-prefix=UPDATEFAIL %s < %t.updatefail2 +// RUN: %FileCheck -check-prefix=UPDATEFAIL %s < %t.updatefail2 // RUN: not %sourcekitd-test -req=complete.open -pos=8:5 %s -- %s \ // RUN: == -req=complete.close -pos=8:5 %s -- %s \ // RUN: == -req=complete.update -pos=8:5 %s -- %s 2> %t.updatefail3 -// RUN: FileCheck -check-prefix=UPDATEFAIL %s < %t.updatefail3 +// RUN: %FileCheck -check-prefix=UPDATEFAIL %s < %t.updatefail3 // UPDATEFAIL: error response (Request Failed): codecomplete.update: no code completion session for '{{.*}}' -// RUN: %sourcekitd-test -req=complete.open -pos=9:9 %s -- %s | FileCheck %s -check-prefix=EMPTY +// RUN: %sourcekitd-test -req=complete.open -pos=9:9 %s -- %s | %FileCheck %s -check-prefix=EMPTY // EMPTY: key.results: [ // EMPTY-NEXT: ], // EMPTY-NEXT: key.kind: source.lang.swift.codecomplete.group diff --git a/test/SourceKit/CodeComplete/complete_operators.swift b/test/SourceKit/CodeComplete/complete_operators.swift index fb29050c98f84..ea4d173c81ecf 100644 --- a/test/SourceKit/CodeComplete/complete_operators.swift +++ b/test/SourceKit/CodeComplete/complete_operators.swift @@ -1,11 +1,11 @@ // XFAIL: broken_std_regex -// RUN: %complete-test -tok=INT_OPERATORS %s | FileCheck %s -// RUN: %complete-test -add-inner-results -tok=INT_OPERATORS_INNER %s | FileCheck %s -check-prefix=INNER -// RUN: %complete-test -raw -hide-none -tok=INT_OPERATORS %s | FileCheck %s -check-prefix=RAW -// RUN: %complete-test -tok=BOOL_OPERATORS %s | FileCheck %s -check-prefix=BOOL -// RUN: %complete-test -tok=OPT_OPERATORS %s | FileCheck %s -check-prefix=OPT -// RUN: %complete-test -tok=KNOWN_OPERATORS_1 %s | FileCheck %s -check-prefix=KNOWN -// RUN: %complete-test -tok=KNOWN_OPERATORS_2 %s | FileCheck %s -check-prefix=KNOWN +// RUN: %complete-test -tok=INT_OPERATORS %s | %FileCheck %s +// RUN: %complete-test -add-inner-results -tok=INT_OPERATORS_INNER %s | %FileCheck %s -check-prefix=INNER +// RUN: %complete-test -raw -hide-none -tok=INT_OPERATORS %s | %FileCheck %s -check-prefix=RAW +// RUN: %complete-test -tok=BOOL_OPERATORS %s | %FileCheck %s -check-prefix=BOOL +// RUN: %complete-test -tok=OPT_OPERATORS %s | %FileCheck %s -check-prefix=OPT +// RUN: %complete-test -tok=KNOWN_OPERATORS_1 %s | %FileCheck %s -check-prefix=KNOWN +// RUN: %complete-test -tok=KNOWN_OPERATORS_2 %s | %FileCheck %s -check-prefix=KNOWN struct MyInt { var bigPowers: Int { return 1 } diff --git a/test/SourceKit/CodeComplete/complete_playground_symlink.swift b/test/SourceKit/CodeComplete/complete_playground_symlink.swift index f7b2bdbea2bc2..5c44e8638838b 100644 --- a/test/SourceKit/CodeComplete/complete_playground_symlink.swift +++ b/test/SourceKit/CodeComplete/complete_playground_symlink.swift @@ -3,7 +3,7 @@ // RUN: echo "let foo_blah = 0" > %t.dir/input.swift // RUN: echo "" >> %t.dir/input.swift // RUN: ln -s %t.dir/test.playground %t.dir/linked.playground -// RUN: %sourcekitd-test -req=complete -pos=2:1 -text-input %t.dir/input.swift %t.dir/test.playground -- %t.dir/test.playground | FileCheck %s -// RUN: %sourcekitd-test -req=complete -pos=2:1 -text-input %t.dir/input.swift %t.dir/linked.playground -- %t.dir/linked.playground | FileCheck %s +// RUN: %sourcekitd-test -req=complete -pos=2:1 -text-input %t.dir/input.swift %t.dir/test.playground -- %t.dir/test.playground | %FileCheck %s +// RUN: %sourcekitd-test -req=complete -pos=2:1 -text-input %t.dir/input.swift %t.dir/linked.playground -- %t.dir/linked.playground | %FileCheck %s // CHECK: key.name: "foo_blah" diff --git a/test/SourceKit/CodeComplete/complete_popular_api.swift b/test/SourceKit/CodeComplete/complete_popular_api.swift index ed8cfefe39795..c89db5720e791 100644 --- a/test/SourceKit/CodeComplete/complete_popular_api.swift +++ b/test/SourceKit/CodeComplete/complete_popular_api.swift @@ -20,15 +20,15 @@ struct Foo { // REQUIRES: objc_interop // RUN: %sourcekitd-test -req=complete.open -pos=2:1 -req-opts=hidelowpriority=0 %s -- %s > %t.nopopular.top // RUN: %sourcekitd-test -req=complete.open -pos=3:5 %s -- %s > %t.nopopular.foo -// RUN: FileCheck %s -check-prefix=NOPOP_TOP < %t.nopopular.top -// RUN: FileCheck %s -check-prefix=NOPOP_FOO < %t.nopopular.foo +// RUN: %FileCheck %s -check-prefix=NOPOP_TOP < %t.nopopular.top +// RUN: %FileCheck %s -check-prefix=NOPOP_FOO < %t.nopopular.foo // RUN: %sourcekitd-test -req=complete.setpopularapi -req-opts=popular=%s.popular,unpopular=%s.unpopular \ // RUN: == -req=complete.open -req-opts=hidelowpriority=0 -pos=2:1 %s -- %s > %t.popular.top // RUN: %sourcekitd-test -req=complete.setpopularapi -req-opts=popular=%s.popular,unpopular=%s.unpopular \ // RUN: == -req=complete.open -pos=3:5 %s -- %s > %t.popular.foo -// RUN: FileCheck %s -check-prefix=POP_TOP < %t.popular.top -// RUN: FileCheck %s -check-prefix=POP_FOO < %t.popular.foo +// RUN: %FileCheck %s -check-prefix=POP_TOP < %t.popular.top +// RUN: %FileCheck %s -check-prefix=POP_FOO < %t.popular.foo // NOPOP_TOP: key.name: "bad() // NOPOP_TOP: key.name: "good() @@ -56,7 +56,7 @@ struct Foo { // RUN: %complete-test -hide-none -fuzz -group=none -popular="%s.popular" -unpopular="%s.unpopular" -tok=POPULAR_STMT_0 %s -- -I %S/Inputs > %t.popular.stmt.0 -// RUN: FileCheck %s -check-prefix=POPULAR_STMT_0 < %t.popular.stmt.0 +// RUN: %FileCheck %s -check-prefix=POPULAR_STMT_0 < %t.popular.stmt.0 import PopularAPI var globalColor = 0 @@ -116,7 +116,7 @@ struct Outer { struct ABFont {} } -// RUN: %complete-test -hide-none -fuzz -group=none -popular="%s.popular" -unpopular="%s.unpopular" -tok=POPULAR_VS_PREFIX_1 %s -- -I %S/Inputs | FileCheck %s -check-prefix=POPULAR_VS_PREFIX_1 +// RUN: %complete-test -hide-none -fuzz -group=none -popular="%s.popular" -unpopular="%s.unpopular" -tok=POPULAR_VS_PREFIX_1 %s -- -I %S/Inputs | %FileCheck %s -check-prefix=POPULAR_VS_PREFIX_1 func testPopularityVsPrefixMatch1() { let x: Outer.#^POPULAR_VS_PREFIX_1,,AB,ABT^# } diff --git a/test/SourceKit/CodeComplete/complete_requestlimit.swift b/test/SourceKit/CodeComplete/complete_requestlimit.swift index 6dc7d8381760f..ce191b40db621 100644 --- a/test/SourceKit/CodeComplete/complete_requestlimit.swift +++ b/test/SourceKit/CodeComplete/complete_requestlimit.swift @@ -7,13 +7,13 @@ struct B { let c: A } -// RUN: %complete-test -tok=TOP_LEVEL_0 %s | FileCheck -check-prefix=TOP_LEVEL_0_ALL %s -// RUN: %complete-test -tok=TOP_LEVEL_0 %s -limit=0 | FileCheck -check-prefix=TOP_LEVEL_0_ALL %s -// RUN: %complete-test -tok=TOP_LEVEL_0 %s -limit=3 | FileCheck -check-prefix=TOP_LEVEL_0_3 %s -// RUN: %complete-test -tok=TOP_LEVEL_0 %s -limit=1 | FileCheck -check-prefix=TOP_LEVEL_0_1 %s -// RUN: %complete-test -tok=TOP_LEVEL_0 %s -start=1 -limit=1 | FileCheck -check-prefix=TOP_LEVEL_0_11 %s -// RUN: %complete-test -tok=TOP_LEVEL_0 %s -start=2 -limit=1 | FileCheck -check-prefix=TOP_LEVEL_0_12 %s -// RUN: %complete-test -tok=TOP_LEVEL_0 %s -raw -start=100000 -limit=1 | FileCheck -check-prefix=TOP_LEVEL_0_NONE %s +// RUN: %complete-test -tok=TOP_LEVEL_0 %s | %FileCheck -check-prefix=TOP_LEVEL_0_ALL %s +// RUN: %complete-test -tok=TOP_LEVEL_0 %s -limit=0 | %FileCheck -check-prefix=TOP_LEVEL_0_ALL %s +// RUN: %complete-test -tok=TOP_LEVEL_0 %s -limit=3 | %FileCheck -check-prefix=TOP_LEVEL_0_3 %s +// RUN: %complete-test -tok=TOP_LEVEL_0 %s -limit=1 | %FileCheck -check-prefix=TOP_LEVEL_0_1 %s +// RUN: %complete-test -tok=TOP_LEVEL_0 %s -start=1 -limit=1 | %FileCheck -check-prefix=TOP_LEVEL_0_11 %s +// RUN: %complete-test -tok=TOP_LEVEL_0 %s -start=2 -limit=1 | %FileCheck -check-prefix=TOP_LEVEL_0_12 %s +// RUN: %complete-test -tok=TOP_LEVEL_0 %s -raw -start=100000 -limit=1 | %FileCheck -check-prefix=TOP_LEVEL_0_NONE %s func test001() { let x: B let y: B @@ -55,8 +55,8 @@ func test001() { // TOP_LEVEL_0_NONE: ] } -// RUN: %complete-test -tok=B_INSTANCE_0 %s | FileCheck -check-prefix=B_INSTANCE_0_ALL %s -// RUN: %complete-test -tok=B_INSTANCE_0 %s -limit=1 | FileCheck -check-prefix=B_INSTANCE_0_1 %s +// RUN: %complete-test -tok=B_INSTANCE_0 %s | %FileCheck -check-prefix=B_INSTANCE_0_ALL %s +// RUN: %complete-test -tok=B_INSTANCE_0 %s -limit=1 | %FileCheck -check-prefix=B_INSTANCE_0_1 %s func test002(x: B) { x.#^B_INSTANCE_0^# @@ -77,8 +77,8 @@ struct C { let abc: A } -// RUN: %complete-test -tok=C_INSTANCE_0 %s | FileCheck -check-prefix=C_INSTANCE_0_ALL %s -// RUN: %complete-test -tok=C_INSTANCE_0 %s -limit=1 | FileCheck -check-prefix=C_INSTANCE_0_1 %s +// RUN: %complete-test -tok=C_INSTANCE_0 %s | %FileCheck -check-prefix=C_INSTANCE_0_ALL %s +// RUN: %complete-test -tok=C_INSTANCE_0 %s -limit=1 | %FileCheck -check-prefix=C_INSTANCE_0_1 %s func test003(x: C) { x.#^C_INSTANCE_0,aa^# @@ -97,9 +97,9 @@ struct D { func aab() {} } -// RUN: %complete-test -group=overloads -tok=D_INSTANCE_0 %s | FileCheck -check-prefix=OVERLOADS_ALL %s -// RUN: %complete-test -group=overloads -tok=D_INSTANCE_0 %s -limit=1 | FileCheck -check-prefix=OVERLOADS_1 %s -// RUN: %complete-test -group=overloads -tok=D_INSTANCE_0 %s -start=1 -limit=1 | FileCheck -check-prefix=OVERLOADS_11 %s +// RUN: %complete-test -group=overloads -tok=D_INSTANCE_0 %s | %FileCheck -check-prefix=OVERLOADS_ALL %s +// RUN: %complete-test -group=overloads -tok=D_INSTANCE_0 %s -limit=1 | %FileCheck -check-prefix=OVERLOADS_1 %s +// RUN: %complete-test -group=overloads -tok=D_INSTANCE_0 %s -start=1 -limit=1 | %FileCheck -check-prefix=OVERLOADS_11 %s func test003(x: D) { x.#^D_INSTANCE_0^# @@ -119,14 +119,14 @@ func test003(x: D) { } // If we return all the results, nextrequeststart == 0 -// RUN: %complete-test -group=overloads -tok=D_INSTANCE_0 %s -raw | FileCheck -check-prefix=NEXT-END %s -// RUN: %complete-test -group=overloads -tok=D_INSTANCE_0 %s -raw -limit=5 | FileCheck -check-prefix=NEXT-END %s -// RUN: %complete-test -group=overloads -tok=D_INSTANCE_0 %s -raw -limit=2 | FileCheck -check-prefix=NEXT-END %s +// RUN: %complete-test -group=overloads -tok=D_INSTANCE_0 %s -raw | %FileCheck -check-prefix=NEXT-END %s +// RUN: %complete-test -group=overloads -tok=D_INSTANCE_0 %s -raw -limit=5 | %FileCheck -check-prefix=NEXT-END %s +// RUN: %complete-test -group=overloads -tok=D_INSTANCE_0 %s -raw -limit=2 | %FileCheck -check-prefix=NEXT-END %s // NEXT-END: key.nextrequeststart: 0 // If we return the last result, nextrequeststart == 0 -// RUN: %complete-test -group=overloads -tok=D_INSTANCE_0 %s -raw -start=1 -limit=1 | FileCheck -check-prefix=NEXT-END %s +// RUN: %complete-test -group=overloads -tok=D_INSTANCE_0 %s -raw -start=1 -limit=1 | %FileCheck -check-prefix=NEXT-END %s // Otherwise, it's the next result -// RUN: %complete-test -group=overloads -tok=D_INSTANCE_0 %s -raw -limit=1 | FileCheck -check-prefix=NEXT1 %s +// RUN: %complete-test -group=overloads -tok=D_INSTANCE_0 %s -raw -limit=1 | %FileCheck -check-prefix=NEXT1 %s // NEXT1: key.nextrequeststart: 1 diff --git a/test/SourceKit/CodeComplete/complete_sort_order.swift b/test/SourceKit/CodeComplete/complete_sort_order.swift index 284e0da31fcfe..5ffd80dbd1b51 100644 --- a/test/SourceKit/CodeComplete/complete_sort_order.swift +++ b/test/SourceKit/CodeComplete/complete_sort_order.swift @@ -9,7 +9,7 @@ func test() { // XFAIL: broken_std_regex // RUN: %sourcekitd-test -req=complete -req-opts=hidelowpriority=0 -pos=7:1 %s -- %s > %t.orig -// RUN: FileCheck -check-prefix=NAME %s < %t.orig +// RUN: %FileCheck -check-prefix=NAME %s < %t.orig // Make sure the order is as below, foo(Int) should come before foo(String). // NAME: key.description: "#column" @@ -25,11 +25,11 @@ func test() { // RUN: %sourcekitd-test -req=complete.open -pos=7:1 -req-opts=hidelowpriority=0,hideunderscores=0 %s -- %s > %t.default // RUN: %sourcekitd-test -req=complete.open -pos=7:1 -req-opts=sort.byname=0,hidelowpriority=0,hideunderscores=0 %s -- %s > %t.on // RUN: %sourcekitd-test -req=complete.open -pos=7:1 -req-opts=sort.byname=1,hidelowpriority=0,hideunderscores=0 %s -- %s > %t.off -// RUN: FileCheck -check-prefix=CONTEXT %s < %t.default -// RUN: FileCheck -check-prefix=NAME %s < %t.off +// RUN: %FileCheck -check-prefix=CONTEXT %s < %t.default +// RUN: %FileCheck -check-prefix=NAME %s < %t.off // FIXME: rdar://problem/20109989 non-deterministic sort order // RUN-disabled: diff %t.on %t.default -// RUN: FileCheck -check-prefix=CONTEXT %s < %t.on +// RUN: %FileCheck -check-prefix=CONTEXT %s < %t.on // CONTEXT: key.kind: source.lang.swift.decl // CONTEXT-NEXT: key.name: "x" @@ -44,7 +44,7 @@ func test() { // CONTEXT: key.name: "#column" // CONTEXT: key.name: "AbsoluteValuable" -// RUN: %complete-test -tok=STMT_0 %s | FileCheck %s -check-prefix=STMT +// RUN: %complete-test -tok=STMT_0 %s | %FileCheck %s -check-prefix=STMT func test1() { #^STMT_0^# } @@ -57,7 +57,7 @@ func test1() { // STMT: func // STMT: foo(a: Int) -// RUN: %complete-test -tok=STMT_1 %s | FileCheck %s -check-prefix=STMT_1 +// RUN: %complete-test -tok=STMT_1 %s | %FileCheck %s -check-prefix=STMT_1 func test5() { var retLocal: Int #^STMT_1,r,ret,retur,return^# @@ -80,7 +80,7 @@ func test5() { // STMT_1-NEXT: return // STMT_1: ] -// RUN: %complete-test -top=0 -tok=EXPR_0 %s | FileCheck %s -check-prefix=EXPR +// RUN: %complete-test -top=0 -tok=EXPR_0 %s | %FileCheck %s -check-prefix=EXPR func test2() { (#^EXPR_0^#) } @@ -97,7 +97,7 @@ func test2() { // EXPR: foo(a: Int) // Top 1 -// RUN: %complete-test -top=1 -tok=EXPR_1 %s | FileCheck %s -check-prefix=EXPR_TOP_1 +// RUN: %complete-test -top=1 -tok=EXPR_1 %s | %FileCheck %s -check-prefix=EXPR_TOP_1 func test3(x: Int) { let y = x let z = x @@ -120,7 +120,7 @@ func test3(x: Int) { // EXPR_TOP_1: zzz // Test where there are fewer results than 'top'. -// RUN: %complete-test -top=1000 -tok=FEW_1 %s | FileCheck %s -check-prefix=FEW_1 +// RUN: %complete-test -top=1000 -tok=FEW_1 %s | %FileCheck %s -check-prefix=FEW_1 func test3b() -> Int { return #^FEW_1^# } @@ -129,7 +129,7 @@ func test3b() -> Int { // FEW_1: 0 // Top 3 -// RUN: %complete-test -top=3 -tok=EXPR_2 %s | FileCheck %s -check-prefix=EXPR_TOP_3 +// RUN: %complete-test -top=3 -tok=EXPR_2 %s | %FileCheck %s -check-prefix=EXPR_TOP_3 func test4(x: Int) { let y = x let z = x @@ -152,7 +152,7 @@ func test4(x: Int) { // EXPR_TOP_3: zzz // Top 3 with type matching -// RUN: %complete-test -top=3 -tok=EXPR_3 %s | FileCheck %s -check-prefix=EXPR_TOP_3_TYPE_MATCH +// RUN: %complete-test -top=3 -tok=EXPR_3 %s | %FileCheck %s -check-prefix=EXPR_TOP_3_TYPE_MATCH func test4(x: Int) { let y: String = "" let z: String = y @@ -165,8 +165,8 @@ func test4(x: Int) { // EXPR_TOP_3_TYPE_MATCH: y // EXPR_TOP_3_TYPE_MATCH: z -// RUN: %complete-test -tok=VOID_1 %s | FileCheck %s -check-prefix=VOID_1 -// RUN: %complete-test -tok=VOID_1 %s -raw | FileCheck %s -check-prefix=VOID_1_RAW +// RUN: %complete-test -tok=VOID_1 %s | %FileCheck %s -check-prefix=VOID_1 +// RUN: %complete-test -tok=VOID_1 %s -raw | %FileCheck %s -check-prefix=VOID_1_RAW func test6() { func foo1() {} func foo2() -> Int {} @@ -197,7 +197,7 @@ func test6() { -// RUN: %complete-test -tok=CASE_0 %s | FileCheck %s -check-prefix=CASE_0 +// RUN: %complete-test -tok=CASE_0 %s | %FileCheck %s -check-prefix=CASE_0 func test7() { struct CaseSensitiveCheck { var member: Int = 0 diff --git a/test/SourceKit/CodeComplete/complete_stems.swift b/test/SourceKit/CodeComplete/complete_stems.swift index 06e12a803a290..fc5fbb301bece 100644 --- a/test/SourceKit/CodeComplete/complete_stems.swift +++ b/test/SourceKit/CodeComplete/complete_stems.swift @@ -20,7 +20,7 @@ func HIJZ() {} func test001() { #^GLOBAL_FUNC_0,a,aaaC,abc,def,hij^# } -// RUN: %complete-test %s -no-fuzz -group=stems -tok=GLOBAL_FUNC_0 | FileCheck %s -check-prefix=GLOBAL_FUNC_0 +// RUN: %complete-test %s -no-fuzz -group=stems -tok=GLOBAL_FUNC_0 | %FileCheck %s -check-prefix=GLOBAL_FUNC_0 // GLOBAL_FUNC_0-LABEL: Results for filterText: a [ // GLOBAL_FUNC_0-NEXT: aaa: // GLOBAL_FUNC_0-NEXT: aaaBbb() @@ -91,7 +91,7 @@ struct S { func test002(x: S) { x.#^S_QUALIFIED_0^# } -// RUN: %complete-test %s -no-fuzz -group=stems -tok=S_QUALIFIED_0 | FileCheck %s -check-prefix=S_QUALIFIED_0 +// RUN: %complete-test %s -no-fuzz -group=stems -tok=S_QUALIFIED_0 | %FileCheck %s -check-prefix=S_QUALIFIED_0 // S_QUALIFIED_0: aaa: // S_QUALIFIED_0-NEXT: aaaBbb() // S_QUALIFIED_0-NEXT: aaaCcc: @@ -127,7 +127,7 @@ struct T { subscript(x_y x: Int) -> Int {} subscript(x_y_z x: Int) -> Int {} } -// RUN: %complete-test %s -no-fuzz -add-inner-results -no-inner-operators -group=stems -tok=T_POSTFIX_0 | FileCheck %s -check-prefix=T_POSTFIX_0 +// RUN: %complete-test %s -no-fuzz -add-inner-results -no-inner-operators -group=stems -tok=T_POSTFIX_0 | %FileCheck %s -check-prefix=T_POSTFIX_0 func test003() { T#^T_POSTFIX_0^# } @@ -140,7 +140,7 @@ func test003() { // T_POSTFIX_0-NEXT: (abcDefGhi: Int) // T_POSTFIX_0-NEXT: foo(self: T) -// RUN: %complete-test %s -no-fuzz -add-inner-results -no-inner-operators -group=stems -tok=T_POSTFIX_1 | FileCheck %s -check-prefix=T_POSTFIX_1 +// RUN: %complete-test %s -no-fuzz -add-inner-results -no-inner-operators -group=stems -tok=T_POSTFIX_1 | %FileCheck %s -check-prefix=T_POSTFIX_1 func test004(x: T) { x#^T_POSTFIX_1^# } @@ -159,7 +159,7 @@ struct MyAnyGenerator {} struct MyAnyGenerationalGarbageCollector {} // There is only one Any group rdar://problem/21550130 -// RUN: %complete-test %s -no-fuzz -group=stems -tok=GLOBAL_FUNC_1 | FileCheck %s -check-prefix=GLOBAL_FUNC_1 +// RUN: %complete-test %s -no-fuzz -group=stems -tok=GLOBAL_FUNC_1 | %FileCheck %s -check-prefix=GLOBAL_FUNC_1 func test005() { #^GLOBAL_FUNC_1,my^# } diff --git a/test/SourceKit/CodeComplete/complete_structure.swift b/test/SourceKit/CodeComplete/complete_structure.swift index d29a439785dd6..e3aa463b81159 100644 --- a/test/SourceKit/CodeComplete/complete_structure.swift +++ b/test/SourceKit/CodeComplete/complete_structure.swift @@ -1,14 +1,14 @@ // XFAIL: broken_std_regex -// RUN: %complete-test %s -group=none -fuzz -structure -tok=S1_DOT | FileCheck %s -check-prefix=S1_DOT -// RUN: %complete-test %s -group=none -add-inner-results -fuzz -structure -tok=S1_POSTFIX | FileCheck %s -check-prefix=S1_POSTFIX -// RUN: %complete-test %s -group=none -add-inner-results -fuzz -structure -tok=S1_POSTFIX_INIT | FileCheck %s -check-prefix=S1_INIT -// RUN: %complete-test %s -group=none -fuzz -structure -tok=S1_PAREN_INIT | FileCheck %s -check-prefix=S1_INIT -// RUN: %complete-test %s -group=none -hide-none -fuzz -structure -tok=STMT_0 | FileCheck %s -check-prefix=STMT_0 -// RUN: %complete-test %s -group=none -fuzz -structure -tok=ENUM_0 | FileCheck %s -check-prefix=ENUM_0 -// RUN: %complete-test %s -group=none -fuzz -structure -tok=OVERRIDE_0 | FileCheck %s -check-prefix=OVERRIDE_0 -// RUN: %complete-test %s -group=none -fuzz -structure -tok=S1_INNER_0 | FileCheck %s -check-prefix=S1_INNER_0 -// RUN: %complete-test %s -group=none -fuzz -structure -tok=INT_INNER_0 | FileCheck %s -check-prefix=INT_INNER_0 -// RUN: %complete-test %s -group=none -fuzz -structure -tok=ASSOCIATED_TYPE_1 | FileCheck %s -check-prefix=ASSOCIATED_TYPE_1 +// RUN: %complete-test %s -group=none -fuzz -structure -tok=S1_DOT | %FileCheck %s -check-prefix=S1_DOT +// RUN: %complete-test %s -group=none -add-inner-results -fuzz -structure -tok=S1_POSTFIX | %FileCheck %s -check-prefix=S1_POSTFIX +// RUN: %complete-test %s -group=none -add-inner-results -fuzz -structure -tok=S1_POSTFIX_INIT | %FileCheck %s -check-prefix=S1_INIT +// RUN: %complete-test %s -group=none -fuzz -structure -tok=S1_PAREN_INIT | %FileCheck %s -check-prefix=S1_INIT +// RUN: %complete-test %s -group=none -hide-none -fuzz -structure -tok=STMT_0 | %FileCheck %s -check-prefix=STMT_0 +// RUN: %complete-test %s -group=none -fuzz -structure -tok=ENUM_0 | %FileCheck %s -check-prefix=ENUM_0 +// RUN: %complete-test %s -group=none -fuzz -structure -tok=OVERRIDE_0 | %FileCheck %s -check-prefix=OVERRIDE_0 +// RUN: %complete-test %s -group=none -fuzz -structure -tok=S1_INNER_0 | %FileCheck %s -check-prefix=S1_INNER_0 +// RUN: %complete-test %s -group=none -fuzz -structure -tok=INT_INNER_0 | %FileCheck %s -check-prefix=INT_INNER_0 +// RUN: %complete-test %s -group=none -fuzz -structure -tok=ASSOCIATED_TYPE_1 | %FileCheck %s -check-prefix=ASSOCIATED_TYPE_1 struct S1 { func method1() {} diff --git a/test/SourceKit/CodeComplete/complete_test.swift b/test/SourceKit/CodeComplete/complete_test.swift index 51a43fab331d8..d28999a7cbbfb 100644 --- a/test/SourceKit/CodeComplete/complete_test.swift +++ b/test/SourceKit/CodeComplete/complete_test.swift @@ -1,15 +1,15 @@ -// RUN: not %complete-test 2>&1 | FileCheck -check-prefix=MISSING-ALL %s +// RUN: not %complete-test 2>&1 | %FileCheck -check-prefix=MISSING-ALL %s // MISSING-ALL: usage: complete-test -tok=A file // MISSING-ALL: missing -// RUN: not %complete-test %s 2>&1 | FileCheck -check-prefix=MISSING-TOK %s +// RUN: not %complete-test %s 2>&1 | %FileCheck -check-prefix=MISSING-TOK %s // MISSING-TOK: missing -tok= -// RUN: not %complete-test -tok=NOPE %s 2>&1 | FileCheck -check-prefix=MISSING-TOK-IN %s +// RUN: not %complete-test -tok=NOPE %s 2>&1 | %FileCheck -check-prefix=MISSING-TOK-IN %s // MISSING-TOK-IN: cannot find code completion token in source file -// RUN: %complete-test -tok=INT_DOT %s | FileCheck -check-prefix=INT_DOT %s -strict-whitespace -// RUN: %complete-test -tok=ALL %s | FileCheck -check-prefix=ALL %s +// RUN: %complete-test -tok=INT_DOT %s | %FileCheck -check-prefix=INT_DOT %s -strict-whitespace +// RUN: %complete-test -tok=ALL %s | %FileCheck -check-prefix=ALL %s // RUN: %complete-test -tok=DIFF -raw %s > %t.complete-test // RUN: %sourcekitd-test -req=complete.open -pos=49:5 %s -- %s > %t.sourcekitd-test // RUN: diff %t.complete-test %t.sourcekitd-test diff --git a/test/SourceKit/CodeComplete/complete_type_match.swift b/test/SourceKit/CodeComplete/complete_type_match.swift index 8c3a3a5083a08..09d3ff945bc20 100644 --- a/test/SourceKit/CodeComplete/complete_type_match.swift +++ b/test/SourceKit/CodeComplete/complete_type_match.swift @@ -1,10 +1,10 @@ // XFAIL: broken_std_regex -// RUN: %complete-test -top=0 -tok=TOP_LEVEL_0 %s | FileCheck %s -check-prefix=TOP_LEVEL_0 -// RUN: %complete-test -top=0 -tok=TOP_LEVEL_1 %s | FileCheck %s -check-prefix=TOP_LEVEL_1 -// RUN: %complete-test -top=0 -tok=TOP_LEVEL_2 %s | FileCheck %s -check-prefix=TOP_LEVEL_2 -// RUN: %complete-test -top=0 -tok=TOP_LEVEL_3 %s | FileCheck %s -check-prefix=TOP_LEVEL_3 -// RUN: %complete-test -top=0 -group=none -tok=CROSS_CONTEXT_0 %s | FileCheck %s -check-prefix=CROSS_CONTEXT_0 -// RUN: %complete-test -top=0 -group=none -tok=FROM_METHOD_0 %s | FileCheck %s -check-prefix=FROM_METHOD_0 +// RUN: %complete-test -top=0 -tok=TOP_LEVEL_0 %s | %FileCheck %s -check-prefix=TOP_LEVEL_0 +// RUN: %complete-test -top=0 -tok=TOP_LEVEL_1 %s | %FileCheck %s -check-prefix=TOP_LEVEL_1 +// RUN: %complete-test -top=0 -tok=TOP_LEVEL_2 %s | %FileCheck %s -check-prefix=TOP_LEVEL_2 +// RUN: %complete-test -top=0 -tok=TOP_LEVEL_3 %s | %FileCheck %s -check-prefix=TOP_LEVEL_3 +// RUN: %complete-test -top=0 -group=none -tok=CROSS_CONTEXT_0 %s | %FileCheck %s -check-prefix=CROSS_CONTEXT_0 +// RUN: %complete-test -top=0 -group=none -tok=FROM_METHOD_0 %s | %FileCheck %s -check-prefix=FROM_METHOD_0 let valueA = [0] let valueS = "" diff --git a/test/SourceKit/CodeComplete/complete_typealias_different_file.swift b/test/SourceKit/CodeComplete/complete_typealias_different_file.swift index ec235e939fcee..72169621af7d4 100644 --- a/test/SourceKit/CodeComplete/complete_typealias_different_file.swift +++ b/test/SourceKit/CodeComplete/complete_typealias_different_file.swift @@ -5,5 +5,5 @@ extension JSValue { } -// RUN: %sourcekitd-test -req=complete -pos=6:1 %s -- %s %S/Inputs/complete_typealias_different_file_2.swift | FileCheck %s +// RUN: %sourcekitd-test -req=complete -pos=6:1 %s -- %s %S/Inputs/complete_typealias_different_file_2.swift | %FileCheck %s // CHECK: "Foo" diff --git a/test/SourceKit/CodeComplete/complete_underscores.swift b/test/SourceKit/CodeComplete/complete_underscores.swift index 899e170eb9a1d..0db0975f1b057 100644 --- a/test/SourceKit/CodeComplete/complete_underscores.swift +++ b/test/SourceKit/CodeComplete/complete_underscores.swift @@ -33,7 +33,7 @@ func test001() { #^TOP_LEVEL_0,,_^# } // REQUIRES: objc_interop -// RUN: %complete-test %s -hide-none -tok=TOP_LEVEL_0 -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=TOP_LEVEL_0 +// RUN: %complete-test %s -hide-none -tok=TOP_LEVEL_0 -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=TOP_LEVEL_0 // TOP_LEVEL_0-LABEL: Results for filterText: [ // TOP_LEVEL_0-DAG: Foo // TOP_LEVEL_0-DAG: FooStruct @@ -48,7 +48,7 @@ func test001() { // TOP_LEVEL_0-DAG: _internalTopLevelFunc() // TOP_LEVEL_0-DAG: _InternalStruct // TOP_LEVEL_0: ] -// RUN: %complete-test %s -hide-none -tok=TOP_LEVEL_0 -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=NEGATIVE_TOP_LEVEL_0 +// RUN: %complete-test %s -hide-none -tok=TOP_LEVEL_0 -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=NEGATIVE_TOP_LEVEL_0 // NEGATIVE_TOP_LEVEL_0-LABEL: Results for filterText: [ // NEGATIVE_TOP_LEVEL_0-NOT: _internalTopLevelFunc() // NEGATIVE_TOP_LEVEL_0-NOT: _InternalStruct @@ -57,7 +57,7 @@ func test001() { func test002(x: Foo) { x.#^FOO_QUALIFIED_0,,^# } -// RUN: %complete-test %s -tok=FOO_QUALIFIED_0 -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=FOO_QUALIFIED_0 +// RUN: %complete-test %s -tok=FOO_QUALIFIED_0 -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=FOO_QUALIFIED_0 // FOO_QUALIFIED_0: Results for filterText: [ // FOO_QUALIFIED_0-DAG: foo() // FOO_QUALIFIED_0-DAG: extFoo() @@ -68,7 +68,7 @@ func test002(x: Foo) { func test003(x: _Bar) { x.#^BAR_QUALIFIED_0,,_^# } -// RUN: %complete-test %s -tok=BAR_QUALIFIED_0 -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=BAR_QUALIFIED_0 +// RUN: %complete-test %s -tok=BAR_QUALIFIED_0 -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=BAR_QUALIFIED_0 // BAR_QUALIFIED_0: Results for filterText: [ // BAR_QUALIFIED_0-DAG: bar() // BAR_QUALIFIED_0-DAG: _bar() @@ -80,7 +80,7 @@ func test003(x: _Bar) { // BAR_QUALIFIED_0-DAG: _foo() // BAR_QUALIFIED_0-DAG: _extFoo() // BAR_QUALIFIED_0: ] -// RUN: %complete-test %s -tok=BAR_QUALIFIED_0 -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=NEGATIVE_BAR_QUALIFIED_0 +// RUN: %complete-test %s -tok=BAR_QUALIFIED_0 -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=NEGATIVE_BAR_QUALIFIED_0 // NEGATIVE_BAR_QUALIFIED_0: Results for filterText: [ // NEGATIVE_BAR_QUALIFIED_0-NOT: _foo() // NEGATIVE_BAR_QUALIFIED_0-NOT: _extFoo() @@ -89,7 +89,7 @@ func test003(x: _Bar) { func test004(x: Baz) { x.#^BAZ_QUALIFIED_0,,^# } -// RUN: %complete-test %s -tok=BAZ_QUALIFIED_0 -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=BAZ_QUALIFIED_0 +// RUN: %complete-test %s -tok=BAZ_QUALIFIED_0 -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=BAZ_QUALIFIED_0 // BAZ_QUALIFIED_0: Results for filterText: [ // BAZ_QUALIFIED_0-DAG: baz() // BAZ_QUALIFIED_0-DAG: _baz() @@ -98,11 +98,11 @@ func test004(x: Baz) { func test005(x: SBaz) { x.#^BAZ_QUALIFIED_1,,^# } -// RUN: %complete-test %s -tok=BAZ_QUALIFIED_1 -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=BAZ_QUALIFIED_1 +// RUN: %complete-test %s -tok=BAZ_QUALIFIED_1 -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=BAZ_QUALIFIED_1 // BAZ_QUALIFIED_1: Results for filterText: [ // BAZ_QUALIFIED_1-DAG: baz() // BAZ_QUALIFIED_1: ] -// RUN: %complete-test %s -tok=BAZ_QUALIFIED_1 -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=NEGATIVE_BAZ_QUALIFIED_1 +// RUN: %complete-test %s -tok=BAZ_QUALIFIED_1 -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=NEGATIVE_BAZ_QUALIFIED_1 // NEGATIVE_BAZ_QUALIFIED_1: Results for filterText: [ // NEGATIVE_BAZ_QUALIFIED_1-NOT: _baz() // NEGATIVE_BAZ_QUALIFIED_1: ] @@ -110,7 +110,7 @@ func test005(x: SBaz) { func test006() { Norf.#^NORF_QUALIFIED_0,,^# } -// RUN: %complete-test %s -tok=NORF_QUALIFIED_0 -hide-low-priority=0 -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=NORF_QUALIFIED_0 +// RUN: %complete-test %s -tok=NORF_QUALIFIED_0 -hide-low-priority=0 -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=NORF_QUALIFIED_0 // NORF_QUALIFIED_0: Results for filterText: [ // NORF_QUALIFIED_0-DAG: _A // NORF_QUALIFIED_0-DAG: B @@ -120,13 +120,13 @@ func test006() { func test007() { #^NO_UNDERSCORES^# } -// RUN: %complete-test %s -tok=NO_UNDERSCORES -hide-low-priority=0 -hide-underscores=2 -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=NO_UNDERSCORES +// RUN: %complete-test %s -tok=NO_UNDERSCORES -hide-low-priority=0 -hide-underscores=2 -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=NO_UNDERSCORES // NO_UNDERSCORES-NOT: {{^\s*}}_ func test010() { #^ALL_UNDERSCORES^# } -// RUN: %complete-test %s -tok=ALL_UNDERSCORES -hide-low-priority=0 -hide-underscores=0 -- -F %S/../Inputs/libIDE-mock-sdk | FileCheck %s -check-prefix=ALL_UNDERSCORES +// RUN: %complete-test %s -tok=ALL_UNDERSCORES -hide-low-priority=0 -hide-underscores=0 -- -F %S/../Inputs/libIDE-mock-sdk | %FileCheck %s -check-prefix=ALL_UNDERSCORES // ALL_UNDERSCORES: _Bar // ALL_UNDERSCORES: _quux // ALL_UNDERSCORES: _InternalStruct diff --git a/test/SourceKit/CodeComplete/complete_update.swift b/test/SourceKit/CodeComplete/complete_update.swift index 01e81841144c3..ebcfd5fa31331 100644 --- a/test/SourceKit/CodeComplete/complete_update.swift +++ b/test/SourceKit/CodeComplete/complete_update.swift @@ -13,7 +13,7 @@ func foo() { // RUN: %sourcekitd-test -req=complete.open -pos=8:5 %s -- %s \ // RUN: == -req=complete.update -pos=8:5 %s -- %s \ // RUN: == -req=complete.update -pos=8:5 %s -- %s > %t.update -// RUN: FileCheck %s < %t.update +// RUN: %FileCheck %s < %t.update // CHECK: key.name: "advancedFeatures // CHECK: key.kind: source.lang.swift.codecomplete.group // CHECK: key.name: "advancedFeatures @@ -38,7 +38,7 @@ func test(x: X) { // RUN: %sourcekitd-test -req=complete.open -pos=34:5 -req-opts=group.stems=0,group.overloads=0 %s -- %s \ // RUN: == -req=complete.update -pos=34:5 -req-opts=group.stems=1 %s -- %s \ // RUN: == -req=complete.update -pos=34:5 -req-opts=group.stems=0,group.overloads=0 %s -- %s > %t.update.groupings -// RUN: FileCheck %s -check-prefix=ONE_GROUP < %t.update.groupings +// RUN: %FileCheck %s -check-prefix=ONE_GROUP < %t.update.groupings // ONE_GROUP-NOT: key.name: "aaa" // ONE_GROUP: key.kind: source.lang.swift.codecomplete.group, // ONE_GROUP-NEXT: key.name: "" diff --git a/test/SourceKit/CodeComplete/complete_with_closure_param.swift b/test/SourceKit/CodeComplete/complete_with_closure_param.swift index 4e7c151767f85..ae1c25256de6d 100644 --- a/test/SourceKit/CodeComplete/complete_with_closure_param.swift +++ b/test/SourceKit/CodeComplete/complete_with_closure_param.swift @@ -6,7 +6,7 @@ class C { C(). -// RUN: %sourcekitd-test -req=complete -pos=7:5 %s -- %s | FileCheck %s +// RUN: %sourcekitd-test -req=complete -pos=7:5 %s -- %s | %FileCheck %s // CHECK: key.kind: source.lang.swift.decl.function.method.instance, // CHECK-NEXT: key.name: "foo(:)", diff --git a/test/SourceKit/CodeExpand/code-expand.swift b/test/SourceKit/CodeExpand/code-expand.swift index d0ee80940adc4..a3f229ca344e0 100644 --- a/test/SourceKit/CodeExpand/code-expand.swift +++ b/test/SourceKit/CodeExpand/code-expand.swift @@ -1,4 +1,4 @@ -// RUN: %sourcekitd-test -req=expand-placeholder %s | FileCheck %s +// RUN: %sourcekitd-test -req=expand-placeholder %s | %FileCheck %s foo(x: <#T##() -> Void#>) // CHECK: foo { diff --git a/test/SourceKit/CodeFormat/indent-basic.swift b/test/SourceKit/CodeFormat/indent-basic.swift index b926ded9f2876..85cfe28380c77 100644 --- a/test/SourceKit/CodeFormat/indent-basic.swift +++ b/test/SourceKit/CodeFormat/indent-basic.swift @@ -28,7 +28,7 @@ x // RUN: %sourcekitd-test -req=format -line=9 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=13 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=17 -length=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: "class Foo {" // CHECK: key.sourcetext: " " diff --git a/test/SourceKit/CodeFormat/indent-bracestmt.swift b/test/SourceKit/CodeFormat/indent-bracestmt.swift index 63da271f54fce..74c8d85d28f4a 100644 --- a/test/SourceKit/CodeFormat/indent-bracestmt.swift +++ b/test/SourceKit/CodeFormat/indent-bracestmt.swift @@ -28,7 +28,7 @@ func Foo1() { // RUN: %sourcekitd-test -req=format -line=9 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=16 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=22 -length=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: " if xyz == 2 {" // CHECK: key.sourcetext: " xyz = 1" diff --git a/test/SourceKit/CodeFormat/indent-bracestmt2.swift b/test/SourceKit/CodeFormat/indent-bracestmt2.swift index b204886156bcc..98296ac80ebb6 100644 --- a/test/SourceKit/CodeFormat/indent-bracestmt2.swift +++ b/test/SourceKit/CodeFormat/indent-bracestmt2.swift @@ -17,7 +17,7 @@ class Foo // RUN: %sourcekitd-test -req=format -line=7 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=8 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=9 -length=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: "class Foo" // CHECK: key.sourcetext: "{" diff --git a/test/SourceKit/CodeFormat/indent-bracestmt3-if-else.swift b/test/SourceKit/CodeFormat/indent-bracestmt3-if-else.swift index 040a1830f2890..6b26f8c81e698 100644 --- a/test/SourceKit/CodeFormat/indent-bracestmt3-if-else.swift +++ b/test/SourceKit/CodeFormat/indent-bracestmt3-if-else.swift @@ -27,7 +27,7 @@ private func baz() -> Int { return 2 } // RUN: %sourcekitd-test -req=format -line=14 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=15 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=16 -length=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: " if abc == 1 {" // CHECK: key.sourcetext: " abc = 2" diff --git a/test/SourceKit/CodeFormat/indent-closure.swift b/test/SourceKit/CodeFormat/indent-closure.swift index 87710b8afe92d..e3b91170d25f4 100644 --- a/test/SourceKit/CodeFormat/indent-closure.swift +++ b/test/SourceKit/CodeFormat/indent-closure.swift @@ -46,7 +46,7 @@ func foo4() { // RUN: %sourcekitd-test -req=format -line=30 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=31 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=32 -length=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: " var abc = 1" // CHECK: key.sourcetext: " let a: String = {" diff --git a/test/SourceKit/CodeFormat/indent-comment.swift b/test/SourceKit/CodeFormat/indent-comment.swift index 5f2c67ff8c28f..e272edb949625 100644 --- a/test/SourceKit/CodeFormat/indent-comment.swift +++ b/test/SourceKit/CodeFormat/indent-comment.swift @@ -21,7 +21,7 @@ class Foo {} // RUN: %sourcekitd-test -req=format -line=12 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=38 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=39 -length=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: "/**" // CHECK: key.sourcetext: " * Foo Comment" diff --git a/test/SourceKit/CodeFormat/indent-computed-property.swift b/test/SourceKit/CodeFormat/indent-computed-property.swift index 4614d6afa7656..27e3332b4d209 100644 --- a/test/SourceKit/CodeFormat/indent-computed-property.swift +++ b/test/SourceKit/CodeFormat/indent-computed-property.swift @@ -47,7 +47,7 @@ print() // RUN: %sourcekitd-test -req=format -line=16 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=21 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=30 -length=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: "class Foo {" // CHECK: key.sourcetext: " var test: Int {" diff --git a/test/SourceKit/CodeFormat/indent-do-catch.swift b/test/SourceKit/CodeFormat/indent-do-catch.swift index 679d577669052..5fca56c94fea0 100644 --- a/test/SourceKit/CodeFormat/indent-do-catch.swift +++ b/test/SourceKit/CodeFormat/indent-do-catch.swift @@ -31,7 +31,7 @@ func foo() { // RUN: %sourcekitd-test -req=format -line=14 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=15 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=16 -length=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: " do {" // CHECK: key.sourcetext: " foo()" diff --git a/test/SourceKit/CodeFormat/indent-extension.swift b/test/SourceKit/CodeFormat/indent-extension.swift index d7bd774f08888..75ac3cf34772d 100644 --- a/test/SourceKit/CodeFormat/indent-extension.swift +++ b/test/SourceKit/CodeFormat/indent-extension.swift @@ -19,7 +19,7 @@ extension Foo // RUN: %sourcekitd-test -req=format -line=9 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=10 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=11 -length=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: "extension Foo {" // CHECK: key.sourcetext: " " diff --git a/test/SourceKit/CodeFormat/indent-ibaction.swift b/test/SourceKit/CodeFormat/indent-ibaction.swift index c39fbc90ec0b4..4c13bea222650 100644 --- a/test/SourceKit/CodeFormat/indent-ibaction.swift +++ b/test/SourceKit/CodeFormat/indent-ibaction.swift @@ -3,6 +3,6 @@ } // RUN: %sourcekitd-test -req=format -line=2 -length=1 %s >%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: " var xyz : Int" diff --git a/test/SourceKit/CodeFormat/indent-implicit-getter.swift b/test/SourceKit/CodeFormat/indent-implicit-getter.swift index 01389f2275228..548febf2b9686 100644 --- a/test/SourceKit/CodeFormat/indent-implicit-getter.swift +++ b/test/SourceKit/CodeFormat/indent-implicit-getter.swift @@ -47,7 +47,7 @@ class var foo: Int { // RUN: %sourcekitd-test -req=format -line=20 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=23 -length=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: "class Foo {" // CHECK: key.sourcetext: " var test: Int {" diff --git a/test/SourceKit/CodeFormat/indent-lazy-property.swift b/test/SourceKit/CodeFormat/indent-lazy-property.swift index 1ee43daaa6b2b..8a4e306de4262 100644 --- a/test/SourceKit/CodeFormat/indent-lazy-property.swift +++ b/test/SourceKit/CodeFormat/indent-lazy-property.swift @@ -16,7 +16,7 @@ class Foo2 { // RUN: %sourcekitd-test -req=format -line=4 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=5 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=8 -length=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: "class Foo {" // CHECK: key.sourcetext: " lazy var test: () -> Int = {" diff --git a/test/SourceKit/CodeFormat/indent-parenexpr.swift b/test/SourceKit/CodeFormat/indent-parenexpr.swift index be5f515972c44..8a5dce311f433 100644 --- a/test/SourceKit/CodeFormat/indent-parenexpr.swift +++ b/test/SourceKit/CodeFormat/indent-parenexpr.swift @@ -43,7 +43,7 @@ func foo() { // RUN: %sourcekitd-test -req=format -line=20 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=21 -length=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: " bar(" // CHECK: key.sourcetext: " " diff --git a/test/SourceKit/CodeFormat/indent-pound-if.swift b/test/SourceKit/CodeFormat/indent-pound-if.swift index 79f216695020e..8416f7b7a8507 100644 --- a/test/SourceKit/CodeFormat/indent-pound-if.swift +++ b/test/SourceKit/CodeFormat/indent-pound-if.swift @@ -32,7 +32,7 @@ print(false) // RUN: %sourcekitd-test -req=format -line=16 -length=1 %s -- -target x86_64-apple-macosx10.9 >> %t.response // RUN: %sourcekitd-test -req=format -line=20 -length=1 %s -- -target x86_64-apple-macosx10.9 >> %t.response // RUN: %sourcekitd-test -req=format -line=22 -length=1 %s -- -target x86_64-apple-macosx10.9 >> %t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: "#else" // CHECK: key.sourcetext: " let i = 3" diff --git a/test/SourceKit/CodeFormat/indent-repeat.swift b/test/SourceKit/CodeFormat/indent-repeat.swift index 6c79baf9e3a12..58ca61df39bbb 100644 --- a/test/SourceKit/CodeFormat/indent-repeat.swift +++ b/test/SourceKit/CodeFormat/indent-repeat.swift @@ -8,7 +8,7 @@ foo() // RUN: %sourcekitd-test -req=format -line=2 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=3 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=4 -length=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: "class Foo {" // CHECK: key.sourcetext: " func Bar() {" diff --git a/test/SourceKit/CodeFormat/indent-sibling.swift b/test/SourceKit/CodeFormat/indent-sibling.swift index f56a0ac8ae5f8..1226bcb65f26d 100644 --- a/test/SourceKit/CodeFormat/indent-sibling.swift +++ b/test/SourceKit/CodeFormat/indent-sibling.swift @@ -99,7 +99,7 @@ class Foo2 { // RUN: %sourcekitd-test -req=format -line=65 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=67 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=69 -length=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // " func foo(Value1 : Int," // CHECK: key.sourcetext: " Value2 : Int) {" diff --git a/test/SourceKit/CodeFormat/indent-sibling2.swift b/test/SourceKit/CodeFormat/indent-sibling2.swift index 0a9ec4907db2a..6dbc7e5d8c50e 100644 --- a/test/SourceKit/CodeFormat/indent-sibling2.swift +++ b/test/SourceKit/CodeFormat/indent-sibling2.swift @@ -57,7 +57,7 @@ public func someTestFunc(withArgumentLabel label: String, // RUN: %sourcekitd-test -req=format -line=41 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=42 -length=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // "foo(0," // CHECK: key.sourcetext: " bar: 1," diff --git a/test/SourceKit/CodeFormat/indent-switch.swift b/test/SourceKit/CodeFormat/indent-switch.swift index 7204197f36c1a..3eedfdf64c17b 100644 --- a/test/SourceKit/CodeFormat/indent-switch.swift +++ b/test/SourceKit/CodeFormat/indent-switch.swift @@ -76,7 +76,7 @@ func foo3() { // RUN: %sourcekitd-test -req=format -line=41 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=42 -length=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: " switch (test) {" // CHECK: key.sourcetext: " case 0:" diff --git a/test/SourceKit/CodeFormat/indent-toplevel.swift b/test/SourceKit/CodeFormat/indent-toplevel.swift index b9209b279528e..0fbbcb8ae1e09 100644 --- a/test/SourceKit/CodeFormat/indent-toplevel.swift +++ b/test/SourceKit/CodeFormat/indent-toplevel.swift @@ -3,7 +3,7 @@ for i in 0...5 { // RUN: %sourcekitd-test -req=format -line=1 -length=1 %s >%t.response // RUN: %sourcekitd-test -req=format -line=2 -length=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: "for i in 0...5 {" // CHECK: key.sourcetext: "}" diff --git a/test/SourceKit/CodeFormat/indent-width2.swift b/test/SourceKit/CodeFormat/indent-width2.swift index 9e5dfd17cfe42..2747425a28c49 100644 --- a/test/SourceKit/CodeFormat/indent-width2.swift +++ b/test/SourceKit/CodeFormat/indent-width2.swift @@ -17,7 +17,7 @@ test = 1 // RUN: %sourcekitd-test -req=format -line=7 -length=1 -req-opts=indentwidth=2 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=8 -length=1 -req-opts=indentwidth=2 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=9 -length=1 -req-opts=indentwidth=2 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: "class Foo {" // CHECK: key.sourcetext: " " diff --git a/test/SourceKit/CodeFormat/indent-with-cr.swift b/test/SourceKit/CodeFormat/indent-with-cr.swift index e6daddb2c0f08..b53609e836280 100644 --- a/test/SourceKit/CodeFormat/indent-with-cr.swift +++ b/test/SourceKit/CodeFormat/indent-with-cr.swift @@ -6,7 +6,7 @@ let b = 2 // End line with CR let c = 3 // RUN: %sourcekitd-test -req=format -line=1 -length=1 %s >%t.response // RUN: %sourcekitd-test -req=format -line=2 -length=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=3 -length=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: "let a = 1" // CHECK: key.sourcetext: "let b = 2 // End line with CR" diff --git a/test/SourceKit/CodeFormat/indent-with-tab.swift b/test/SourceKit/CodeFormat/indent-with-tab.swift index 34c6206105360..02ac41a041c1e 100644 --- a/test/SourceKit/CodeFormat/indent-with-tab.swift +++ b/test/SourceKit/CodeFormat/indent-with-tab.swift @@ -17,7 +17,7 @@ var test : Int // RUN: %sourcekitd-test -req=format -line=7 -length=1 -req-opts=usetabs=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=8 -length=1 -req-opts=usetabs=1 %s >>%t.response // RUN: %sourcekitd-test -req=format -line=9 -length=1 -req-opts=usetabs=1 %s >>%t.response -// RUN: FileCheck --strict-whitespace %s <%t.response +// RUN: %FileCheck --strict-whitespace %s <%t.response // CHECK: key.sourcetext: "class Foo {" // CHECK: key.sourcetext: "\t" diff --git a/test/SourceKit/CursorInfo/crash1.swift b/test/SourceKit/CursorInfo/crash1.swift index 2a68975841ced..bcf7d7f3a7d28 100644 --- a/test/SourceKit/CursorInfo/crash1.swift +++ b/test/SourceKit/CursorInfo/crash1.swift @@ -6,8 +6,8 @@ struct Person { } // rdar://24133008 -// RUN: %sourcekitd-test -req=cursor -pos=4:16 %s -- %s | FileCheck %s -check-prefix=CASE1 -// RUN: %sourcekitd-test -req=cursor -pos=4:24 %s -- %s | FileCheck %s -check-prefix=CASE2 +// RUN: %sourcekitd-test -req=cursor -pos=4:16 %s -- %s | %FileCheck %s -check-prefix=CASE1 +// RUN: %sourcekitd-test -req=cursor -pos=4:24 %s -- %s | %FileCheck %s -check-prefix=CASE2 // CASE1: source.lang.swift.ref.var.instance (2:9-2:13) // CASE2: source.lang.swift.ref.var.local (3:10-3:15) diff --git a/test/SourceKit/CursorInfo/cursor_big_array.swift b/test/SourceKit/CursorInfo/cursor_big_array.swift index b34f69ead5601..f893e89450480 100644 --- a/test/SourceKit/CursorInfo/cursor_big_array.swift +++ b/test/SourceKit/CursorInfo/cursor_big_array.swift @@ -1,4 +1,4 @@ -// RUN: %sourcekitd-test -req=cursor -pos=1:10 %S/../Inputs/big_array.swift -- %S/../Inputs/big_array.swift | FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=1:10 %S/../Inputs/big_array.swift -- %S/../Inputs/big_array.swift | %FileCheck %s // CHECK: source.lang.swift.decl.var.global (1:5-1:20) // CHECK: gCubeVertexData // CHECK: s:v9big_array15gCubeVertexDataGSaSf_ diff --git a/test/SourceKit/CursorInfo/cursor_callargs.swift b/test/SourceKit/CursorInfo/cursor_callargs.swift index dcec9a8c27057..d0a91cb2ed70d 100644 --- a/test/SourceKit/CursorInfo/cursor_callargs.swift +++ b/test/SourceKit/CursorInfo/cursor_callargs.swift @@ -6,18 +6,18 @@ class C1 { var c1 = C1(passInt: 0, andThis: 0) c1.meth(0, passFloat: 0) -// RUN: %sourcekitd-test -req=cursor -pos=6:11 %s -- %s | FileCheck -check-prefix=CHECK-CLASS %s +// RUN: %sourcekitd-test -req=cursor -pos=6:11 %s -- %s | %FileCheck -check-prefix=CHECK-CLASS %s // CHECK-CLASS: source.lang.swift.ref.class (2:7-2:9) -// RUN: %sourcekitd-test -req=cursor -pos=6:17 %s -- %s | FileCheck -check-prefix=CHECK-INIT %s -// RUN: %sourcekitd-test -req=cursor -pos=6:31 %s -- %s | FileCheck -check-prefix=CHECK-INIT %s +// RUN: %sourcekitd-test -req=cursor -pos=6:17 %s -- %s | %FileCheck -check-prefix=CHECK-INIT %s +// RUN: %sourcekitd-test -req=cursor -pos=6:31 %s -- %s | %FileCheck -check-prefix=CHECK-INIT %s // CHECK-INIT: source.lang.swift.ref.function.constructor (3:3-3:37) -// RUN: %sourcekitd-test -req=cursor -pos=7:6 %s -- %s | FileCheck -check-prefix=CHECK-METH %s -// RUN: %sourcekitd-test -req=cursor -pos=7:14 %s -- %s | FileCheck -check-prefix=CHECK-METH %s +// RUN: %sourcekitd-test -req=cursor -pos=7:6 %s -- %s | %FileCheck -check-prefix=CHECK-METH %s +// RUN: %sourcekitd-test -req=cursor -pos=7:14 %s -- %s | %FileCheck -check-prefix=CHECK-METH %s // CHECK-METH: source.lang.swift.ref.function.method.instance (4:8-4:40) // Make sure we don't highlight all "meth" occurrences when pointing at "withFloat:". -// RUN: %sourcekitd-test -req=related-idents -pos=7:15 %s -- %s | FileCheck -check-prefix=CHECK-IDS %s +// RUN: %sourcekitd-test -req=related-idents -pos=7:15 %s -- %s | %FileCheck -check-prefix=CHECK-IDS %s // CHECK-IDS: START RANGES // CHECK-IDS-NEXT: END RANGES diff --git a/test/SourceKit/CursorInfo/cursor_forbid_typecheck.swift b/test/SourceKit/CursorInfo/cursor_forbid_typecheck.swift index 49ecbda4f1f06..156514aaee635 100644 --- a/test/SourceKit/CursorInfo/cursor_forbid_typecheck.swift +++ b/test/SourceKit/CursorInfo/cursor_forbid_typecheck.swift @@ -1,13 +1,13 @@ // RUN: %sourcekitd-test -req=cursor -pos=1:10 %S/../Inputs/forbid_typecheck_primary.swift -- \ // RUN: -Xfrontend -debug-forbid-typecheck-prefix -Xfrontend NOTYPECHECK -module-name forbid \ -// RUN: %S/../Inputs/forbid_typecheck_2.swift %S/../Inputs/forbid_typecheck_primary.swift | FileCheck -check-prefix=CHECK1 %s +// RUN: %S/../Inputs/forbid_typecheck_2.swift %S/../Inputs/forbid_typecheck_primary.swift | %FileCheck -check-prefix=CHECK1 %s // CHECK1: source.lang.swift.decl.var.global (1:5-1:15) // CHECK1: globalPrim // RUN: %sourcekitd-test -req=cursor -pos=5:20 %S/../Inputs/forbid_typecheck_primary.swift -- \ // RUN: -Xfrontend -debug-forbid-typecheck-prefix -Xfrontend NOTYPECHECK -module-name forbid \ -// RUN: %S/../Inputs/forbid_typecheck_2.swift %S/../Inputs/forbid_typecheck_primary.swift | FileCheck -check-prefix=CHECK2 %s +// RUN: %S/../Inputs/forbid_typecheck_2.swift %S/../Inputs/forbid_typecheck_primary.swift | %FileCheck -check-prefix=CHECK2 %s // CHECK2: source.lang.swift.ref.var.instance ({{.*}}forbid_typecheck_2.swift:10:7-10:13) // CHECK2: member diff --git a/test/SourceKit/CursorInfo/cursor_generic_enum.swift b/test/SourceKit/CursorInfo/cursor_generic_enum.swift index c7acef16e5cff..ea3bf57a38bac 100644 --- a/test/SourceKit/CursorInfo/cursor_generic_enum.swift +++ b/test/SourceKit/CursorInfo/cursor_generic_enum.swift @@ -1,5 +1,5 @@ // Checks that SourceKit does not crash for enum patterns in generics. -// RUN: %sourcekitd-test -req cursor -pos 18:15 %s -- %s | FileCheck %s +// RUN: %sourcekitd-test -req cursor -pos 18:15 %s -- %s | %FileCheck %s // CHECK: source.lang.swift.ref.enumelement (12:10-12:17) public protocol MyErrorType { diff --git a/test/SourceKit/CursorInfo/cursor_generics.swift b/test/SourceKit/CursorInfo/cursor_generics.swift index ece627bf5f87e..6f10353e9da14 100644 --- a/test/SourceKit/CursorInfo/cursor_generics.swift +++ b/test/SourceKit/CursorInfo/cursor_generics.swift @@ -9,13 +9,13 @@ func someFunc () -> A { fatalError() } -// RUN: %sourcekitd-test -req=cursor -pos=1:10 %s -- %s | FileCheck -check-prefix=CHECK1 %s +// RUN: %sourcekitd-test -req=cursor -pos=1:10 %s -- %s | %FileCheck -check-prefix=CHECK1 %s // CHECK1: func testGenerics<T>(x: T) -// RUN: %sourcekitd-test -req=cursor -pos=5:10 %s -- %s | FileCheck -check-prefix=CHECK2 %s +// RUN: %sourcekitd-test -req=cursor -pos=5:10 %s -- %s | %FileCheck -check-prefix=CHECK2 %s // CHECK2: func testGenericsWithComment<T>(x: T) -// RUN: %sourcekitd-test -req=cursor -pos=8:16 %s -- %s | FileCheck -check-prefix=CHECK3 %s +// RUN: %sourcekitd-test -req=cursor -pos=8:16 %s -- %s | %FileCheck -check-prefix=CHECK3 %s // CHECK3: source.lang.swift.decl.generic_type_param // CHECK3: A diff --git a/test/SourceKit/CursorInfo/cursor_getter.swift b/test/SourceKit/CursorInfo/cursor_getter.swift index dcc7b367a5147..20bfe431908bb 100644 --- a/test/SourceKit/CursorInfo/cursor_getter.swift +++ b/test/SourceKit/CursorInfo/cursor_getter.swift @@ -7,18 +7,18 @@ struct S1 { } // Checks that we don't crash. -// RUN: %sourcekitd-test -req=cursor -pos=1:15 %s -- %s | FileCheck %s -// RUN: %sourcekitd-test -req=cursor -pos=1:17 %s -- %s | FileCheck %s -// RUN: %sourcekitd-test -req=cursor -pos=2:15 %s -- %s | FileCheck %s -// RUN: %sourcekitd-test -req=cursor -pos=2:17 %s -- %s | FileCheck %s -// RUN: %sourcekitd-test -req=cursor -pos=2:21 %s -- %s | FileCheck %s -// RUN: %sourcekitd-test -req=cursor -pos=2:23 %s -- %s | FileCheck %s -// RUN: %sourcekitd-test -req=cursor -pos=3:15 %s -- %s | FileCheck %s -// RUN: %sourcekitd-test -req=cursor -pos=3:17 %s -- %s | FileCheck %s -// RUN: %sourcekitd-test -req=cursor -pos=3:21 %s -- %s | FileCheck %s -// RUN: %sourcekitd-test -req=cursor -pos=3:23 %s -- %s | FileCheck %s -// RUN: %sourcekitd-test -req=cursor -pos=3:37 %s -- %s | FileCheck %s -// RUN: %sourcekitd-test -req=cursor -pos=3:41 %s -- %s | FileCheck %s -// RUN: %sourcekitd-test -req=cursor -pos=6:29 %s -- %s | FileCheck %s -// RUN: %sourcekitd-test -req=cursor -pos=6:31 %s -- %s | FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=1:15 %s -- %s | %FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=1:17 %s -- %s | %FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=2:15 %s -- %s | %FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=2:17 %s -- %s | %FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=2:21 %s -- %s | %FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=2:23 %s -- %s | %FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=3:15 %s -- %s | %FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=3:17 %s -- %s | %FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=3:21 %s -- %s | %FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=3:23 %s -- %s | %FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=3:37 %s -- %s | %FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=3:41 %s -- %s | %FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=6:29 %s -- %s | %FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=6:31 %s -- %s | %FileCheck %s // CHECK: diff --git a/test/SourceKit/CursorInfo/cursor_implicit_init.swift b/test/SourceKit/CursorInfo/cursor_implicit_init.swift index d15edb87f476b..e18167a4c97b8 100644 --- a/test/SourceKit/CursorInfo/cursor_implicit_init.swift +++ b/test/SourceKit/CursorInfo/cursor_implicit_init.swift @@ -11,8 +11,8 @@ func foo() { MySubClass(abc:1) } -// RUN: %sourcekitd-test -req=cursor -pos=10:12 %s -- %s | FileCheck -check-prefix=CHECK1 %s +// RUN: %sourcekitd-test -req=cursor -pos=10:12 %s -- %s | %FileCheck -check-prefix=CHECK1 %s // CHECK1: init(abc: Int) -// RUN: %sourcekitd-test -req=cursor -pos=11:16 %s -- %s | FileCheck -check-prefix=CHECK2 %s +// RUN: %sourcekitd-test -req=cursor -pos=11:16 %s -- %s | %FileCheck -check-prefix=CHECK2 %s // CHECK2: init(abc: Int) diff --git a/test/SourceKit/CursorInfo/cursor_info.swift b/test/SourceKit/CursorInfo/cursor_info.swift index e5098e858c686..9351fdbe92023 100644 --- a/test/SourceKit/CursorInfo/cursor_info.swift +++ b/test/SourceKit/CursorInfo/cursor_info.swift @@ -201,13 +201,13 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // RUN: rm -rf %t.tmp // RUN: mkdir %t.tmp // RUN: %swiftc_driver -emit-module -o %t.tmp/FooSwiftModule.swiftmodule %S/Inputs/FooSwiftModule.swift -// RUN: %sourcekitd-test -req=cursor -pos=9:8 %s -- -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | FileCheck -check-prefix=CHECK1 %s +// RUN: %sourcekitd-test -req=cursor -pos=9:8 %s -- -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | %FileCheck -check-prefix=CHECK1 %s // CHECK1: source.lang.swift.ref.var.global (4:5-4:9) // CHECK1-NEXT: glob // CHECK1-NEXT: s:v11cursor_info4globSi{{$}} // CHECK1-NEXT: Int -// RUN: %sourcekitd-test -req=cursor -pos=9:11 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK2 %s +// RUN: %sourcekitd-test -req=cursor -pos=9:11 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK2 %s // CHECK2: source.lang.swift.ref.function.operator.infix () // CHECK2-NEXT: + // CHECK2-NEXT: s:Fsoi1pFTSiSi_Si @@ -219,7 +219,7 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK2-NEXT: func +(lhs: Int, rhs: Int) -> Int // CHECK2-NEXT: func +(lhs: Int, rhs: Int) -> Int -// RUN: %sourcekitd-test -req=cursor -pos=9:12 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK3 %s +// RUN: %sourcekitd-test -req=cursor -pos=9:12 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK3 %s // CHECK3: source.lang.swift.ref.var.local (8:12-8:13) // CHECK3-NEXT: x{{$}} // CHECK3-NEXT: s:vF11cursor_info3gooFSiT_L_1xSi{{$}} @@ -228,7 +228,7 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK3-NEXT: let x: Int // CHECK3-NEXT: let x: Int -// RUN: %sourcekitd-test -req=cursor -pos=9:18 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK4 %s +// RUN: %sourcekitd-test -req=cursor -pos=9:18 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK4 %s // CHECK4: source.lang.swift.ref.var.global ({{.*}}Foo.framework/Headers/Foo.h:62:12-62:21) // CHECK4-NEXT: fooIntVar{{$}} // CHECK4-NEXT: c:@fooIntVar{{$}} @@ -239,13 +239,13 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK4-NEXT: var fooIntVar: Int32 // CHECK4-NEXT: fooIntVarc:@fooIntVarvar fooIntVar: Int32 Aaa. fooIntVar. Bbb. -// RUN: %sourcekitd-test -req=cursor -pos=8:7 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK5 %s +// RUN: %sourcekitd-test -req=cursor -pos=8:7 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK5 %s // CHECK5: source.lang.swift.decl.function.free (8:6-8:19) // CHECK5-NEXT: goo(_:){{$}} // CHECK5-NEXT: s:F11cursor_info3gooFSiT_{{$}} // CHECK5-NEXT: (Int) -> (){{$}} -// RUN: %sourcekitd-test -req=cursor -pos=9:32 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK6 %s +// RUN: %sourcekitd-test -req=cursor -pos=9:32 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK6 %s // CHECK6: source.lang.swift.ref.function.free () // CHECK6-NEXT: fooSwiftFunc // CHECK6-NEXT: s:F14FooSwiftModule12fooSwiftFuncFT_Si @@ -256,7 +256,7 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK6-NEXT: func fooSwiftFunc() -> Int // CHECK6-NEXT: {{^}}fooSwiftFunc()s:F14FooSwiftModule12fooSwiftFuncFT_Sifunc fooSwiftFunc() -> IntThis is ‘fooSwiftFunc’ from ‘FooSwiftModule’.{{$}} -// RUN: %sourcekitd-test -req=cursor -pos=14:10 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK7 %s +// RUN: %sourcekitd-test -req=cursor -pos=14:10 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK7 %s // CHECK7: source.lang.swift.ref.struct (13:8-13:10) // CHECK7-NEXT: S1 // CHECK7-NEXT: s:V11cursor_info2S1 @@ -266,7 +266,7 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK7-NEXT: struct S1 // CHECK7-NEXT: S1s:V11cursor_info2S1struct S1Aaa. S1. Bbb. -// RUN: %sourcekitd-test -req=cursor -pos=19:12 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK8 %s +// RUN: %sourcekitd-test -req=cursor -pos=19:12 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK8 %s // CHECK8: source.lang.swift.ref.function.constructor (18:3-18:15) // CHECK8-NEXT: init // CHECK8-NEXT: s:FC11cursor_info2CCcFT1xSi_S0_ @@ -276,38 +276,38 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK8-NEXT: convenience init(x: Int) // CHECK8-NEXT: convenience init(x: Int) -// RUN: %sourcekitd-test -req=cursor -pos=23:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK9 %s +// RUN: %sourcekitd-test -req=cursor -pos=23:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK9 %s // CHECK9: source.lang.swift.decl.var.global (23:5-23:15) // CHECK9: var testString: String // CHECK9: var testString: String -// RUN: %sourcekitd-test -req=cursor -pos=24:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK10 %s +// RUN: %sourcekitd-test -req=cursor -pos=24:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK10 %s // CHECK10: source.lang.swift.decl.var.global (24:5-24:18) // CHECK10: let testLetString: String // CHECK10: let testLetString: String -// RUN: %sourcekitd-test -req=cursor -pos=26:20 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK11 %s +// RUN: %sourcekitd-test -req=cursor -pos=26:20 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK11 %s // CHECK11: source.lang.swift.decl.var.parameter (26:19-26:23) // CHECK11: let arg1: Int // CHECK11: let arg1: Int -// RUN: %sourcekitd-test -req=cursor -pos=28:24 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK12 %s +// RUN: %sourcekitd-test -req=cursor -pos=28:24 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK12 %s // CHECK12: source.lang.swift.decl.var.parameter (28:21-28:25) // CHECK12: var arg1: inout Int // CHECK12: var arg1: inout Int -// RUN: %sourcekitd-test -req=cursor -pos=31:7 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK13 %s +// RUN: %sourcekitd-test -req=cursor -pos=31:7 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK13 %s // CHECK13: source.lang.swift.decl.function.free (31:6-31:37) // CHECK13: func testDefaultParam(arg1: Int = default) // CHECK13: func testDefaultParam(arg1: Int = default) -// RUN: %sourcekitd-test -req=cursor -pos=34:4 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK14 %s +// RUN: %sourcekitd-test -req=cursor -pos=34:4 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK14 %s // CHECK14: source.lang.swift.ref.function.free ({{.*}}Foo.framework/Frameworks/FooSub.framework/Headers/FooSub.h:4:5-4:16) // CHECK14: fooSubFunc1 // CHECK14: c:@F@fooSubFunc1 // CHECK14: Foo.FooSub{{$}} -// RUN: %sourcekitd-test -req=cursor -pos=38:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK15 %s +// RUN: %sourcekitd-test -req=cursor -pos=38:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK15 %s // CHECK15: source.lang.swift.decl.function.free (38:6-38:40) // CHECK15: myFunc // CHECK15: func myFunc(arg1: String, options: Int) @@ -316,63 +316,63 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK15-NEXT: myFunc(arg1:) // CHECK15-NEXT: RELATED END -// RUN: %sourcekitd-test -req=cursor -pos=41:26 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK16 %s +// RUN: %sourcekitd-test -req=cursor -pos=41:26 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK16 %s // CHECK16: source.lang.swift.ref.class ({{.*}}Foo.framework/Headers/Foo.h:157:12-157:27) // CHECK16-NEXT: FooClassDerived // CHECK16-NEXT: c:objc(cs)FooClassDerived // CHECK16: class FooClassDerived : FooClassBase, FooProtocolDerived // CHECK16-NEXT: class FooClassDerived : FooClassBase, FooProtocolDerived -// RUN: %sourcekitd-test -req=cursor -pos=1:10 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK17 %s +// RUN: %sourcekitd-test -req=cursor -pos=1:10 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK17 %s // CHECK17: source.lang.swift.ref.module () // CHECK17-NEXT: Foo{{$}} -// RUN: %sourcekitd-test -req=cursor -pos=44:10 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK18 %s +// RUN: %sourcekitd-test -req=cursor -pos=44:10 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK18 %s // CHECK18: source.lang.swift.ref.typealias (43:11-43:16) // CHECK18: typealias MyInt = Int // CHECK18: typealias MyInt = Int -// RUN: %sourcekitd-test -req=cursor -pos=46:10 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK19 %s +// RUN: %sourcekitd-test -req=cursor -pos=46:10 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK19 %s // CHECK19: source.lang.swift.ref.module () // CHECK19-NEXT: FooHelper{{$}} -// RUN: %sourcekitd-test -req=cursor -pos=46:25 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK20 %s +// RUN: %sourcekitd-test -req=cursor -pos=46:25 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK20 %s // CHECK20: source.lang.swift.ref.module () // CHECK20-NEXT: FooHelperSub{{$}} -// RUN: %sourcekitd-test -req=cursor -pos=50:12 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK21 %s +// RUN: %sourcekitd-test -req=cursor -pos=50:12 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK21 %s // CHECK21: source.lang.swift.ref.var.global (44:5-44:6) // CHECK21-NEXT: {{^}}x{{$}} -// RUN: %sourcekitd-test -req=cursor -pos=55:15 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK22 %s +// RUN: %sourcekitd-test -req=cursor -pos=55:15 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK22 %s // CHECK22: func availabilityIntroduced() // CHECK22: func availabilityIntroduced() -// RUN: %sourcekitd-test -req=cursor -pos=56:15 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK23 %s +// RUN: %sourcekitd-test -req=cursor -pos=56:15 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK23 %s // CHECK23-NOT: func swiftUnavailable() // CHECK23-NOT: func swiftUnavailable() -// RUN: %sourcekitd-test -req=cursor -pos=57:15 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK24 %s +// RUN: %sourcekitd-test -req=cursor -pos=57:15 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK24 %s // CHECK24-NOT: func unavailable() // CHECK24-NOT: func unavailable() -// RUN: %sourcekitd-test -req=cursor -pos=58:15 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK25 %s +// RUN: %sourcekitd-test -req=cursor -pos=58:15 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK25 %s // CHECK25: func availabilityIntroducedMsg() // CHECK25: func availabilityIntroducedMsg() -// RUN: %sourcekitd-test -req=cursor -pos=59:15 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK26 %s +// RUN: %sourcekitd-test -req=cursor -pos=59:15 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK26 %s // CHECK26-NOT: func availabilityDeprecated() // CHECK26-NOT: func availabilityDeprecated() -// RUN: %sourcekitd-test -req=cursor -pos=69:14 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK27 %s +// RUN: %sourcekitd-test -req=cursor -pos=69:14 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK27 %s // CHECK27: public subscript(i: Int) -> Int { get } // CHECK27: public subscript(i: Int) -> Int { get } -// RUN: %sourcekitd-test -req=cursor -pos=69:19 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK28 %s +// RUN: %sourcekitd-test -req=cursor -pos=69:19 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK28 %s // CHECK28: public subscript(i: Int) -> Int { get } // CHECK28: public subscript(i: Int) -> Int { get } -// RUN: %sourcekitd-test -req=cursor -pos=74:3 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK29 +// RUN: %sourcekitd-test -req=cursor -pos=74:3 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK29 // CHECK29: source.lang.swift.decl.function.destructor (74:3-74:9) // CHECK29-NEXT: deinit // CHECK29-NEXT: s:FC11cursor_info2C3d @@ -381,7 +381,7 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK29-NEXT: deinit // CHECK29-NEXT: deinit -// RUN: %sourcekitd-test -req=cursor -pos=75:3 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK30 +// RUN: %sourcekitd-test -req=cursor -pos=75:3 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK30 // CHECK30: source.lang.swift.decl.function.constructor (75:3-75:16) // CHECK30-NEXT: init(x:) // CHECK30-NEXT: s:FC11cursor_info2C3cFT1xSi_GSQS0__ @@ -390,7 +390,7 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK30-NEXT: init!(x: Int) // CHECK30-NEXT: init!(x: Int) -// RUN: %sourcekitd-test -req=cursor -pos=76:3 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK31 +// RUN: %sourcekitd-test -req=cursor -pos=76:3 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK31 // CHECK31: source.lang.swift.decl.function.constructor (76:3-76:16) // CHECK31-NEXT: init(y:) // CHECK31-NEXT: s:FC11cursor_info2C3cFT1ySi_GSqS0__ @@ -399,7 +399,7 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK31-NEXT: init?(y: Int) // CHECK31-NEXT: init?(y: Int) -// RUN: %sourcekitd-test -req=cursor -pos=77:3 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK32 +// RUN: %sourcekitd-test -req=cursor -pos=77:3 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK32 // CHECK32: source.lang.swift.decl.function.constructor (77:3-77:15) // CHECK32-NEXT: init(z:) // CHECK32-NEXT: s:FC11cursor_info2C3cFzT1zSi_S0_ @@ -408,7 +408,7 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK32-NEXT: init(z: Int) throws // CHECK32-NEXT: init(z: Int) throws -// RUN: %sourcekitd-test -req=cursor -pos=80:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK33 +// RUN: %sourcekitd-test -req=cursor -pos=80:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK33 // CHECK33: source.lang.swift.decl.struct (80:8-80:10) // CHECK33-NEXT: S2 // CHECK33-NEXT: s:V11cursor_info2S2 @@ -416,7 +416,7 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK33: struct S2<T, U> // CHECK33-NEXT: struct S2<T, U> -// RUN: %sourcekitd-test -req=cursor -pos=81:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK34 +// RUN: %sourcekitd-test -req=cursor -pos=81:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK34 // CHECK34: source.lang.swift.decl.function.method.instance (81:8-81:50) // CHECK34-NEXT: foo(_:) // CHECK34-NEXT: s:FV11cursor_info2S23foou0_rFFT_T_FT_T_ @@ -424,7 +424,7 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK34: func foo<V, W>(_ closure: () -> ()) -> () -> () // CHECK34-NEXT: func foo<V, W>(_ closure: () -> ()) -> () -> () -// RUN: %sourcekitd-test -req=cursor -pos=83:7 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK35 +// RUN: %sourcekitd-test -req=cursor -pos=83:7 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK35 // CHECK35: source.lang.swift.decl.class (83:7-83:9) // CHECK35-NEXT: C4 // CHECK35-NEXT: s:C11cursor_info2C4 @@ -432,7 +432,7 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK35: class C4<T, U> // CHECK35-NEXT: class C4<T, U> -// RUN: %sourcekitd-test -req=cursor -pos=84:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK36 +// RUN: %sourcekitd-test -req=cursor -pos=84:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK36 // CHECK36: source.lang.swift.decl.enum (84:6-84:8) // CHECK36-NEXT: E1 // CHECK36-NEXT: s:O11cursor_info2E1 @@ -440,7 +440,7 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK36: enum E1<T, U> // CHECK36-NEXT: enum E1<T, U> -// RUN: %sourcekitd-test -req=cursor -pos=86:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK37 +// RUN: %sourcekitd-test -req=cursor -pos=86:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK37 // CHECK37: source.lang.swift.decl.function.free (86:6-86:111) // CHECK37-NEXT: nonDefaultArgNames(external1:_:external3:external4:_:) // CHECK37-NEXT: s:F11cursor_info18nonDefaultArgNamesFT9external1SiSi9external3Si9external4SiSi_T_ @@ -448,10 +448,10 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK37: func nonDefaultArgNames(external1 local1: Int, _ local2: Int, external3 local3: Int, external4 _: Int, _: Int) // CHECK37-NEXT: func nonDefaultArgNames(external1 local1: Int, _ local2: Int, external3 local3: Int, external4 _: Int, _: Int) -// RUN: %sourcekitd-test -req=cursor -pos=88:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK38 +// RUN: %sourcekitd-test -req=cursor -pos=88:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK38 // CHECK38: func nestedFunctionType(closure: (_ y: (_ z: Int) -> Int) -> Int) -> (_ y: (_ z: Int) -> Int) -> Int -// RUN: %sourcekitd-test -req=cursor -pos=91:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK39 +// RUN: %sourcekitd-test -req=cursor -pos=91:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK39 // CHECK39: source.lang.swift.decl.enumelement (91:8-91:10) // CHECK39-NEXT: C1 // CHECK39-NEXT: s:FO11cursor_info2E22C1FMS0_S0_ @@ -459,7 +459,7 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK39: case C1 // CHECK39-NEXT: case C1 -// RUN: %sourcekitd-test -req=cursor -pos=92:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK40 +// RUN: %sourcekitd-test -req=cursor -pos=92:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK40 // CHECK40: source.lang.swift.decl.enumelement (92:8-92:10) // CHECK40-NEXT: C2 // CHECK40-NEXT: s:FO11cursor_info2E22C2FMS0_FT1xSi1ySS_S0_ @@ -467,7 +467,7 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK40: case C2(x: Int, y: String) // CHECK40-NEXT: case C2(x: Int, y: String) -// RUN: %sourcekitd-test -req=cursor -pos=92:31 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK41 +// RUN: %sourcekitd-test -req=cursor -pos=92:31 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK41 // CHECK41: source.lang.swift.decl.enumelement (92:31-92:33) // CHECK41-NEXT: C3 // CHECK41-NEXT: s:FO11cursor_info2E22C3FMS0_FSiS0_ @@ -476,7 +476,7 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK41-NEXT: case C3(Int) // FIXME: Wrap parameters in -// RUN: %sourcekitd-test -req=cursor -pos=96:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK42 +// RUN: %sourcekitd-test -req=cursor -pos=96:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK42 // CHECK42: source.lang.swift.decl.enumelement (96:8-96:9) // CHECK42-NEXT: C // CHECK42-NEXT: s:FO11cursor_info2E31CFMS0_S0_ @@ -484,31 +484,31 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK42: case C = "a" // CHECK42-NEXT: case C = "a" -// RUN: %sourcekitd-test -req=cursor -pos=100:14 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK43 +// RUN: %sourcekitd-test -req=cursor -pos=100:14 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK43 // CHECK43: source.lang.swift.ref.enumelement (91:8-91:10) // CHECK43-NEXT: C1 // CHECK43: case C1 // CHECK43-NEXT: case C1 -// RUN: %sourcekitd-test -req=cursor -pos=101:14 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK44 +// RUN: %sourcekitd-test -req=cursor -pos=101:14 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK44 // CHECK44: source.lang.swift.ref.enumelement (92:8-92:10) // CHECK44-NEXT: C2 // CHECK44: case C2(x: Int, y: String) // CHECK44-NEXT: case C2(x: case C2(x: Int, y: String) // CHECK45-NEXT: case C2(x -// RUN: %sourcekitd-test -req=cursor -pos=103:16 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK46 +// RUN: %sourcekitd-test -req=cursor -pos=103:16 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK46 // CHECK46: source.lang.swift.ref.enumelement (96:8-96:9) // CHECK46-NEXT: C // CHECK46: case C = "a" // CHECK46-NEXT: case C = "a" -// RUN: %sourcekitd-test -req=cursor -pos=80:11 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK47 +// RUN: %sourcekitd-test -req=cursor -pos=80:11 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK47 // CHECK47: source.lang.swift.decl.generic_type_param (80:11-80:12) // CHECK47-NEXT: T // CHECK47-NEXT: s:tV11cursor_info2S21TMx @@ -516,75 +516,75 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK47: T // CHECK47-NEXT: T -// RUN: %sourcekitd-test -req=cursor -pos=107:14 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK48 +// RUN: %sourcekitd-test -req=cursor -pos=107:14 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK48 // CHECK48: source.lang.swift.decl.var.static (107:14-107:16) // CHECK48: static var -// RUN: %sourcekitd-test -req=cursor -pos=108:19 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK49 +// RUN: %sourcekitd-test -req=cursor -pos=108:19 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK49 // CHECK49: source.lang.swift.decl.var.class (108:19-108:21) // CHECK49: final class var -// RUN: %sourcekitd-test -req=cursor -pos=109:15 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK50 +// RUN: %sourcekitd-test -req=cursor -pos=109:15 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK50 // CHECK50: source.lang.swift.decl.function.method.static (109:15-109:19) // CHECK50: static func -// RUN: %sourcekitd-test -req=cursor -pos=110:20 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK51 +// RUN: %sourcekitd-test -req=cursor -pos=110:20 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK51 // CHECK51: source.lang.swift.decl.function.method.class (110:20-110:24) // CHECK51: final class func -// RUN: %sourcekitd-test -req=cursor -pos=117:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK52 +// RUN: %sourcekitd-test -req=cursor -pos=117:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK52 // CHECK52: source.lang.swift.decl.function.free (117:6-117:51) // CHECK52: (U, v: V) -> () // CHECK52: <U, V : P1 where V.T == U> -// RUN: %sourcekitd-test -req=cursor -pos=117:16 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK53 +// RUN: %sourcekitd-test -req=cursor -pos=117:16 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK53 // CHECK53: source.lang.swift.decl.generic_type_param (117:16-117:17) // CHECK53: V : P1 -// RUN: %sourcekitd-test -req=cursor -pos=119:13 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK54 +// RUN: %sourcekitd-test -req=cursor -pos=119:13 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK54 // CHECK54: source.lang.swift.decl.class (119:13-119:15) // CHECK54: @objc class -// RUN: %sourcekitd-test -req=cursor -pos=122:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK55 +// RUN: %sourcekitd-test -req=cursor -pos=122:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK55 // CHECK55: source.lang.swift.decl.function.method.instance (122:8-122:12) // CHECK55: @objc(mmm1) func -// RUN: %sourcekitd-test -req=cursor -pos=126:7 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK56 +// RUN: %sourcekitd-test -req=cursor -pos=126:7 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK56 // CHECK56: source.lang.swift.decl.var.instance (126:7-126:9) // CHECK56: private(set) public var -// RUN: %sourcekitd-test -req=cursor -pos=129:5 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK57 +// RUN: %sourcekitd-test -req=cursor -pos=129:5 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK57 // CHECK57: source.lang.swift.decl.var.global (129:5-129:14) // CHECK57: let tupleVar1: (((Int, Int), y: Int), z: Int) -// RUN: %sourcekitd-test -req=cursor -pos=130:5 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK58 +// RUN: %sourcekitd-test -req=cursor -pos=130:5 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK58 // CHECK58: source.lang.swift.decl.var.global (130:5-130:14) // CHECK58: let tupleVar2: (f: () -> (), g: (_ x: Int) -> Int) -// RUN: %sourcekitd-test -req=cursor -pos=131:5 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK59 +// RUN: %sourcekitd-test -req=cursor -pos=131:5 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK59 // CHECK59: source.lang.swift.decl.var.global (131:5-131:14) // CHECK59: let tupleVar3: (f: (_ x: inout (Int, Int)) throws -> (), Int) -// RUN: %sourcekitd-test -req=cursor -pos=134:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK60 +// RUN: %sourcekitd-test -req=cursor -pos=134:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK60 // CHECK60: case A = -1 -// RUN: %sourcekitd-test -req=cursor -pos=135:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK61 +// RUN: %sourcekitd-test -req=cursor -pos=135:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK61 // CHECK61: case B = 0 -// RUN: %sourcekitd-test -req=cursor -pos=136:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK62 +// RUN: %sourcekitd-test -req=cursor -pos=136:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK62 // CHECK62: case C = 1 -// RUN: %sourcekitd-test -req=cursor -pos=142:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK63 +// RUN: %sourcekitd-test -req=cursor -pos=142:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK63 // CHECK63: case A = -0.0 -// RUN: %sourcekitd-test -req=cursor -pos=143:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK64 +// RUN: %sourcekitd-test -req=cursor -pos=143:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK64 // CHECK64: case B = 1e10 -// RUN: %sourcekitd-test -req=cursor -pos=146:7 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK65 +// RUN: %sourcekitd-test -req=cursor -pos=146:7 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK65 // CHECK65: class C6 : C4, P1 // FIXME: ref.class - rdar://problem/25014968 -// RUN: %sourcekitd-test -req=cursor -pos=150:10 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK66 +// RUN: %sourcekitd-test -req=cursor -pos=150:10 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK66 // CHECK66: protocol P2 : class, P1 -// RUN: %sourcekitd-test -req=cursor -pos=114:18 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK67 +// RUN: %sourcekitd-test -req=cursor -pos=114:18 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK67 // CHECK67: source.lang.swift.decl.associatedtype (114:18-114:19) // CHECK67-NEXT: T // CHECK67-NEXT: s:P11cursor_info2P11T @@ -592,7 +592,7 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK67: associatedtype T // CHECK67-NEXT: associatedtype T -// RUN: %sourcekitd-test -req=cursor -pos=152:11 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK68 +// RUN: %sourcekitd-test -req=cursor -pos=152:11 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK68 // CHECK68: source.lang.swift.decl.typealias (152:11-152:18) // CHECK68-NEXT: MyAlias // CHECK68-NEXT: s:11cursor_info7MyAlias @@ -600,7 +600,7 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK68: typealias MyAlias<T, U> = (T, U, T, U) // CHECK68-NEXT: typealias MyAlias<T, U> = (T, U, T, U) -// RUN: %sourcekitd-test -req=cursor -pos=153:28 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK69 +// RUN: %sourcekitd-test -req=cursor -pos=153:28 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK69 // CHECK69: source.lang.swift.ref.typealias (152:11-152:18) // CHECK69-NEXT: MyAlias // CHECK69-NEXT: s:11cursor_info7MyAlias @@ -608,16 +608,16 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK69: typealias MyAlias<T, U> = (T, U, T, U) // CHECK69-NEXT: typealias MyAlias<T, U> = (T, U, T, U) -// RUN: %sourcekitd-test -req=cursor -pos=155:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK70 +// RUN: %sourcekitd-test -req=cursor -pos=155:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK70 // CHECK70: func paramAutoclosureNoescape1(_ msg: () -> String) -// RUN: %sourcekitd-test -req=cursor -pos=156:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK71 +// RUN: %sourcekitd-test -req=cursor -pos=156:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK71 // CHECK71: func paramAutoclosureNoescape2(_ msg: @autoclosure () -> String) -// RUN: %sourcekitd-test -req=cursor -pos=157:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK72 +// RUN: %sourcekitd-test -req=cursor -pos=157:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK72 // CHECK72: func paramAutoclosureNoescape3(_ msg: @autoclosure @escaping () -> String) -// RUN: %sourcekitd-test -req=cursor -pos=159:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK73 +// RUN: %sourcekitd-test -req=cursor -pos=159:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK73 // CHECK73: // CHECK73-SAME: = #function // CHECK73-SAME: = #file @@ -631,14 +631,14 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK73-SAME: = default // CHECK73-SAME: = default -// RUN: %sourcekitd-test -req=cursor -pos=162:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK74 +// RUN: %sourcekitd-test -req=cursor -pos=162:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK74 // CHECK74: source.lang.swift.decl.function.method.instance (162:8-162:20) // CHECK74: (Self) -> (Self) -> Self // CHECK74: func f(_ s: Self) -> Self // CHECK74: Self // CHECK74-SAME: Self -// RUN: %sourcekitd-test -req=cursor -pos=165:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK75 +// RUN: %sourcekitd-test -req=cursor -pos=165:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK75 // CHECK75: source.lang.swift.decl.function.method.instance (165:8-165:20) // CHECK75: (Self) -> (Self) -> Self // CHECK75: func f(_ s: Self) -> Self @@ -646,41 +646,41 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {} // CHECK75-SAME: Self // FIXME: the return type gets the USR for the original protocol, rather than the extension. -// RUN: %sourcekitd-test -req=cursor -pos=169:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK76 +// RUN: %sourcekitd-test -req=cursor -pos=169:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK76 // CHECK76: source.lang.swift.decl.function.method.instance (169:8-169:11) // CHECK76: (Self) -> () -> Self // CHECK76: func f() -> Self // CHECK76: Self -// RUN: %sourcekitd-test -req=cursor -pos=188:7 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK77 %s -// RUN: %sourcekitd-test -req=cursor -pos=189:7 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK78 %s +// RUN: %sourcekitd-test -req=cursor -pos=188:7 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK77 %s +// RUN: %sourcekitd-test -req=cursor -pos=189:7 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK78 %s // CHECK77: foo1 comment from P4 // CHECK78: foo2 comment from C1 -// RUN: %sourcekitd-test -req=cursor -pos=192:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK79 %s +// RUN: %sourcekitd-test -req=cursor -pos=192:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK79 %s // CHECK79: t: // CHECK79-SAME: ( // CHECK79-SAME: Int, // CHECK79-SAME: Int // CHECK79-SAME: ) -// RUN: %sourcekitd-test -req=cursor -pos=193:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK80 %s +// RUN: %sourcekitd-test -req=cursor -pos=193:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK80 %s // CHECK80: () -// RUN: %sourcekitd-test -req=cursor -pos=194:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK81 %s +// RUN: %sourcekitd-test -req=cursor -pos=194:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK81 %s // CHECK81: () -> () -// RUN: %sourcekitd-test -req=cursor -pos=195:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK82 %s +// RUN: %sourcekitd-test -req=cursor -pos=195:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK82 %s // CHECK82: (Int, Int) -// RUN: %sourcekitd-test -req=cursor -pos=196:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK83 %s +// RUN: %sourcekitd-test -req=cursor -pos=196:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK83 %s // CHECK83: () -> Void -// RUN: %sourcekitd-test -req=cursor -pos=197:11 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK84 %s +// RUN: %sourcekitd-test -req=cursor -pos=197:11 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK84 %s // CHECK84: typealias MyVoid = () -// RUN: %sourcekitd-test -req=cursor -pos=199:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck -check-prefix=CHECK85 %s +// RUN: %sourcekitd-test -req=cursor -pos=199:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK85 %s // CHECK85-NOT: @rethrows // CHECK85: func rethrowingFunction1({{.*}}) rethrows // CHECK85-NOT: @rethrows diff --git a/test/SourceKit/CursorInfo/cursor_info_async.swift b/test/SourceKit/CursorInfo/cursor_info_async.swift index 29b34c11d50cd..902b0c5a4a14b 100644 --- a/test/SourceKit/CursorInfo/cursor_info_async.swift +++ b/test/SourceKit/CursorInfo/cursor_info_async.swift @@ -14,7 +14,7 @@ import Foo // RUN: == -async -dont-print-request -req=cursor -pos=60:15 \ // RUN: == -async -dont-print-request -req=cursor -pos=60:15 \ // RUN: == -async -dont-print-request -req=cursor -pos=60:15 \ -// RUN: == -async -dont-print-request -req=cursor -pos=60:15 | FileCheck %s -check-prefix=CHECK-FOO +// RUN: == -async -dont-print-request -req=cursor -pos=60:15 | %FileCheck %s -check-prefix=CHECK-FOO // CHECK-FOO: struct FooRuncingOptions // CHECK-FOO: struct FooRuncingOptions diff --git a/test/SourceKit/CursorInfo/cursor_info_container.swift b/test/SourceKit/CursorInfo/cursor_info_container.swift index 7e17c6b1e22a3..c6570f438d9e0 100644 --- a/test/SourceKit/CursorInfo/cursor_info_container.swift +++ b/test/SourceKit/CursorInfo/cursor_info_container.swift @@ -39,30 +39,30 @@ func foo(s : S, c : C, e: E) { func SArrayGen() -> [S] { return [] } -// RUN: %sourcekitd-test -req=cursor -pos=24:12 %s -- %s | FileCheck -check-prefix=CHECK1 %s -// RUN: %sourcekitd-test -req=cursor -pos=25:12 %s -- %s | FileCheck -check-prefix=CHECK1 %s -// RUN: %sourcekitd-test -req=cursor -pos=34:19 %s -- %s | FileCheck -check-prefix=CHECK1 %s +// RUN: %sourcekitd-test -req=cursor -pos=24:12 %s -- %s | %FileCheck -check-prefix=CHECK1 %s +// RUN: %sourcekitd-test -req=cursor -pos=25:12 %s -- %s | %FileCheck -check-prefix=CHECK1 %s +// RUN: %sourcekitd-test -req=cursor -pos=34:19 %s -- %s | %FileCheck -check-prefix=CHECK1 %s // CHECK1: _TtV21cursor_info_container1S -// RUN: %sourcekitd-test -req=cursor -pos=26:12 %s -- %s | FileCheck -check-prefix=CHECK2 %s +// RUN: %sourcekitd-test -req=cursor -pos=26:12 %s -- %s | %FileCheck -check-prefix=CHECK2 %s // CHECK2: _TtMV21cursor_info_container1S -// RUN: %sourcekitd-test -req=cursor -pos=27:12 %s -- %s | FileCheck -check-prefix=CHECK3 %s -// RUN: %sourcekitd-test -req=cursor -pos=28:12 %s -- %s | FileCheck -check-prefix=CHECK3 %s -// RUN: %sourcekitd-test -req=cursor -pos=35:19 %s -- %s | FileCheck -check-prefix=CHECK3 %s +// RUN: %sourcekitd-test -req=cursor -pos=27:12 %s -- %s | %FileCheck -check-prefix=CHECK3 %s +// RUN: %sourcekitd-test -req=cursor -pos=28:12 %s -- %s | %FileCheck -check-prefix=CHECK3 %s +// RUN: %sourcekitd-test -req=cursor -pos=35:19 %s -- %s | %FileCheck -check-prefix=CHECK3 %s // CHECK3: _TtC21cursor_info_container1C -// RUN: %sourcekitd-test -req=cursor -pos=29:12 %s -- %s | FileCheck -check-prefix=CHECK4 %s +// RUN: %sourcekitd-test -req=cursor -pos=29:12 %s -- %s | %FileCheck -check-prefix=CHECK4 %s // CHECK4: _TtMC21cursor_info_container1C -// RUN: %sourcekitd-test -req=cursor -pos=30:12 %s -- %s | FileCheck -check-prefix=CHECK5 %s -// RUN: %sourcekitd-test -req=cursor -pos=31:12 %s -- %s | FileCheck -check-prefix=CHECK5 %s -// RUN: %sourcekitd-test -req=cursor -pos=36:19 %s -- %s | FileCheck -check-prefix=CHECK5 %s +// RUN: %sourcekitd-test -req=cursor -pos=30:12 %s -- %s | %FileCheck -check-prefix=CHECK5 %s +// RUN: %sourcekitd-test -req=cursor -pos=31:12 %s -- %s | %FileCheck -check-prefix=CHECK5 %s +// RUN: %sourcekitd-test -req=cursor -pos=36:19 %s -- %s | %FileCheck -check-prefix=CHECK5 %s // CHECK5: _TtO21cursor_info_container1E -// RUN: %sourcekitd-test -req=cursor -pos=32:12 %s -- %s | FileCheck -check-prefix=CHECK6 %s -// RUN: %sourcekitd-test -req=cursor -pos=33:12 %s -- %s | FileCheck -check-prefix=CHECK6 %s +// RUN: %sourcekitd-test -req=cursor -pos=32:12 %s -- %s | %FileCheck -check-prefix=CHECK6 %s +// RUN: %sourcekitd-test -req=cursor -pos=33:12 %s -- %s | %FileCheck -check-prefix=CHECK6 %s // CHECK6: _TtMO21cursor_info_container1E -// RUN: %sourcekitd-test -req=cursor -pos=37:22 %s -- %s | FileCheck -check-prefix=CHECK7 %s +// RUN: %sourcekitd-test -req=cursor -pos=37:22 %s -- %s | %FileCheck -check-prefix=CHECK7 %s // CHECK7: _TtGSaV21cursor_info_container1S_ diff --git a/test/SourceKit/CursorInfo/cursor_invalid.swift b/test/SourceKit/CursorInfo/cursor_invalid.swift index fb8b7165b15ec..846d55ac10eb0 100644 --- a/test/SourceKit/CursorInfo/cursor_invalid.swift +++ b/test/SourceKit/CursorInfo/cursor_invalid.swift @@ -22,40 +22,40 @@ func ==(x: C, y: C) func resyncParser2() {} -// RUN: %sourcekitd-test -req=cursor -pos=4:13 %s -- %s | FileCheck -check-prefix=CHECK1 %s +// RUN: %sourcekitd-test -req=cursor -pos=4:13 %s -- %s | %FileCheck -check-prefix=CHECK1 %s // CHECK1: source.lang.swift.decl.var.local (4:13-4:14) // CHECK1: c // CHECK1: let c // CHECK1: OVERRIDES BEGIN // CHECK1: OVERRIDES END -// RUN: %sourcekitd-test -req=cursor -pos=13:10 %s -- %s | FileCheck -check-prefix=CHECK2 %s +// RUN: %sourcekitd-test -req=cursor -pos=13:10 %s -- %s | %FileCheck -check-prefix=CHECK2 %s // CHECK2: source.lang.swift.decl.class (13:9-13:20) // CHECK2: MyCoolClass // CHECK2: class MyCoolClass : Undeclared -// RUN: %sourcekitd-test -req=cursor -pos=7:7 %s -- %s | FileCheck -check-prefix=CHECK3 %s +// RUN: %sourcekitd-test -req=cursor -pos=7:7 %s -- %s | %FileCheck -check-prefix=CHECK3 %s // CHECK3: source.lang.swift.decl.var.instance (7:7-7:11) // CHECK3: over // CHECK3: var over{{.*}} -// RUN: %sourcekitd-test -req=cursor -pos=8:7 %s -- %s | FileCheck -check-prefix=CHECK4 %s +// RUN: %sourcekitd-test -req=cursor -pos=8:7 %s -- %s | %FileCheck -check-prefix=CHECK4 %s // CHECK4: source.lang.swift.decl.var.instance (8:7-8:10) // CHECK4: bad // CHECK4: var bad: IDontExist -// RUN: %sourcekitd-test -req=cursor -pos=7:12 %s -- %s | FileCheck -check-prefix=EMPTY %s -// RUN: %sourcekitd-test -req=cursor -pos=9:7 %s -- %s | FileCheck -check-prefix=EMPTY %s +// RUN: %sourcekitd-test -req=cursor -pos=7:12 %s -- %s | %FileCheck -check-prefix=EMPTY %s +// RUN: %sourcekitd-test -req=cursor -pos=9:7 %s -- %s | %FileCheck -check-prefix=EMPTY %s // EMPTY: -// RUN: %sourcekitd-test -req=cursor -pos=18:6 %s -- %s | FileCheck -check-prefix=EQEQ1 %s -// RUN: %sourcekitd-test -req=cursor -pos=19:6 %s -- %s | FileCheck -check-prefix=EQEQ1 %s +// RUN: %sourcekitd-test -req=cursor -pos=18:6 %s -- %s | %FileCheck -check-prefix=EQEQ1 %s +// RUN: %sourcekitd-test -req=cursor -pos=19:6 %s -- %s | %FileCheck -check-prefix=EQEQ1 %s // Note: we can't find the operator decl so the decl kind is a fallback. // EQEQ1: func ==() -// RUN: %sourcekitd-test -req=cursor -pos=20:6 %s -- %s | FileCheck -check-prefix=EQEQ2 %s +// RUN: %sourcekitd-test -req=cursor -pos=20:6 %s -- %s | %FileCheck -check-prefix=EQEQ2 %s // Note: we can't find the operator decl so the decl kind is a fallback. // EQEQ2: func ==(x: C) -// RUN: %sourcekitd-test -req=cursor -pos=21:6 %s -- %s | FileCheck -check-prefix=EQEQ3 %s +// RUN: %sourcekitd-test -req=cursor -pos=21:6 %s -- %s | %FileCheck -check-prefix=EQEQ3 %s // EQEQ3: func ==(x: C, y: C) diff --git a/test/SourceKit/CursorInfo/cursor_overrides.swift b/test/SourceKit/CursorInfo/cursor_overrides.swift index b74c55909b909..600a7f6ccf676 100644 --- a/test/SourceKit/CursorInfo/cursor_overrides.swift +++ b/test/SourceKit/CursorInfo/cursor_overrides.swift @@ -17,7 +17,7 @@ func goo(x: SubCls) { } // REQUIRES: objc_interop -// RUN: %sourcekitd-test -req=cursor -pos=16:7 %s -- -embed-bitcode -I %S/Inputs/cursor-overrides %mcp_opt %s | FileCheck -check-prefix=CHECK1 %s +// RUN: %sourcekitd-test -req=cursor -pos=16:7 %s -- -embed-bitcode -I %S/Inputs/cursor-overrides %mcp_opt %s | %FileCheck -check-prefix=CHECK1 %s // CHECK1: source.lang.swift.ref.function.method.instance (12:8-12:14) // CHECK1: s:FC16cursor_overrides6SubCls4methFT_T_ // CHECK1: (SubCls) -> () -> () diff --git a/test/SourceKit/CursorInfo/cursor_stdlib.swift b/test/SourceKit/CursorInfo/cursor_stdlib.swift index 4e1bafad2cffa..f2da08285408f 100644 --- a/test/SourceKit/CursorInfo/cursor_stdlib.swift +++ b/test/SourceKit/CursorInfo/cursor_stdlib.swift @@ -21,7 +21,7 @@ func foo2(_ a : inout [S1]) { import Swift func foo3(a: Float, b: Bool) {} -// RUN: %sourcekitd-test -req=cursor -pos=3:18 %s -- %s %mcp_opt %clang-importer-sdk | FileCheck -check-prefix=CHECK-OVERLAY %s +// RUN: %sourcekitd-test -req=cursor -pos=3:18 %s -- %s %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-OVERLAY %s // CHECK-OVERLAY: source.lang.swift.ref.var.global // CHECK-OVERLAY-NEXT: NSUTF8StringEncoding // CHECK-OVERLAY-NEXT: s:v10Foundation20NSUTF8StringEncodingSu @@ -29,11 +29,11 @@ func foo3(a: Float, b: Bool) {} // CHECK-OVERLAY-NEXT: _TtSu // CHECK-OVERLAY-NEXT: public let NSUTF8StringEncoding: UInt -// RUN: %sourcekitd-test -req=cursor -pos=5:13 %s -- %s %mcp_opt %clang-importer-sdk | FileCheck -check-prefix=CHECK-ITERATOR %s +// RUN: %sourcekitd-test -req=cursor -pos=5:13 %s -- %s %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-ITERATOR %s // CHECK-ITERATOR-NOT: _AnyIteratorBase // CHECK-ITERATOR: Collection/Type-erased -// RUN: %sourcekitd-test -req=cursor -pos=8:10 %s -- %s %mcp_opt %clang-importer-sdk | FileCheck -check-prefix=CHECK-REPLACEMENT1 %s +// RUN: %sourcekitd-test -req=cursor -pos=8:10 %s -- %s %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-REPLACEMENT1 %s // CHECK-REPLACEMENT1: Collection/Array // CHECK-REPLACEMENT1: func sorted() -> [Int] // CHECK-REPLACEMENT1: RELATED BEGIN @@ -42,30 +42,30 @@ func foo3(a: Float, b: Bool) {} // CHECK-REPLACEMENT1: sorted(by: (Int, Int) -> Bool) -> [Int] // CHECK-REPLACEMENT1: RELATED END -// RUN: %sourcekitd-test -req=cursor -pos=9:8 %s -- %s %mcp_opt %clang-importer-sdk | FileCheck -check-prefix=CHECK-REPLACEMENT2 %s +// RUN: %sourcekitd-test -req=cursor -pos=9:8 %s -- %s %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-REPLACEMENT2 %s // CHECK-REPLACEMENT2: Collection/Array // CHECK-REPLACEMENT2: mutating func append(_ newElement: Int) -// RUN: %sourcekitd-test -req=cursor -pos=15:10 %s -- %s %mcp_opt %clang-importer-sdk | FileCheck -check-prefix=CHECK-REPLACEMENT3 %s +// RUN: %sourcekitd-test -req=cursor -pos=15:10 %s -- %s %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-REPLACEMENT3 %s // CHECK-REPLACEMENT3: Collection/Array // CHECK-REPLACEMENT3: func sorted(by areInIncreasingOrder: (S1 // CHECK-REPLACEMENT3: sorted() -> [S1] // CHECK-REPLACEMENT3: sorted() -> [S1] // CHECK-REPLACEMENT3: sorted(by: (S1, S1) -> Bool) -> [S1] -// RUN: %sourcekitd-test -req=cursor -pos=18:8 %s -- %s %mcp_opt %clang-importer-sdk | FileCheck -check-prefix=CHECK-REPLACEMENT4 %s +// RUN: %sourcekitd-test -req=cursor -pos=18:8 %s -- %s %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-REPLACEMENT4 %s // CHECK-REPLACEMENT4: Collection/Array // CHECK-REPLACEMENT4: mutating func append(_ newElement: S1) -// RUN: %sourcekitd-test -req=cursor -pos=21:10 %s -- %s %mcp_opt %clang-importer-sdk | FileCheck -check-prefix=CHECK-MODULE-GROUP1 %s +// RUN: %sourcekitd-test -req=cursor -pos=21:10 %s -- %s %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-MODULE-GROUP1 %s // CHECK-MODULE-GROUP1: MODULE GROUPS BEGIN // CHECK-MODULE-GROUP1-DAG: Math // CHECK-MODULE-GROUP1-DAG: Collection // CHECK-MODULE-GROUP1-DAG: Collection/Array // CHECK-MODULE-GROUP1: MODULE GROUPS END -// RUN: %sourcekitd-test -req=cursor -pos=22:17 %s -- %s %mcp_opt %clang-importer-sdk | FileCheck -check-prefix=CHECK-FLOAT1 %s +// RUN: %sourcekitd-test -req=cursor -pos=22:17 %s -- %s %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-FLOAT1 %s // CHECK-FLOAT1: s:Sf -// RUN: %sourcekitd-test -req=cursor -pos=22:25 %s -- %s %mcp_opt %clang-importer-sdk | FileCheck -check-prefix=CHECK-BOOL1 %s +// RUN: %sourcekitd-test -req=cursor -pos=22:25 %s -- %s %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-BOOL1 %s // CHECK-BOOL1: s:Sb diff --git a/test/SourceKit/CursorInfo/cursor_symlink.swift b/test/SourceKit/CursorInfo/cursor_symlink.swift index 936b65a44fd7c..5bd17a45aeaa7 100644 --- a/test/SourceKit/CursorInfo/cursor_symlink.swift +++ b/test/SourceKit/CursorInfo/cursor_symlink.swift @@ -2,8 +2,8 @@ // RUN: mkdir %t.dir // RUN: echo "let foo = 0" > %t.dir/real.swift // RUN: ln -s %t.dir/real.swift %t.dir/linked.swift -// RUN: %sourcekitd-test -req=cursor -pos=1:5 %t.dir/linked.swift -- %t.dir/real.swift | FileCheck %s -// RUN: %sourcekitd-test -req=cursor -pos=1:5 %t.dir/real.swift -- %t.dir/linked.swift | FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=1:5 %t.dir/linked.swift -- %t.dir/real.swift | %FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=1:5 %t.dir/real.swift -- %t.dir/linked.swift | %FileCheck %s // CHECK: source.lang.swift.decl.var.global (1:5-1:8) // CHECK: foo diff --git a/test/SourceKit/CursorInfo/cursor_unavailable.swift b/test/SourceKit/CursorInfo/cursor_unavailable.swift index d63e6e36d25c3..7bbf5398397e0 100644 --- a/test/SourceKit/CursorInfo/cursor_unavailable.swift +++ b/test/SourceKit/CursorInfo/cursor_unavailable.swift @@ -1,8 +1,8 @@ print("") find([1,2,3],1) -// RUN: %sourcekitd-test -req=cursor -pos=1:1 %s -- %s | FileCheck -check-prefix=CHECK1 %s -// RUN: %sourcekitd-test -req=cursor -pos=2:1 %s -- %s | FileCheck -check-prefix=CHECK2 %s +// RUN: %sourcekitd-test -req=cursor -pos=1:1 %s -- %s | %FileCheck -check-prefix=CHECK1 %s +// RUN: %sourcekitd-test -req=cursor -pos=2:1 %s -- %s | %FileCheck -check-prefix=CHECK2 %s // CHECK1: source.lang.swift.ref.function.free // CHECK2-NOT: source.lang.swift.ref.function.free diff --git a/test/SourceKit/CursorInfo/cursor_usr.swift b/test/SourceKit/CursorInfo/cursor_usr.swift index 70f2def27dfdf..018a96a02f4f2 100644 --- a/test/SourceKit/CursorInfo/cursor_usr.swift +++ b/test/SourceKit/CursorInfo/cursor_usr.swift @@ -15,8 +15,8 @@ func foo(x: FooStruct1) -> S1 {} // Sanity check that we have identical responses when things work. // RUN: %sourcekitd-test -req=cursor -pos=5:5 %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s > %t.from_offset.txt // RUN: %sourcekitd-test -req=cursor -usr "s:v10cursor_usr6globalSi" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s > %t.from_usr.txt -// RUN: FileCheck %s -check-prefix=CHECK_SANITY1 < %t.from_offset.txt -// RUN: FileCheck %s -check-prefix=CHECK_SANITY1 < %t.from_usr.txt +// RUN: %FileCheck %s -check-prefix=CHECK_SANITY1 < %t.from_offset.txt +// RUN: %FileCheck %s -check-prefix=CHECK_SANITY1 < %t.from_usr.txt // RUN: diff -u %t.from_usr.txt %t.from_offset.txt // CHECK_SANITY1: source.lang.swift.decl.var.global (5:5-5:11) // CHECK_SANITY1-NEXT: global @@ -27,31 +27,31 @@ func foo(x: FooStruct1) -> S1 {} // CHECK_SANITY1-NEXT: var global: Int // Bogus USR. -// RUN: %sourcekitd-test -req=cursor -usr "s:blahblahblah" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | FileCheck %s -check-prefix=EMPTY +// RUN: %sourcekitd-test -req=cursor -usr "s:blahblahblah" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | %FileCheck %s -check-prefix=EMPTY // Missing s: prefix. -// RUN: %sourcekitd-test -req=cursor -usr "v10cursor_usr6globalSi" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | FileCheck %s -check-prefix=EMPTY +// RUN: %sourcekitd-test -req=cursor -usr "v10cursor_usr6globalSi" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | %FileCheck %s -check-prefix=EMPTY // FIXME: no support for clang USRs. -// RUN: %sourcekitd-test -req=cursor -usr "c:@S@FooStruct1" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | FileCheck %s -check-prefix=EMPTY +// RUN: %sourcekitd-test -req=cursor -usr "c:@S@FooStruct1" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | %FileCheck %s -check-prefix=EMPTY // EMPTY: // FIXME: missing symbol shows up as some other part of the USR (the type here). -// RUN: %sourcekitd-test -req=cursor -usr "s:v10cursor_usr11global_noneSi" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | FileCheck %s -check-prefix=SHOULD_BE_EMPTY +// RUN: %sourcekitd-test -req=cursor -usr "s:v10cursor_usr11global_noneSi" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | %FileCheck %s -check-prefix=SHOULD_BE_EMPTY // SHOULD_BE_EMPTY: source.lang.swift.decl.struct () // SHOULD_BE_EMPTY: Int -// RUN: %sourcekitd-test -req=cursor -usr "s:V10cursor_usr2S1" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | FileCheck %s -check-prefix=CHECK1 +// RUN: %sourcekitd-test -req=cursor -usr "s:V10cursor_usr2S1" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | %FileCheck %s -check-prefix=CHECK1 // CHECK1: source.lang.swift.decl.struct (7:8-7:10) // CHECK1: S1 // CHECK1: struct S1 -// RUN: %sourcekitd-test -req=cursor -usr "s:F14FooSwiftModule12fooSwiftFuncFT_Si" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | FileCheck %s -check-prefix=CHECK2 +// RUN: %sourcekitd-test -req=cursor -usr "s:F14FooSwiftModule12fooSwiftFuncFT_Si" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | %FileCheck %s -check-prefix=CHECK2 // CHECK2: source.lang.swift.decl.function.free () // CHECK2: fooSwiftFunc() // CHECK2: () -> Int // CHECK2: FooSwiftModule // CHECK2: func fooSwiftFunc() -> Int -// RUN: %sourcekitd-test -req=cursor -usr "s:F10cursor_usr3fooFVSC10FooStruct1VS_2S1" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | FileCheck %s -check-prefix=CHECK3 +// RUN: %sourcekitd-test -req=cursor -usr "s:F10cursor_usr3fooFVSC10FooStruct1VS_2S1" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | %FileCheck %s -check-prefix=CHECK3 // CHECK3: source.lang.swift.decl.function.free (9:6-9:24) // CHECK3: foo(x:) // CHECK3: (FooStruct1) -> S1 diff --git a/test/SourceKit/CursorInfo/multiple_ast.swift b/test/SourceKit/CursorInfo/multiple_ast.swift index c6598dc147392..7b09d497f6ab1 100644 --- a/test/SourceKit/CursorInfo/multiple_ast.swift +++ b/test/SourceKit/CursorInfo/multiple_ast.swift @@ -1,5 +1,5 @@ // RUN: %sourcekitd-test -req=cursor -pos=1:8 %S/Inputs/multiple_ast1.swift -- %S/Inputs/multiple_ast1.swift == \ -// RUN: -req=cursor -pos=1:8 %S/Inputs/multiple_ast2.swift -- %S/Inputs/multiple_ast2.swift | FileCheck -check-prefix=CHECK %s +// RUN: -req=cursor -pos=1:8 %S/Inputs/multiple_ast2.swift -- %S/Inputs/multiple_ast2.swift | %FileCheck -check-prefix=CHECK %s // CHECK: source.lang.swift.decl.function.free (1:6-1:20) // CHECK-NEXT: foo1 diff --git a/test/SourceKit/CursorInfo/rdar_18677108-1.swift b/test/SourceKit/CursorInfo/rdar_18677108-1.swift index 32ca7652663db..9be34498ed080 100644 --- a/test/SourceKit/CursorInfo/rdar_18677108-1.swift +++ b/test/SourceKit/CursorInfo/rdar_18677108-1.swift @@ -1,5 +1,5 @@ // Checks that we don't crash. -// RUN: %sourcekitd-test -req=cursor -pos=7:5 %s -- %s | FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=7:5 %s -- %s | %FileCheck %s // CHECK: class CameraViewController diff --git a/test/SourceKit/CursorInfo/rdar_21657000.swift b/test/SourceKit/CursorInfo/rdar_21657000.swift index 0d129d8856bf7..d6e987b02af2c 100644 --- a/test/SourceKit/CursorInfo/rdar_21657000.swift +++ b/test/SourceKit/CursorInfo/rdar_21657000.swift @@ -3,6 +3,6 @@ extension Any { } } -// RUN: %sourcekitd-test -req=cursor -pos=2:15 %s -- %s | FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=2:15 %s -- %s | %FileCheck %s // CHECK: source.lang.swift.decl.function.method.instance (2:15-2:20) // CHECK: foo() diff --git a/test/SourceKit/CursorInfo/rdar_21859941.swift b/test/SourceKit/CursorInfo/rdar_21859941.swift index a4aacb09cc8c3..a433896d9e401 100644 --- a/test/SourceKit/CursorInfo/rdar_21859941.swift +++ b/test/SourceKit/CursorInfo/rdar_21859941.swift @@ -1,5 +1,5 @@ // Checks that we don't crash. -// RUN: %sourcekitd-test -req=cursor -pos=8:19 %s -- %s | FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=8:19 %s -- %s | %FileCheck %s // CHECK: source.lang.swift.decl.function.method.instance public extension AnyIterator { diff --git a/test/SourceKit/Demangle/demangle.swift b/test/SourceKit/Demangle/demangle.swift index 10a1ce2380e66..4e87cef61c8c8 100644 --- a/test/SourceKit/Demangle/demangle.swift +++ b/test/SourceKit/Demangle/demangle.swift @@ -1,18 +1,18 @@ -// RUN: %sourcekitd-test -req=demangle unmangled _TtBf80_ _TtP3foo3bar_ | FileCheck %s +// RUN: %sourcekitd-test -req=demangle unmangled _TtBf80_ _TtP3foo3bar_ | %FileCheck %s // CHECK: START DEMANGLE // CHECK-NEXT: // CHECK-NEXT: Builtin.Float80 // CHECK-NEXT: foo.bar // CHECK-NEXT: END DEMANGLE -// RUN: %sourcekitd-test -req=demangle unmangled _TtBf80_ _TtP3foo3bar_ -simplified-demangling | FileCheck %s -check-prefix=SIMPLIFIED +// RUN: %sourcekitd-test -req=demangle unmangled _TtBf80_ _TtP3foo3bar_ -simplified-demangling | %FileCheck %s -check-prefix=SIMPLIFIED // SIMPLIFIED: START DEMANGLE // SIMPLIFIED-NEXT: // SIMPLIFIED-NEXT: Builtin.Float80 // SIMPLIFIED-NEXT: bar // SIMPLIFIED-NEXT: END DEMANGLE -// RUN: %sourcekitd-test -req=mangle Foo.Baru Swift.Beer | FileCheck %s -check-prefix=MANGLED +// RUN: %sourcekitd-test -req=mangle Foo.Baru Swift.Beer | %FileCheck %s -check-prefix=MANGLED // MANGLED: START MANGLE // MANGLED-NEXT: _TtC3Foo4Baru // MANGLED-NEXT: _TtCs4Beer diff --git a/test/SourceKit/DocSupport/doc_error_domain.swift b/test/SourceKit/DocSupport/doc_error_domain.swift index 4c46fd88d9982..39f7bfed03d6d 100644 --- a/test/SourceKit/DocSupport/doc_error_domain.swift +++ b/test/SourceKit/DocSupport/doc_error_domain.swift @@ -1,7 +1,7 @@ // REQUIRES: OS=macosx // RUN: %sourcekitd-test -req=doc-info -module MyError -- -I %S/Inputs \ // RUN: %mcp_opt -sdk %sdk | %sed_clean > %t.response -// RUN: FileCheck -input-file=%t.response %s +// RUN: %FileCheck -input-file=%t.response %s // CHECK: struct MyError { // CHECK: enum Code : Int32 { diff --git a/test/SourceKit/Indexing/index_module_missing_depend.swift b/test/SourceKit/Indexing/index_module_missing_depend.swift index 985d7a561099a..0a33289ecdccb 100644 --- a/test/SourceKit/Indexing/index_module_missing_depend.swift +++ b/test/SourceKit/Indexing/index_module_missing_depend.swift @@ -2,7 +2,7 @@ // RUN: mkdir -p %t // RUN: %swift -emit-module -o %t %S/Inputs/cycle-depend/A.swift -I %S/Inputs/cycle-depend -enable-source-import -// RUN: not %sourcekitd-test -req=index %t/A.swiftmodule -- %t/A.swiftmodule 2>&1 | FileCheck %s +// RUN: not %sourcekitd-test -req=index %t/A.swiftmodule -- %t/A.swiftmodule 2>&1 | %FileCheck %s // FIXME: Report the reason we couldn't load a module. // CHECK-DISABLED: error response (Request Failed): missing module dependency diff --git a/test/SourceKit/Indexing/index_swift_lib.swift b/test/SourceKit/Indexing/index_swift_lib.swift index 648a8d43b3490..16f52a255a4e0 100644 --- a/test/SourceKit/Indexing/index_swift_lib.swift +++ b/test/SourceKit/Indexing/index_swift_lib.swift @@ -1,14 +1,14 @@ // REQUIRES: FIXME // RUN: %sourcekitd-test -req=index %swiftlib_dir/macosx/x86_64/Swift.swiftmodule -- %mcp_opt > %t.txt -// RUN: FileCheck %s -input-file %t.txt +// RUN: %FileCheck %s -input-file %t.txt // CHECK: key.name: "Dictionary", // CHECK-NEXT: key.usr: "s:Vs10Dictionary", -// RUN: FileCheck %s -input-file %t.txt -check-prefix=CHECK-INTERNAL +// RUN: %FileCheck %s -input-file %t.txt -check-prefix=CHECK-INTERNAL // RUN: %sourcekitd-test -req=index %swiftlib_dir/macosx/x86_64/Foundation.swiftmodule -- %clang-importer-sdk %mcp_opt > %t.foundation.txt -// RUN: FileCheck %s -input-file %t.foundation.txt -check-prefix=CHECK-FOUNDATION +// RUN: %FileCheck %s -input-file %t.foundation.txt -check-prefix=CHECK-FOUNDATION // CHECK-INTERNAL-NOT: key.name: "_bridgeToObjectiveCUnconditional", diff --git a/test/SourceKit/Indexing/index_with_clang_module.swift b/test/SourceKit/Indexing/index_with_clang_module.swift index 7f11b8fc1bf99..3a841549f199d 100644 --- a/test/SourceKit/Indexing/index_with_clang_module.swift +++ b/test/SourceKit/Indexing/index_with_clang_module.swift @@ -1,6 +1,6 @@ // REQUIRES: objc_interop // RUN: %sourcekitd-test -req=index %s -- %s -F %S/../Inputs/libIDE-mock-sdk \ -// RUN: %mcp_opt %clang-importer-sdk | FileCheck %s +// RUN: %mcp_opt %clang-importer-sdk | %FileCheck %s import Foo diff --git a/test/SourceKit/Indexing/index_with_swift_module.swift b/test/SourceKit/Indexing/index_with_swift_module.swift index 368209b3399f0..0921f358e3db3 100644 --- a/test/SourceKit/Indexing/index_with_swift_module.swift +++ b/test/SourceKit/Indexing/index_with_swift_module.swift @@ -2,7 +2,7 @@ // RUN: mkdir -p %t // RUN: %swift -emit-module -o %t/test_module.swiftmodule %S/Inputs/test_module.swift -// RUN: %sourcekitd-test -req=index %s -- %s -I %t | FileCheck %s +// RUN: %sourcekitd-test -req=index %s -- %s -I %t | %FileCheck %s // RUN: %sourcekitd-test -req=index %t/test_module.swiftmodule | %sed_clean > %t.response // RUN: diff -u %S/Inputs/test_module.index.response %t.response @@ -26,6 +26,6 @@ func foo(a: TwoInts) { // CHECK-NEXT: key.name: "TwoInts" // CHECK-NEXT: key.usr: "s:C11test_module7TwoInts" -// RUN: %sourcekitd-test -req=index %S/Inputs/Swift.swiftmodule | FileCheck %s -check-prefix=CHECK-SWIFT1 +// RUN: %sourcekitd-test -req=index %S/Inputs/Swift.swiftmodule | %FileCheck %s -check-prefix=CHECK-SWIFT1 // CHECK-SWIFT1-DAG: key.groupname: "Bool" // CHECK-SWIFT1-DAG: key.groupname: "Collection" diff --git a/test/SourceKit/InterfaceGen/gen_clang_module.swift b/test/SourceKit/InterfaceGen/gen_clang_module.swift index 8ebe8fbc5f86a..d51b91bd22603 100644 --- a/test/SourceKit/InterfaceGen/gen_clang_module.swift +++ b/test/SourceKit/InterfaceGen/gen_clang_module.swift @@ -27,13 +27,13 @@ var x: FooClassBase // RUN: %sourcekitd-test -req=interface-gen-open -module Foo -- -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \ // RUN: %mcp_opt %clang-importer-sdk \ -// RUN: == -req=cursor -pos=203:67 | FileCheck -check-prefix=CHECK1 %s +// RUN: == -req=cursor -pos=203:67 | %FileCheck -check-prefix=CHECK1 %s // The cursor points to 'FooClassBase' inside the list of base classes, see 'gen_clang_module.swift.response' // RUN: %sourcekitd-test -req=interface-gen-open -module Foo -- -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \ // RUN: %mcp_opt %clang-importer-sdk \ // RUN: == -req=cursor -pos=3:11 %s -- %s -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \ -// RUN: %mcp_opt %clang-importer-sdk | FileCheck -check-prefix=CHECK1 %s +// RUN: %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK1 %s // CHECK1: source.lang.swift.ref.class ({{.*}}Foo.framework/Headers/Foo.h:146:12-146:24) // CHECK1: FooClassBase @@ -43,7 +43,7 @@ var x: FooClassBase // RUN: %sourcekitd-test -req=interface-gen-open -module Foo -- -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \ // RUN: %mcp_opt %clang-importer-sdk \ -// RUN: == -req=cursor -pos=230:20 | FileCheck -check-prefix=CHECK2 %s +// RUN: == -req=cursor -pos=230:20 | %FileCheck -check-prefix=CHECK2 %s // The cursor points inside the interface, see 'gen_clang_module.swift.response' // CHECK2: source.lang.swift.decl.function.method.instance ({{.*}}Foo.framework/Headers/Foo.h:169:10-169:27) @@ -54,7 +54,7 @@ var x: FooClassBase // RUN: %sourcekitd-test -req=interface-gen-open -module Foo -- -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \ // RUN: %mcp_opt %clang-importer-sdk \ -// RUN: == -req=find-usr -usr "c:objc(cs)FooClassDerived(im)fooInstanceFunc0" | FileCheck -check-prefix=CHECK-USR %s +// RUN: == -req=find-usr -usr "c:objc(cs)FooClassDerived(im)fooInstanceFunc0" | %FileCheck -check-prefix=CHECK-USR %s // The returned line:col points inside the interface, see 'gen_clang_module.swift.response' // CHECK-USR: (230:15-230:33) @@ -62,7 +62,7 @@ var x: FooClassBase // RUN: %sourcekitd-test -req=interface-gen-open -module Foo -- -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \ // RUN: %mcp_opt %clang-importer-sdk \ // RUN: == -req=find-interface -module Foo -- %s -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \ -// RUN: %mcp_opt %clang-importer-sdk | FileCheck -check-prefix=CHECK-IFACE %s +// RUN: %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-IFACE %s // CHECK-IFACE: DOC: (/) // CHECK-IFACE: ARGS: [-target x86_64-{{.*}} -sdk {{.*}} -F {{.*}}/libIDE-mock-sdk -I {{.*}}.overlays {{.*}} -module-cache-path {{.*}} ] @@ -71,7 +71,7 @@ var x: FooClassBase // RUN: %mcp_opt %clang-importer-sdk \ // RUN: == -req=cursor -pos=1:8 == -req=cursor -pos=1:12 \ // RUN: == -req=cursor -pos=2:10 \ -// RUN: == -req=cursor -pos=3:10 | FileCheck -check-prefix=CHECK-IMPORT %s +// RUN: == -req=cursor -pos=3:10 | %FileCheck -check-prefix=CHECK-IMPORT %s // The cursors point to module names inside the imports, see 'gen_clang_module.swift.response' // CHECK-IMPORT: source.lang.swift.ref.module () diff --git a/test/SourceKit/InterfaceGen/gen_mixed_module.swift b/test/SourceKit/InterfaceGen/gen_mixed_module.swift index 986e77790e916..ff6c0e9f9f0af 100644 --- a/test/SourceKit/InterfaceGen/gen_mixed_module.swift +++ b/test/SourceKit/InterfaceGen/gen_mixed_module.swift @@ -5,6 +5,6 @@ var x = 10 // RUN: mkdir %t.overlays // RUN: %swift -emit-module -o %t.overlays -F %S/../Inputs/libIDE-mock-sdk %S/../Inputs/libIDE-mock-sdk/Mixed.swift -import-underlying-module -module-name Mixed -disable-objc-attr-requires-foundation-module -// RUN: %sourcekitd-test -req=interface-gen -module Mixed -- -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %clang-importer-sdk | FileCheck -check-prefix=CHECK1 %s +// RUN: %sourcekitd-test -req=interface-gen -module Mixed -- -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK1 %s // CHECK1: PureSwiftClass diff --git a/test/SourceKit/InterfaceGen/gen_objc.swift b/test/SourceKit/InterfaceGen/gen_objc.swift index 38d04b2f9bf88..c117285809852 100644 --- a/test/SourceKit/InterfaceGen/gen_objc.swift +++ b/test/SourceKit/InterfaceGen/gen_objc.swift @@ -1,6 +1,6 @@ // REQUIRES: FIXME // RUN: %sourcekitd-test -req=interface-gen -module ObjectiveC.NSObject -- %mcp_opt %clang-importer-sdk > %t.response -// RUN: FileCheck -check-prefix=CHECK-DESCRIPTION -input-file %t.response %s +// RUN: %FileCheck -check-prefix=CHECK-DESCRIPTION -input-file %t.response %s // CHECK-DESCRIPTION: var description: String diff --git a/test/SourceKit/InterfaceGen/gen_stdlib.swift b/test/SourceKit/InterfaceGen/gen_stdlib.swift index 96825d17e3bf6..3a57d59de1b1a 100644 --- a/test/SourceKit/InterfaceGen/gen_stdlib.swift +++ b/test/SourceKit/InterfaceGen/gen_stdlib.swift @@ -2,9 +2,9 @@ var x: Int // RUN: %sourcekitd-test -req=interface-gen -module Swift > %t.response -// RUN: FileCheck -check-prefix=CHECK-STDLIB -input-file %t.response %s -// RUN: FileCheck -check-prefix=CHECK-MUTATING-ATTR -input-file %t.response %s -// RUN: FileCheck -check-prefix=CHECK-HIDE-ATTR -input-file %t.response %s +// RUN: %FileCheck -check-prefix=CHECK-STDLIB -input-file %t.response %s +// RUN: %FileCheck -check-prefix=CHECK-MUTATING-ATTR -input-file %t.response %s +// RUN: %FileCheck -check-prefix=CHECK-HIDE-ATTR -input-file %t.response %s // Just check a small part, mainly to make sure we can print the interface of the stdlib. // CHECK-STDLIB-NOT: extension _SwiftNSOperatingSystemVersion @@ -27,7 +27,7 @@ var x: Int // CHECK-HIDE-ATTR-NOT: @inline // RUN: %sourcekitd-test -req=interface-gen-open -module Swift \ -// RUN: == -req=cursor -pos=2:8 %s -- %s | FileCheck -check-prefix=CHECK1 %s +// RUN: == -req=cursor -pos=2:8 %s -- %s | %FileCheck -check-prefix=CHECK1 %s // CHECK1: source.lang.swift.ref.struct () // CHECK1-NEXT: Int @@ -40,13 +40,13 @@ var x: Int // CHECK1-NEXT: SYSTEM // CHECK1-NEXT: struct Int : SignedInteger{{.*}}{{.*}}Comparable{{.*}}Equatable{{.*}} -// RUN: %sourcekitd-test -req=module-groups -module Swift | FileCheck -check-prefix=GROUP1 %s +// RUN: %sourcekitd-test -req=module-groups -module Swift | %FileCheck -check-prefix=GROUP1 %s // GROUP1: // GROUP1-NOT: // GROUP1: <\GROUPS> // RUN: %sourcekitd-test -req=interface-gen -module Swift -group-name Bool > %t.Bool.response -// RUN: FileCheck -check-prefix=CHECK-BOOL -input-file %t.Bool.response %s +// RUN: %FileCheck -check-prefix=CHECK-BOOL -input-file %t.Bool.response %s // CHECK-BOOL-DAG: extension Bool : ExpressibleByBooleanLiteral { // These are not in the bool group: @@ -57,10 +57,10 @@ var x: Int // CHECK-BOOL-NOT: extension String // RUN: %sourcekitd-test -req=interface-gen -module Swift -interested-usr s:Sb > %t.Bool.response -// RUN: FileCheck -check-prefix=CHECK-BOOL -input-file %t.Bool.response %s +// RUN: %FileCheck -check-prefix=CHECK-BOOL -input-file %t.Bool.response %s // RUN: %sourcekitd-test -req=interface-gen -module Swift -interested-usr s:Si > %t.Int.response -// RUN: FileCheck -check-prefix=CHECK-INT -input-file %t.Int.response %s +// RUN: %FileCheck -check-prefix=CHECK-INT -input-file %t.Int.response %s // CHECK-INT: struct Int // CHECK-INT: extension Int @@ -70,7 +70,7 @@ var x: Int // CHECK-INT-NOT: struct Float // RUN: %sourcekitd-test -req=interface-gen -module Swift -interested-usr s:Sf > %t.Float.response -// RUN: FileCheck -check-prefix=CHECK-FLOAT -input-file %t.Float.response %s +// RUN: %FileCheck -check-prefix=CHECK-FLOAT -input-file %t.Float.response %s // CHECK-FLOAT: struct Float // CHECK-FLOAT-NOT: Zip2Iterator diff --git a/test/SourceKit/InterfaceGen/gen_swift_module.swift b/test/SourceKit/InterfaceGen/gen_swift_module.swift index 69eeebe65aac8..6d03824c1aa5a 100644 --- a/test/SourceKit/InterfaceGen/gen_swift_module.swift +++ b/test/SourceKit/InterfaceGen/gen_swift_module.swift @@ -10,18 +10,18 @@ func f(s : inout [Int]) { // RUN: %sourcekitd-test -req=interface-gen -module swift_mod -- -I %t.mod > %t.response // RUN: diff -u %s.response %t.response -// RUN: %sourcekitd-test -req=module-groups -module swift_mod -- -I %t.mod | FileCheck -check-prefix=GROUP-EMPTY %s +// RUN: %sourcekitd-test -req=module-groups -module swift_mod -- -I %t.mod | %FileCheck -check-prefix=GROUP-EMPTY %s // GROUP-EMPTY: // GROUP-EMPTY-NEXT: <\GROUPS> // RUN: %swift -emit-module -o %t.mod/swift_mod_syn.swiftmodule %S/Inputs/swift_mod_syn.swift -parse-as-library -// RUN: %sourcekitd-test -req=interface-gen-open -module swift_mod_syn -- -I %t.mod == -req=cursor -pos=4:7 %s -- %s -I %t.mod | FileCheck -check-prefix=SYNTHESIZED-USR1 %s +// RUN: %sourcekitd-test -req=interface-gen-open -module swift_mod_syn -- -I %t.mod == -req=cursor -pos=4:7 %s -- %s -I %t.mod | %FileCheck -check-prefix=SYNTHESIZED-USR1 %s // SYNTHESIZED-USR1: s:FesRxs17MutableCollectionxs22RandomAccessCollectionWxPs10Collection8Iterator7Element_s10ComparablerS_4sortFT_T_::SYNTHESIZED::s:Sa // RUN: %sourcekitd-test -req=interface-gen-open -module Swift -synthesized-extension \ -// RUN: == -req=find-usr -usr "s:FesRxs17MutableCollectionxs22RandomAccessCollectionWxPs10Collection8Iterator7Element_s10ComparablerS_4sortFT_T_::SYNTHESIZED::s:Sa" | FileCheck -check-prefix=SYNTHESIZED-USR2 %s +// RUN: == -req=find-usr -usr "s:FesRxs17MutableCollectionxs22RandomAccessCollectionWxPs10Collection8Iterator7Element_s10ComparablerS_4sortFT_T_::SYNTHESIZED::s:Sa" | %FileCheck -check-prefix=SYNTHESIZED-USR2 %s // SYNTHESIZED-USR2-NOT: USR NOT FOUND // RUN: %sourcekitd-test -req=interface-gen-open -module Swift \ -// RUN: == -req=find-usr -usr "s:FesRxs17MutableCollectionxs22RandomAccessCollectionWxPs10Collection8Iterator7Element_s10ComparablerS_4sortFT_T_::SYNTHESIZED::USRDOESNOTEXIST" | FileCheck -check-prefix=SYNTHESIZED-USR3 %s +// RUN: == -req=find-usr -usr "s:FesRxs17MutableCollectionxs22RandomAccessCollectionWxPs10Collection8Iterator7Element_s10ComparablerS_4sortFT_T_::SYNTHESIZED::USRDOESNOTEXIST" | %FileCheck -check-prefix=SYNTHESIZED-USR3 %s // SYNTHESIZED-USR3-NOT: USR NOT FOUND diff --git a/test/SourceKit/InterfaceGen/gen_swift_source.swift b/test/SourceKit/InterfaceGen/gen_swift_source.swift index 3e5b4cb392972..56303a15e2747 100644 --- a/test/SourceKit/InterfaceGen/gen_swift_source.swift +++ b/test/SourceKit/InterfaceGen/gen_swift_source.swift @@ -2,15 +2,15 @@ // RUN: diff -u %s.response %t.response // RUN: %sourcekitd-test -req=interface-gen-open %S/Inputs/Foo2.swift -- %S/Inputs/Foo2.swift %mcp_opt %clang-importer-sdk \ -// RUN: == -req=cursor -pos=18:49 | FileCheck -check-prefix=CHECK1 %s +// RUN: == -req=cursor -pos=18:49 | %FileCheck -check-prefix=CHECK1 %s // The cursor points to 'FooOverlayClassBase' inside the list of base classes, see 'gen_swift_source.swift.response' // CHECK1: FooOverlayClassBase // CHECK1: s:C4Foo219FooOverlayClassBase // CHECK1: FooOverlayClassBase.Type -// RUN: %sourcekitd-test -req=interface-gen %S/Inputs/UnresolvedExtension.swift -- %S/Inputs/UnresolvedExtension.swift | FileCheck -check-prefix=CHECK2 %s +// RUN: %sourcekitd-test -req=interface-gen %S/Inputs/UnresolvedExtension.swift -- %S/Inputs/UnresolvedExtension.swift | %FileCheck -check-prefix=CHECK2 %s // CHECK2: extension ET -// RUN: %sourcekitd-test -req=interface-gen %S/Inputs/Foo3.swift -- %S/Inputs/Foo3.swift | FileCheck -check-prefix=CHECK3 %s +// RUN: %sourcekitd-test -req=interface-gen %S/Inputs/Foo3.swift -- %S/Inputs/Foo3.swift | %FileCheck -check-prefix=CHECK3 %s // CHECK3: public class C { diff --git a/test/SourceKit/InterfaceGen/gen_swift_type.swift b/test/SourceKit/InterfaceGen/gen_swift_type.swift index ae270776c7d29..1422d41007c22 100644 --- a/test/SourceKit/InterfaceGen/gen_swift_type.swift +++ b/test/SourceKit/InterfaceGen/gen_swift_type.swift @@ -1,9 +1,9 @@ -// RUN: %sourcekitd-test -req=interface-gen -usr _TtGSaSi_ %s -- %s | FileCheck -check-prefix=CHECK1 %s -// RUN: %sourcekitd-test -req=interface-gen -usr _TtGSaSS_ %s -- %s | FileCheck -check-prefix=CHECK2 %s -// RUN: %sourcekitd-test -req=interface-gen -usr _TtV14gen_swift_type1A %s -- %s | FileCheck -check-prefix=CHECK3 %s -// RUN: %sourcekitd-test -req=interface-gen -usr _TtGSaV14gen_swift_type1A_ %s -- %s | FileCheck -check-prefix=CHECK4 %s -// RUN: %sourcekitd-test -req=interface-gen -usr _TtGC14gen_swift_type1DCS_2T1_ %s -- %s | FileCheck -check-prefix=CHECK5 %s -// RUN: %sourcekitd-test -req=interface-gen -usr _TtGC14gen_swift_type1DSi_ %s -- %s | FileCheck -check-prefix=CHECK6 %s +// RUN: %sourcekitd-test -req=interface-gen -usr _TtGSaSi_ %s -- %s | %FileCheck -check-prefix=CHECK1 %s +// RUN: %sourcekitd-test -req=interface-gen -usr _TtGSaSS_ %s -- %s | %FileCheck -check-prefix=CHECK2 %s +// RUN: %sourcekitd-test -req=interface-gen -usr _TtV14gen_swift_type1A %s -- %s | %FileCheck -check-prefix=CHECK3 %s +// RUN: %sourcekitd-test -req=interface-gen -usr _TtGSaV14gen_swift_type1A_ %s -- %s | %FileCheck -check-prefix=CHECK4 %s +// RUN: %sourcekitd-test -req=interface-gen -usr _TtGC14gen_swift_type1DCS_2T1_ %s -- %s | %FileCheck -check-prefix=CHECK5 %s +// RUN: %sourcekitd-test -req=interface-gen -usr _TtGC14gen_swift_type1DSi_ %s -- %s | %FileCheck -check-prefix=CHECK6 %s public struct A { public func fa() {} diff --git a/test/SourceKit/Misc/protocol_version.swift b/test/SourceKit/Misc/protocol_version.swift index b952667db193a..90939553eb539 100644 --- a/test/SourceKit/Misc/protocol_version.swift +++ b/test/SourceKit/Misc/protocol_version.swift @@ -1,4 +1,4 @@ -// RUN: %sourcekitd-test -req=version | FileCheck %s +// RUN: %sourcekitd-test -req=version | %FileCheck %s // CHECK: key.version_major: 1 // CHECK: key.version_minor: 0 diff --git a/test/SourceKit/Mixed/cursor_mixed.swift b/test/SourceKit/Mixed/cursor_mixed.swift index fb6c8f87a102f..c159494c0c24d 100644 --- a/test/SourceKit/Mixed/cursor_mixed.swift +++ b/test/SourceKit/Mixed/cursor_mixed.swift @@ -4,7 +4,7 @@ func test(_ b : Base) { } // REQUIRES: objc_interop -// RUN: %sourcekitd-test -req=cursor -pos=3:7 %s -- %s %mcp_opt -F %S/Inputs -module-name Mixed -import-underlying-module | FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=3:7 %s -- %s %mcp_opt -F %S/Inputs -module-name Mixed -import-underlying-module | %FileCheck %s // CHECK: source.lang.swift.ref.function.method.instance ({{.*}}Mixed.framework/Headers/Mixed.h:5:9-5:23) // CHECK: doIt(_:) diff --git a/test/SourceKit/Mixed/cursor_mixed_header.swift b/test/SourceKit/Mixed/cursor_mixed_header.swift index 66514eae60d7e..30fde8c5d17ca 100644 --- a/test/SourceKit/Mixed/cursor_mixed_header.swift +++ b/test/SourceKit/Mixed/cursor_mixed_header.swift @@ -5,10 +5,10 @@ func test(_ b : BaseInHead) { // REQUIRES: objc_interop // RUN: %swift -parse %s %mcp_opt -module-name Mixed -import-objc-header %S/Inputs/header.h 2> %t.diags -// RUN: FileCheck -input-file %t.diags %s -check-prefix=DIAG +// RUN: %FileCheck -input-file %t.diags %s -check-prefix=DIAG // DIAG: warning: using the result of an assignment -// RUN: %sourcekitd-test -req=cursor -pos=3:7 %s -- %s %mcp_opt -module-name Mixed -import-objc-header %S/Inputs/header.h | FileCheck %s +// RUN: %sourcekitd-test -req=cursor -pos=3:7 %s -- %s %mcp_opt -module-name Mixed -import-objc-header %S/Inputs/header.h | %FileCheck %s // CHECK: source.lang.swift.ref.function.method.instance ({{.*}}Inputs/header.h:4:9-4:23) // CHECK: doIt(_:) diff --git a/test/SourceKit/RelatedIdents/implicit_vis.swift b/test/SourceKit/RelatedIdents/implicit_vis.swift index cd480483861f6..8df0c5048a8e9 100644 --- a/test/SourceKit/RelatedIdents/implicit_vis.swift +++ b/test/SourceKit/RelatedIdents/implicit_vis.swift @@ -1,5 +1,5 @@ // RUN: %sourcekitd-test -req=related-idents -pos=2:10 %S/Inputs/implicit-vis/a.swift \ -// RUN: -- %S/Inputs/implicit-vis/a.swift %S/Inputs/implicit-vis/b.swift -o implicit_vis.o | FileCheck -check-prefix=CHECK1 %s +// RUN: -- %S/Inputs/implicit-vis/a.swift %S/Inputs/implicit-vis/b.swift -o implicit_vis.o | %FileCheck -check-prefix=CHECK1 %s // CHECK1: START RANGES // CHECK1: 2:10 - 1 diff --git a/test/SourceKit/RelatedIdents/related_idents.swift b/test/SourceKit/RelatedIdents/related_idents.swift index e3eb1b5d8bd69..9f70204f90834 100644 --- a/test/SourceKit/RelatedIdents/related_idents.swift +++ b/test/SourceKit/RelatedIdents/related_idents.swift @@ -23,7 +23,7 @@ class C2 { func f(t : Param) -> Param {return t} } -// RUN: %sourcekitd-test -req=related-idents -pos=6:17 %s -- -module-name related_idents %s | FileCheck -check-prefix=CHECK1 %s +// RUN: %sourcekitd-test -req=related-idents -pos=6:17 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK1 %s // CHECK1: START RANGES // CHECK1-NEXT: 1:7 - 2 // CHECK1-NEXT: 6:11 - 2 @@ -31,23 +31,23 @@ class C2 { // CHECK1-NEXT: 9:11 - 2 // CHECK1-NEXT: END RANGES -// RUN: %sourcekitd-test -req=related-idents -pos=5:9 %s -- -module-name related_idents %s | FileCheck -check-prefix=CHECK2 %s +// RUN: %sourcekitd-test -req=related-idents -pos=5:9 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK2 %s // CHECK2: START RANGES // CHECK2-NEXT: 5:6 - 5 // CHECK2-NEXT: 11:1 - 5 // CHECK2-NEXT: END RANGES -// RUN: %sourcekitd-test -req=related-idents -pos=13:10 %s -- -module-name related_idents %s | FileCheck -check-prefix=CHECK3 %s +// RUN: %sourcekitd-test -req=related-idents -pos=13:10 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK3 %s // CHECK3: START RANGES // CHECK3-NEXT: END RANGES -// RUN: %sourcekitd-test -req=related-idents -pos=18:12 %s -- -module-name related_idents %s | FileCheck -check-prefix=CHECK4 %s +// RUN: %sourcekitd-test -req=related-idents -pos=18:12 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK4 %s // CHECK4: START RANGES // CHECK4-NEXT: 17:9 - 1 // CHECK4-NEXT: 18:12 - 1 // CHECK4-NEXT: END RANGES -// RUN: %sourcekitd-test -req=related-idents -pos=22:12 %s -- -module-name related_idents %s | FileCheck -check-prefix=CHECK5 %s +// RUN: %sourcekitd-test -req=related-idents -pos=22:12 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK5 %s // CHECK5: START RANGES // CHECK5-NEXT: 22:10 - 5 // CHECK5-NEXT: 23:13 - 5 diff --git a/test/SourceKit/Sema/objc_attr_without_import.swift b/test/SourceKit/Sema/objc_attr_without_import.swift index 9fd330ab65865..25160b432592b 100644 --- a/test/SourceKit/Sema/objc_attr_without_import.swift +++ b/test/SourceKit/Sema/objc_attr_without_import.swift @@ -1,5 +1,5 @@ // RUN: %sourcekitd-test -req=sema %s -- %s > %t.response -// RUN: FileCheck -input-file=%t.response %s +// RUN: %FileCheck -input-file=%t.response %s // This tests that we are not crashing in SILGen. // CHECK: @objc attribute used without importing module diff --git a/test/SourceKit/Sema/sema_diag_after_edit-2.swift b/test/SourceKit/Sema/sema_diag_after_edit-2.swift index e8099be1ccf6b..59857baeabf64 100644 --- a/test/SourceKit/Sema/sema_diag_after_edit-2.swift +++ b/test/SourceKit/Sema/sema_diag_after_edit-2.swift @@ -1,6 +1,6 @@ // RUN: %sourcekitd-test -req=open %s -- %s == -req=print-diags %s \ // RUN: == -req=edit -pos=7:1 -replace="" -length=1 %s == -req=print-diags %s \ -// RUN: | FileCheck -check-prefix=CHECK-DIAG %s +// RUN: | %FileCheck -check-prefix=CHECK-DIAG %s // CHECK-DIAG-NOT: key.offset class MyClass { diff --git a/test/SourceKit/Sema/sema_diag_after_edit.swift b/test/SourceKit/Sema/sema_diag_after_edit.swift index c438b24afc515..f316fb10b25af 100644 --- a/test/SourceKit/Sema/sema_diag_after_edit.swift +++ b/test/SourceKit/Sema/sema_diag_after_edit.swift @@ -1,11 +1,11 @@ let s : String = "f // RUN: %sourcekitd-test -req=open %s -- %s == \ -// RUN: -req=print-diags %s | FileCheck -check-prefix=CHECK-DIAG %s +// RUN: -req=print-diags %s | %FileCheck -check-prefix=CHECK-DIAG %s // CHECK-DIAG: key.severity: source.diagnostic.severity.error // Make sure that the diagnostic does not 'linger' after the edit is made. // RUN: %sourcekitd-test -req=open %s -- %s == -req=edit -pos=1:20 -replace="\"" -length=0 %s == \ // RUN: -req=print-diags %s > %t -// RUN: FileCheck -check-prefix=CHECK-NODIAG %s < %t +// RUN: %FileCheck -check-prefix=CHECK-NODIAG %s < %t // CHECK-NODIAG-NOT: key.severity: source.diagnostic.severity.error diff --git a/test/SourceKit/Sema/sema_diag_after_edit_fixit.swift b/test/SourceKit/Sema/sema_diag_after_edit_fixit.swift index 5b97ae0d7fddc..4d9f75a94c6b1 100644 --- a/test/SourceKit/Sema/sema_diag_after_edit_fixit.swift +++ b/test/SourceKit/Sema/sema_diag_after_edit_fixit.swift @@ -5,7 +5,7 @@ let a = 0; let b = 0 }; unresolved // RUN: %sourcekitd-test -req=open %s -- %s == -req=print-diags %s \ // RUN: == -req=edit -pos=2:1 -replace="_" -length=5 %s -print-raw-response \ -// RUN: | FileCheck %s +// RUN: | %FileCheck %s // CHECK: key.line: 2, // CHECK-NEXT: key.column: 5, diff --git a/test/SourceKit/Sema/sema_module.swift b/test/SourceKit/Sema/sema_module.swift index 50938af949202..cfc82d5390a9b 100644 --- a/test/SourceKit/Sema/sema_module.swift +++ b/test/SourceKit/Sema/sema_module.swift @@ -1,4 +1,4 @@ -// RUN: %sourcekitd-test -req=sema %s -- %s | FileCheck %s +// RUN: %sourcekitd-test -req=sema %s -- %s | %FileCheck %s Swift.String Swift // CHECK: key.kind: source.lang.swift.ref.struct, diff --git a/test/SourceKit/Sema/sema_unavailable.swift b/test/SourceKit/Sema/sema_unavailable.swift index 22ef82d505502..a6f7dead8c24a 100644 --- a/test/SourceKit/Sema/sema_unavailable.swift +++ b/test/SourceKit/Sema/sema_unavailable.swift @@ -1,4 +1,4 @@ -// RUN: %sourcekitd-test -req=sema %s -- %s| FileCheck %s +// RUN: %sourcekitd-test -req=sema %s -- %s| %FileCheck %s find([1,2,3], 1) // CHECK-NOT: source.lang.swift.ref.function.free diff --git a/test/SourceKit/Session/info_after_open.swift b/test/SourceKit/Session/info_after_open.swift index e867eb46f89a4..91e8245cdf25f 100644 --- a/test/SourceKit/Session/info_after_open.swift +++ b/test/SourceKit/Session/info_after_open.swift @@ -1,5 +1,5 @@ print("a") -// RUN: %sourcekitd-test -req=syntax-map %s == -req=cursor -pos=1:2 %s -- %s | FileCheck -check-prefix=CHECK1 %s +// RUN: %sourcekitd-test -req=syntax-map %s == -req=cursor -pos=1:2 %s -- %s | %FileCheck -check-prefix=CHECK1 %s // CHECK1: source.lang.swift.ref.function.free () // CHECK1-NEXT: print diff --git a/test/attr/accessibility_print.swift b/test/attr/accessibility_print.swift index 608833220c017..19a54ac660d80 100644 --- a/test/attr/accessibility_print.swift +++ b/test/attr/accessibility_print.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t -// RUN: %target-swift-ide-test -skip-deinit=false -print-ast-typechecked -print-accessibility -source-filename=%s | FileCheck %s -check-prefix=CHECK -check-prefix=CHECK-SRC +// RUN: %target-swift-ide-test -skip-deinit=false -print-ast-typechecked -print-accessibility -source-filename=%s | %FileCheck %s -check-prefix=CHECK -check-prefix=CHECK-SRC // RUN: %target-swift-frontend -emit-module-path %t/accessibility_print.swiftmodule %s -// RUN: %target-swift-ide-test -skip-deinit=false -print-module -print-accessibility -module-to-print=accessibility_print -I %t -source-filename=%s | FileCheck %s +// RUN: %target-swift-ide-test -skip-deinit=false -print-module -print-accessibility -module-to-print=accessibility_print -I %t -source-filename=%s | %FileCheck %s // This file uses alphabetic prefixes on its declarations because swift-ide-test // sorts decls in a module before printing them. diff --git a/test/attr/attr_autoclosure.swift b/test/attr/attr_autoclosure.swift index fa71173ba4c4d..ef16a1438d968 100644 --- a/test/attr/attr_autoclosure.swift +++ b/test/attr/attr_autoclosure.swift @@ -1,5 +1,5 @@ // RUN: %target-parse-verify-swift -// RUN: not %target-swift-frontend -parse %s 2>&1 | FileCheck %s +// RUN: not %target-swift-frontend -parse %s 2>&1 | %FileCheck %s // No errors at invalid locations! // CHECK-NOT: :0: diff --git a/test/attr/attr_dynamic_infer.swift b/test/attr/attr_dynamic_infer.swift index a7cd046d71e2d..fdc7b69d0135c 100644 --- a/test/attr/attr_dynamic_infer.swift +++ b/test/attr/attr_dynamic_infer.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -print-ast-typechecked -source-filename=%s -print-implicit-attrs -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-ide-test -print-ast-typechecked -source-filename=%s -print-implicit-attrs -disable-objc-attr-requires-foundation-module | %FileCheck %s @objc class Super { func baseFoo() {} diff --git a/test/attr/attr_fixed_layout.swift b/test/attr/attr_fixed_layout.swift index 2b0a26a693245..868ef7b34ced0 100644 --- a/test/attr/attr_fixed_layout.swift +++ b/test/attr/attr_fixed_layout.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -parse -dump-ast -enable-resilience %s 2>&1 | FileCheck --check-prefix=RESILIENCE-ON %s -// RUN: %target-swift-frontend -parse -dump-ast %s 2>&1 | FileCheck --check-prefix=RESILIENCE-OFF %s +// RUN: %target-swift-frontend -parse -dump-ast -enable-resilience %s 2>&1 | %FileCheck --check-prefix=RESILIENCE-ON %s +// RUN: %target-swift-frontend -parse -dump-ast %s 2>&1 | %FileCheck --check-prefix=RESILIENCE-OFF %s // // Public types with @_fixed_layout are always fixed layout diff --git a/test/attr/attr_ibaction_ios.swift b/test/attr/attr_ibaction_ios.swift index ac5255779e971..8f2130563f11c 100644 --- a/test/attr/attr_ibaction_ios.swift +++ b/test/attr/attr_ibaction_ios.swift @@ -1,4 +1,4 @@ -// RUN: not %target-build-swift -parse %s 2>&1 | FileCheck -check-prefix=CHECK-%target-os -check-prefix=CHECK-BOTH %s +// RUN: not %target-build-swift -parse %s 2>&1 | %FileCheck -check-prefix=CHECK-%target-os -check-prefix=CHECK-BOTH %s // REQUIRES: executable_test struct IntWrapper { diff --git a/test/attr/attr_objc.swift b/test/attr/attr_objc.swift index 5b773158aaa35..17b3886c7fe33 100644 --- a/test/attr/attr_objc.swift +++ b/test/attr/attr_objc.swift @@ -1,7 +1,7 @@ // RUN: %target-parse-verify-swift -// RUN: %target-swift-ide-test -skip-deinit=false -print-ast-typechecked -source-filename %s -function-definitions=true -prefer-type-repr=false -print-implicit-attrs=true -explode-pattern-binding-decls=true -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-ide-test -skip-deinit=false -print-ast-typechecked -source-filename %s -function-definitions=true -prefer-type-repr=false -print-implicit-attrs=true -explode-pattern-binding-decls=true -disable-objc-attr-requires-foundation-module | %FileCheck %s // RUN: not %target-swift-frontend -parse -dump-ast -disable-objc-attr-requires-foundation-module %s 2> %t.dump -// RUN: FileCheck -check-prefix CHECK-DUMP %s < %t.dump +// RUN: %FileCheck -check-prefix CHECK-DUMP %s < %t.dump // REQUIRES: objc_interop import Foundation diff --git a/test/attr/attr_objc_clang.swift b/test/attr/attr_objc_clang.swift index 7668aa27a147b..65f15acd1a96e 100644 --- a/test/attr/attr_objc_clang.swift +++ b/test/attr/attr_objc_clang.swift @@ -1,5 +1,5 @@ // RUN: %target-parse-verify-swift -sdk %S/Inputs -I %S/Inputs/custom-modules -I %S/../Inputs/custom-modules -// RUN: %target-swift-ide-test -print-ast-typechecked -source-filename %s -sdk %S/Inputs -I %S/Inputs/custom-modules -I %S/../Inputs/custom-modules -function-definitions=true -prefer-type-repr=false -print-implicit-attrs=true -explode-pattern-binding-decls=true -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-ide-test -print-ast-typechecked -source-filename %s -sdk %S/Inputs -I %S/Inputs/custom-modules -I %S/../Inputs/custom-modules -function-definitions=true -prefer-type-repr=false -print-implicit-attrs=true -explode-pattern-binding-decls=true -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/attr/attr_objc_foreign.swift b/test/attr/attr_objc_foreign.swift index 0350ae7c963ff..455a3ca50744a 100644 --- a/test/attr/attr_objc_foreign.swift +++ b/test/attr/attr_objc_foreign.swift @@ -1,5 +1,5 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse -verify %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-ast-typechecked -source-filename %s -function-definitions=true -prefer-type-repr=false -print-implicit-attrs=true -explode-pattern-binding-decls=true | FileCheck %s +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-ast-typechecked -source-filename %s -function-definitions=true -prefer-type-repr=false -print-implicit-attrs=true -explode-pattern-binding-decls=true | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/attr/attr_specialize.swift b/test/attr/attr_specialize.swift index cab921cc1dd1f..0432389967f41 100644 --- a/test/attr/attr_specialize.swift +++ b/test/attr/attr_specialize.swift @@ -1,5 +1,5 @@ // RUN: %target-parse-verify-swift -// RUN: %target-swift-ide-test -print-ast-typechecked -source-filename=%s -disable-objc-attr-requires-foundation-module | FileCheck %s +// RUN: %target-swift-ide-test -print-ast-typechecked -source-filename=%s -disable-objc-attr-requires-foundation-module | %FileCheck %s struct S {} diff --git a/test/decl/enum/objc_enum_multi_file.swift b/test/decl/enum/objc_enum_multi_file.swift index b130b5794ac7a..ffbc04ffbeda6 100644 --- a/test/decl/enum/objc_enum_multi_file.swift +++ b/test/decl/enum/objc_enum_multi_file.swift @@ -1,8 +1,8 @@ -// RUN: not %target-swift-frontend -module-name main %s -primary-file %S/Inputs/objc_enum_multi_file_helper.swift -parse -D NO_RAW_TYPE 2>&1 | FileCheck -check-prefix=NO_RAW_TYPE %s -// RUN: not %target-swift-frontend -module-name main %s -primary-file %S/Inputs/objc_enum_multi_file_helper.swift -parse -D BAD_RAW_TYPE 2>&1 | FileCheck -check-prefix=BAD_RAW_TYPE %s -// RUN: not %target-swift-frontend -module-name main %s -primary-file %S/Inputs/objc_enum_multi_file_helper.swift -parse -D NON_INT_RAW_TYPE 2>&1 | FileCheck -check-prefix=NON_INT_RAW_TYPE %s -// RUN: not %target-swift-frontend -module-name main %s -primary-file %S/Inputs/objc_enum_multi_file_helper.swift -parse -D NO_CASES 2>&1 | FileCheck -check-prefix=NO_CASES %s -// RUN: not %target-swift-frontend -module-name main %s -primary-file %S/Inputs/objc_enum_multi_file_helper.swift -parse -D DUPLICATE_CASES 2>&1 | FileCheck -check-prefix=DUPLICATE_CASES %s +// RUN: not %target-swift-frontend -module-name main %s -primary-file %S/Inputs/objc_enum_multi_file_helper.swift -parse -D NO_RAW_TYPE 2>&1 | %FileCheck -check-prefix=NO_RAW_TYPE %s +// RUN: not %target-swift-frontend -module-name main %s -primary-file %S/Inputs/objc_enum_multi_file_helper.swift -parse -D BAD_RAW_TYPE 2>&1 | %FileCheck -check-prefix=BAD_RAW_TYPE %s +// RUN: not %target-swift-frontend -module-name main %s -primary-file %S/Inputs/objc_enum_multi_file_helper.swift -parse -D NON_INT_RAW_TYPE 2>&1 | %FileCheck -check-prefix=NON_INT_RAW_TYPE %s +// RUN: not %target-swift-frontend -module-name main %s -primary-file %S/Inputs/objc_enum_multi_file_helper.swift -parse -D NO_CASES 2>&1 | %FileCheck -check-prefix=NO_CASES %s +// RUN: not %target-swift-frontend -module-name main %s -primary-file %S/Inputs/objc_enum_multi_file_helper.swift -parse -D DUPLICATE_CASES 2>&1 | %FileCheck -check-prefix=DUPLICATE_CASES %s // Note that the *other* file is the primary file in this test! #if NO_RAW_TYPE diff --git a/test/expr/capture/dynamic_self.swift b/test/expr/capture/dynamic_self.swift index ffd27a93a0454..3761eca8f798d 100644 --- a/test/expr/capture/dynamic_self.swift +++ b/test/expr/capture/dynamic_self.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -dump-ast %s 2>&1 | FileCheck %s +// RUN: %target-swift-frontend -dump-ast %s 2>&1 | %FileCheck %s // CHECK: func_decl "clone()" type='(Self) -> () -> Self' diff --git a/test/expr/capture/generic_params.swift b/test/expr/capture/generic_params.swift index d96c5636c3483..f23545d431a3a 100644 --- a/test/expr/capture/generic_params.swift +++ b/test/expr/capture/generic_params.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -dump-ast %s 2>&1 | FileCheck %s +// RUN: %target-swift-frontend -dump-ast %s 2>&1 | %FileCheck %s func doSomething(_ t: T) {} diff --git a/test/expr/capture/nested.swift b/test/expr/capture/nested.swift index 0fd289a442f74..eee92e21d40d4 100644 --- a/test/expr/capture/nested.swift +++ b/test/expr/capture/nested.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -dump-ast %s 2>&1 | FileCheck %s +// RUN: %target-swift-frontend -dump-ast %s 2>&1 | %FileCheck %s // CHECK: func_decl "foo2(_:)" func foo2(_ x: Int) -> (Int) -> (Int) -> Int { diff --git a/test/expr/capture/top-level-guard.swift b/test/expr/capture/top-level-guard.swift index e68bbc04930d9..cb75475ee5bd2 100644 --- a/test/expr/capture/top-level-guard.swift +++ b/test/expr/capture/top-level-guard.swift @@ -1,7 +1,7 @@ -// RUN: %target-swift-frontend -dump-ast %s 2>&1 | FileCheck %s +// RUN: %target-swift-frontend -dump-ast %s 2>&1 | %FileCheck %s // RUN: %target-swift-frontend -emit-ir %s > /dev/null -// RUN: %target-swift-frontend -dump-ast -DVAR %s 2>&1 | FileCheck %s +// RUN: %target-swift-frontend -dump-ast -DVAR %s 2>&1 | %FileCheck %s // RUN: %target-swift-frontend -emit-ir -DVAR %s > /dev/null // CHECK: (top_level_code_decl diff --git a/test/expr/cast/array_downcast_Foundation.swift b/test/expr/cast/array_downcast_Foundation.swift index 9e855d550bd8e..baa5c64e9256e 100644 --- a/test/expr/cast/array_downcast_Foundation.swift +++ b/test/expr/cast/array_downcast_Foundation.swift @@ -6,7 +6,7 @@ // FIXME: END -enable-source-import hackaround // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -parse %s -verify -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) %s -dump-ast -verify 2>&1 | FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) %s -dump-ast -verify 2>&1 | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/expr/unary/selector/fixits.swift b/test/expr/unary/selector/fixits.swift index a6a34e54ad6f5..c15d75c9fe92d 100644 --- a/test/expr/unary/selector/fixits.swift +++ b/test/expr/unary/selector/fixits.swift @@ -23,7 +23,7 @@ // RUN: %utils/apply-fixit-edits.py %t.remapping // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t.overlays) -parse %t.sources/fixits.swift 2> %t.result -// RUN: FileCheck %s < %t.result +// RUN: %FileCheck %s < %t.result // RUN: grep -c "warning:" %t.result | grep 3 // CHECK: warning: no method declared with Objective-C selector 'unknownMethodWithValue:label:' diff --git a/test/lit.cfg b/test/lit.cfg index bf064ef223d8c..95c7053912924 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -26,6 +26,7 @@ import sys import tempfile import socket import glob +import pipes import lit import lit.formats @@ -289,6 +290,7 @@ config.swift_utils = os.path.join(config.swift_src_root, 'utils') config.line_directive = os.path.join(config.swift_utils, 'line-directive') config.gyb = os.path.join(config.swift_utils, 'gyb') config.rth = os.path.join(config.swift_utils, 'rth') # Resilience test helper +config.PathSanitizingFileCheck = os.path.join(config.swift_utils, 'PathSanitizingFileCheck') config.swift_lib_dir = os.path.join(os.path.dirname(os.path.dirname(config.swift)), 'lib') # Find the resource directory. Assume it's near the swift compiler if not set. @@ -413,6 +415,7 @@ disallow('sil-extract') disallow('lldb-moduleimport-test') disallow('swift-ide-test') disallow('clang') +disallow('FileCheck') config.substitutions.insert(0, ('%p', @@ -998,6 +1001,14 @@ config.substitutions.append(('%target-resilience-test', config.target_resilience config.substitutions.append(('%llvm-profdata', config.llvm_profdata)) config.substitutions.append(('%llvm-cov', config.llvm_cov)) +config.substitutions.append( + ('%FileCheck', + '%s --sanitize \'BUILD_DIR=%s\' --sanitize \'SOURCE_DIR=%s\'' % + (config.PathSanitizingFileCheck, + pipes.quote(swift_obj_root), + pipes.quote(config.swift_src_root)))) +config.substitutions.append(('%raw-FileCheck', 'FileCheck')) + # If static stdlib is present, enable static stdlib tests static_stdlib_path = os.path.join(os.path.join(config.swift_lib_dir,"swift_static"), config.target_sdk_name) libswiftCore_path = os.path.join(static_stdlib_path,"libswiftCore.a") diff --git a/test/multifile/protocol-conformance-member.swift b/test/multifile/protocol-conformance-member.swift index faf848b53063f..7e696110fd00e 100644 --- a/test/multifile/protocol-conformance-member.swift +++ b/test/multifile/protocol-conformance-member.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-build-swift -emit-library %s %S/Inputs/protocol-conformance-member-helper.swift -o %t/libTest.dylib -module-name Test -// RUN: llvm-nm %t/libTest.dylib | FileCheck %s +// RUN: llvm-nm %t/libTest.dylib | %FileCheck %s // CHECK: _TFV4Test10CoolStructg10coolFactorSd diff --git a/test/sil-extract/basic.sil b/test/sil-extract/basic.sil index 65b5ed730f788..91b9aac3b1c78 100644 --- a/test/sil-extract/basic.sil +++ b/test/sil-extract/basic.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-extract %s -func=use_before_init | FileCheck %s +// RUN: %target-sil-extract %s -func=use_before_init | %FileCheck %s import Builtin import Swift diff --git a/test/sil-extract/basic.swift b/test/sil-extract/basic.swift index 6891af78088f7..75a3145029af2 100644 --- a/test/sil-extract/basic.swift +++ b/test/sil-extract/basic.swift @@ -1,16 +1,16 @@ // Passing demangled name -// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-extract -module-name basic -func="basic.foo" | FileCheck %s -check-prefix=EXTRACT-FOO -// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-extract -module-name basic -func="basic.X.test" | FileCheck %s -check-prefix=EXTRACT-TEST -// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-extract -module-name basic -func="basic.Vehicle.init" | FileCheck %s -check-prefix=EXTRACT-INIT -// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-extract -module-name basic -func="basic.Vehicle.now" | FileCheck %s -check-prefix=EXTRACT-NOW +// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-extract -module-name basic -func="basic.foo" | %FileCheck %s -check-prefix=EXTRACT-FOO +// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-extract -module-name basic -func="basic.X.test" | %FileCheck %s -check-prefix=EXTRACT-TEST +// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-extract -module-name basic -func="basic.Vehicle.init" | %FileCheck %s -check-prefix=EXTRACT-INIT +// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-extract -module-name basic -func="basic.Vehicle.now" | %FileCheck %s -check-prefix=EXTRACT-NOW // Passing mangled name -// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-extract -module-name basic -func="_TF5basic3fooFT_Si" | FileCheck %s -check-prefix=EXTRACT-FOO -// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-extract -module-name basic -func="_TFV5basic1X4testfT_T_" | FileCheck %s -check-prefix=EXTRACT-TEST -// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-extract -module-name basic -func="_TFC5basic7VehiclecfT1nSi_S0_" | FileCheck %s -check-prefix=EXTRACT-INIT -// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-extract -module-name basic -func="_TFC5basic7Vehicle3nowfT_Si" | FileCheck %s -check-prefix=EXTRACT-NOW +// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-extract -module-name basic -func="_TF5basic3fooFT_Si" | %FileCheck %s -check-prefix=EXTRACT-FOO +// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-extract -module-name basic -func="_TFV5basic1X4testfT_T_" | %FileCheck %s -check-prefix=EXTRACT-TEST +// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-extract -module-name basic -func="_TFC5basic7VehiclecfT1nSi_S0_" | %FileCheck %s -check-prefix=EXTRACT-INIT +// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-extract -module-name basic -func="_TFC5basic7Vehicle3nowfT_Si" | %FileCheck %s -check-prefix=EXTRACT-NOW // EXTRACT-FOO-NOT: sil hidden @_TFV5basic1X4testfT_T_ : $@convention(method) (X) -> () { diff --git a/test/sil-extract/load-serialized-sil.swift b/test/sil-extract/load-serialized-sil.swift index fed1773398332..f9133b744b12b 100644 --- a/test/sil-extract/load-serialized-sil.swift +++ b/test/sil-extract/load-serialized-sil.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -primary-file %s -module-name Swift -g -sil-serialize-all -module-link-name swiftCore -O -parse-as-library -parse-stdlib -emit-module -emit-module-path - -o /dev/null | %target-sil-extract -module-name="Swift" -func="_TFVs1X4testfT_T_" | FileCheck %s -// RUN: %target-swift-frontend -primary-file %s -module-name Swift -g -O -parse-as-library -parse-stdlib -emit-sib -o - | %target-sil-extract -module-name="Swift" -func="_TFVs1X4testfT_T_" | FileCheck %s -check-prefix=SIB-CHECK +// RUN: %target-swift-frontend -primary-file %s -module-name Swift -g -sil-serialize-all -module-link-name swiftCore -O -parse-as-library -parse-stdlib -emit-module -emit-module-path - -o /dev/null | %target-sil-extract -module-name="Swift" -func="_TFVs1X4testfT_T_" | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -module-name Swift -g -O -parse-as-library -parse-stdlib -emit-sib -o - | %target-sil-extract -module-name="Swift" -func="_TFVs1X4testfT_T_" | %FileCheck %s -check-prefix=SIB-CHECK // CHECK: import Builtin // CHECK: import Swift diff --git a/test/sil-opt/sil-opt.swift b/test/sil-opt/sil-opt.swift index af972df319918..68d408e342277 100644 --- a/test/sil-opt/sil-opt.swift +++ b/test/sil-opt/sil-opt.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -primary-file %s -module-name Swift -g -sil-serialize-all -module-link-name swiftCore -O -parse-as-library -parse-stdlib -emit-module -emit-module-path - -o /dev/null | %target-sil-opt -enable-sil-verify-all -module-name="Swift" | FileCheck %s -// RUN: %target-swift-frontend -primary-file %s -module-name Swift -g -O -parse-as-library -parse-stdlib -emit-sib -o - | %target-sil-opt -enable-sil-verify-all -module-name="Swift" | FileCheck %s -check-prefix=SIB-CHECK +// RUN: %target-swift-frontend -primary-file %s -module-name Swift -g -sil-serialize-all -module-link-name swiftCore -O -parse-as-library -parse-stdlib -emit-module -emit-module-path - -o /dev/null | %target-sil-opt -enable-sil-verify-all -module-name="Swift" | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -module-name Swift -g -O -parse-as-library -parse-stdlib -emit-sib -o - | %target-sil-opt -enable-sil-verify-all -module-name="Swift" | %FileCheck %s -check-prefix=SIB-CHECK // CHECK: import Builtin // CHECK: import Swift diff --git a/utils/PathSanitizingFileCheck b/utils/PathSanitizingFileCheck new file mode 100755 index 0000000000000..4c3ae3ab12e12 --- /dev/null +++ b/utils/PathSanitizingFileCheck @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# utils/PathSanitizingFileCheck -*- python -*- +# +# This source file is part of the Swift.org open source project +# +# Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors +# Licensed under Apache License v2.0 with Runtime Library Exception +# +# See http://swift.org/LICENSE.txt for license information +# See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors + +from __future__ import print_function + +import argparse +import subprocess +import sys + +def main(): + parser = argparse.ArgumentParser( + formatter_class=argparse.RawDescriptionHelpFormatter, + description=""" +PathSanitizingFileCheck is a wrapper around LLVM's FileCheck. In addition +to all FileCheck features, PathSanitizingFileCheck can replace given +strings in the input with other strings. This feature is used to replace +paths to the source and build directories with path-independent +constants.""") + + parser.add_argument( + "--sanitize", + help="replace the given string with another string", + metavar="REPLACEMENT=SOURCE", + action="append", + dest="sanitize_strings", + default=[]) + + args, unknown_args = parser.parse_known_args() + + stdin = sys.stdin.read() + for s in args.sanitize_strings: + replacement, pattern = s.split('=', 1) + stdin = stdin.replace(pattern, replacement) + + p = subprocess.Popen(["FileCheck"] + unknown_args, stdin=subprocess.PIPE) + stdout, stderr = p.communicate(stdin) + if stdout is not None: + print(stdout) + if stderr is not None: + print(stderr, file=sys.stderr) + return p.wait() + + +if __name__ == '__main__': + exit(main()) + diff --git a/validation-test/Driver/Dependencies/rdar25405605.swift b/validation-test/Driver/Dependencies/rdar25405605.swift index 7d29f7bfa8399..f7408d832ed44 100644 --- a/validation-test/Driver/Dependencies/rdar25405605.swift +++ b/validation-test/Driver/Dependencies/rdar25405605.swift @@ -4,7 +4,7 @@ // RUN: cp %S/Inputs/rdar25405605/helper-1.swift %t/helper.swift // RUN: touch -t 201401240005 %t/*.swift -// RUN: cd %t && %target-build-swift -c -incremental -output-file-map %S/Inputs/rdar25405605/output.json -parse-as-library ./main.swift ./helper.swift -parseable-output -j1 -module-name main 2>&1 | FileCheck -check-prefix=CHECK-1 %s +// RUN: cd %t && %target-build-swift -c -incremental -output-file-map %S/Inputs/rdar25405605/output.json -parse-as-library ./main.swift ./helper.swift -parseable-output -j1 -module-name main 2>&1 | %FileCheck -check-prefix=CHECK-1 %s // CHECK-1-NOT: warning // CHECK-1: {{^{$}} @@ -19,12 +19,12 @@ // CHECK-1: ".\/helper.swift" // CHECK-1: {{^}$}} -// RUN: ls %t/ | FileCheck -check-prefix=CHECK-LS %s +// RUN: ls %t/ | %FileCheck -check-prefix=CHECK-LS %s // CHECK-LS-DAG: main.o // CHECK-LS-DAG: helper.o -// RUN: cd %t && %target-build-swift -c -incremental -output-file-map %S/Inputs/rdar25405605/output.json -parse-as-library ./main.swift ./helper.swift -parseable-output -j1 -module-name main 2>&1 | FileCheck -check-prefix=CHECK-1-SKIPPED %s +// RUN: cd %t && %target-build-swift -c -incremental -output-file-map %S/Inputs/rdar25405605/output.json -parse-as-library ./main.swift ./helper.swift -parseable-output -j1 -module-name main 2>&1 | %FileCheck -check-prefix=CHECK-1-SKIPPED %s // CHECK-1-SKIPPED-NOT: warning // CHECK-1-SKIPPED: {{^{$}} @@ -41,7 +41,7 @@ // RUN: cp %S/Inputs/rdar25405605/helper-2.swift %t/helper.swift // RUN: touch -t 201401240006 %t/helper.swift -// RUN: cd %t && not %target-build-swift -c -incremental -output-file-map %S/Inputs/rdar25405605/output.json -parse-as-library ./main.swift ./helper.swift -parseable-output -j1 -module-name main 2>&1 | FileCheck -check-prefix=CHECK-2 %s +// RUN: cd %t && not %target-build-swift -c -incremental -output-file-map %S/Inputs/rdar25405605/output.json -parse-as-library ./main.swift ./helper.swift -parseable-output -j1 -module-name main 2>&1 | %FileCheck -check-prefix=CHECK-2 %s // CHECK-2-NOT: warning // CHECK-2: {{^{$}} @@ -58,7 +58,7 @@ // RUN: cp %S/Inputs/rdar25405605/helper-3.swift %t/helper.swift // RUN: touch -t 201401240007 %t/helper.swift -// RUN: cd %t && not %target-build-swift -c -incremental -output-file-map %S/Inputs/rdar25405605/output.json -parse-as-library ./main.swift ./helper.swift -parseable-output -j1 -module-name main 2>&1 | FileCheck -check-prefix=CHECK-3 %s +// RUN: cd %t && not %target-build-swift -c -incremental -output-file-map %S/Inputs/rdar25405605/output.json -parse-as-library ./main.swift ./helper.swift -parseable-output -j1 -module-name main 2>&1 | %FileCheck -check-prefix=CHECK-3 %s // CHECK-3-NOT: warning // CHECK-3: {{^{$}} diff --git a/validation-test/Driver/many-inputs.swift b/validation-test/Driver/many-inputs.swift index 88ef3d7bb4258..3db862a46fa27 100644 --- a/validation-test/Driver/many-inputs.swift +++ b/validation-test/Driver/many-inputs.swift @@ -5,16 +5,16 @@ // RUN: for i in {1..1100}; do echo "public func foo$i() {}" > %t/$i.swift; echo "CHECK: foo$i" >> %t/check.txt; done // RUN: (cd %t && %target-build-swift -force-single-frontend-invocation -emit-library ./*.swift -o ./libWMO) -// RUN: nm %t/libWMO | FileCheck %t/check.txt +// RUN: nm %t/libWMO | %FileCheck %t/check.txt // RUN: (cd %t && %target-build-swift -force-single-frontend-invocation -num-threads 1 -emit-library ./*.swift -o ./libWMOThreaded) -// RUN: nm %t/libWMOThreaded | FileCheck %t/check.txt +// RUN: nm %t/libWMOThreaded | %FileCheck %t/check.txt // This is very slow due to process overhead. It's also doing one file at a time // because we don't have a good way for lit tests to claim more than one thread. // But it's still important to check. // RUN: (cd %t && %target-build-swift -emit-library ./*.swift -o ./libMultiFile) -// RUN: nm %t/libMultiFile | FileCheck %t/check.txt +// RUN: nm %t/libMultiFile | %FileCheck %t/check.txt // REQUIRES: long_test // REQUIRES: executable_test diff --git a/validation-test/IDE/complete_from_cocoa.swift b/validation-test/IDE/complete_from_cocoa.swift index 2a9fa48c6ff5a..e392023ff2198 100644 --- a/validation-test/IDE/complete_from_cocoa.swift +++ b/validation-test/IDE/complete_from_cocoa.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=T1 | FileCheck %s -check-prefix=T1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=T1 | %FileCheck %s -check-prefix=T1 // REQUIRES: objc_interop // REQUIRES: no_asan diff --git a/validation-test/IDE/complete_from_cocoa_2.swift b/validation-test/IDE/complete_from_cocoa_2.swift index e35e0ea44ca8b..b0236426fc7ee 100644 --- a/validation-test/IDE/complete_from_cocoa_2.swift +++ b/validation-test/IDE/complete_from_cocoa_2.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=T1 | FileCheck %s -check-prefix=T1 -// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=T2 | FileCheck %s -check-prefix=T2 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=T1 | %FileCheck %s -check-prefix=T1 +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=T2 | %FileCheck %s -check-prefix=T2 // REQUIRES: objc_interop diff --git a/validation-test/IDE/complete_repl_from_cocoa.swift b/validation-test/IDE/complete_repl_from_cocoa.swift index 6bd8ff0ad8739..f3a641f48428d 100644 --- a/validation-test/IDE/complete_repl_from_cocoa.swift +++ b/validation-test/IDE/complete_repl_from_cocoa.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -repl-code-completion -source-filename %s | FileCheck %s +// RUN: %target-swift-ide-test -repl-code-completion -source-filename %s | %FileCheck %s // A smoketest for REPL code completion in Cocoa. diff --git a/validation-test/IDE/crashers_fixed/009-swift-performdelayedparsing.swift b/validation-test/IDE/crashers_fixed/009-swift-performdelayedparsing.swift index 7e23cbca62981..86e6576c43c4c 100644 --- a/validation-test/IDE/crashers_fixed/009-swift-performdelayedparsing.swift +++ b/validation-test/IDE/crashers_fixed/009-swift-performdelayedparsing.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s | FileCheck %s +// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s | %FileCheck %s enum b:a{var f={static#^A^# // FIXME: we shouldn't back the parser to the beginning of the line, it leads // to ridiculous override completions like this. diff --git a/validation-test/IDE/crashers_fixed/063-swift-generictypeparamtype-get.swift b/validation-test/IDE/crashers_fixed/063-swift-generictypeparamtype-get.swift index 9e3a3c4e1b17d..a5784a24551f8 100644 --- a/validation-test/IDE/crashers_fixed/063-swift-generictypeparamtype-get.swift +++ b/validation-test/IDE/crashers_fixed/063-swift-generictypeparamtype-get.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s | FileCheck %s +// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s | %FileCheck %s {protocol A{func b }enum B:A{let s=b let A{#^A^# diff --git a/validation-test/IDE/crashers_fixed/assign-anyobject.swift b/validation-test/IDE/crashers_fixed/assign-anyobject.swift index f506fccbbb177..501c941adeb4e 100644 --- a/validation-test/IDE/crashers_fixed/assign-anyobject.swift +++ b/validation-test/IDE/crashers_fixed/assign-anyobject.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s | FileCheck %s +// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s | %FileCheck %s var bar: AnyObject var foo: AnyObject foo = #^A^# diff --git a/validation-test/IDE/crashers_fixed/extension-protocol-composition.swift b/validation-test/IDE/crashers_fixed/extension-protocol-composition.swift index fe88e46890c6a..34844ce193141 100644 --- a/validation-test/IDE/crashers_fixed/extension-protocol-composition.swift +++ b/validation-test/IDE/crashers_fixed/extension-protocol-composition.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s | FileCheck %s -// RUN: %target-swift-ide-test -code-completion -code-completion-token=B -source-filename=%s | FileCheck %s +// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s | %FileCheck %s +// RUN: %target-swift-ide-test -code-completion -code-completion-token=B -source-filename=%s | %FileCheck %s typealias X = protocol typealias Y = protocol diff --git a/validation-test/IDE/crashers_fixed/subexpr-literal-in-sequence-expr.swift b/validation-test/IDE/crashers_fixed/subexpr-literal-in-sequence-expr.swift index 8706f0b29e0ff..093624a650c34 100644 --- a/validation-test/IDE/crashers_fixed/subexpr-literal-in-sequence-expr.swift +++ b/validation-test/IDE/crashers_fixed/subexpr-literal-in-sequence-expr.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s | FileCheck %s -// RUN: %target-swift-ide-test -code-completion -code-completion-token=B -source-filename=%s | FileCheck %s +// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s | %FileCheck %s +// RUN: %target-swift-ide-test -code-completion -code-completion-token=B -source-filename=%s | %FileCheck %s func test1() { 1 + [0]#^A^# diff --git a/validation-test/Python/gyb.swift b/validation-test/Python/gyb.swift index 1852f6117c8f1..8e0ff6cb24764 100644 --- a/validation-test/Python/gyb.swift +++ b/validation-test/Python/gyb.swift @@ -1,4 +1,4 @@ // RUN: %{python} -m doctest %utils/gyb.py -// RUN: echo 'Hello ${ME}' | %gyb --test -DME=Swift | FileCheck %s -// RUN: echo 'Hello ${ME}' | %gyb --verbose-test -DME=Swift | FileCheck %s +// RUN: echo 'Hello ${ME}' | %gyb --test -DME=Swift | %FileCheck %s +// RUN: echo 'Hello ${ME}' | %gyb --verbose-test -DME=Swift | %FileCheck %s // CHECK: Hello Swift diff --git a/validation-test/Reflection/existentials.swift b/validation-test/Reflection/existentials.swift index aff16c4553317..fba79b55ea6c0 100644 --- a/validation-test/Reflection/existentials.swift +++ b/validation-test/Reflection/existentials.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/existentials -// RUN: %target-run %target-swift-reflection-test %t/existentials | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/existentials | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/functions.swift b/validation-test/Reflection/functions.swift index 0db5700f5b5b6..da2c2ff0fcce8 100644 --- a/validation-test/Reflection/functions.swift +++ b/validation-test/Reflection/functions.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/functions -// RUN: %target-run %target-swift-reflection-test %t/functions | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/functions | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize // FIXME: Should not require objc_interop -- please put Objective-C-specific // testcases in functions_objc.swift diff --git a/validation-test/Reflection/functions_objc.swift b/validation-test/Reflection/functions_objc.swift index 062c8032a4f19..6e6139bf2bc81 100644 --- a/validation-test/Reflection/functions_objc.swift +++ b/validation-test/Reflection/functions_objc.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/functions -// RUN: %target-run %target-swift-reflection-test %t/functions | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/functions | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/inherits_NSObject.swift b/validation-test/Reflection/inherits_NSObject.swift index c4c073e1f763b..d82ff7cb138f8 100644 --- a/validation-test/Reflection/inherits_NSObject.swift +++ b/validation-test/Reflection/inherits_NSObject.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/inherits_NSObject -// RUN: %target-run %target-swift-reflection-test %t/inherits_NSObject | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/inherits_NSObject | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_Array.swift b/validation-test/Reflection/reflect_Array.swift index 10f61e6a25182..38914c7374419 100644 --- a/validation-test/Reflection/reflect_Array.swift +++ b/validation-test/Reflection/reflect_Array.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_Array -// RUN: %target-run %target-swift-reflection-test %t/reflect_Array 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_Array 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_Bool.swift b/validation-test/Reflection/reflect_Bool.swift index 8fd86daba8feb..8e67e2c3319aa 100644 --- a/validation-test/Reflection/reflect_Bool.swift +++ b/validation-test/Reflection/reflect_Bool.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_Bool -// RUN: %target-run %target-swift-reflection-test %t/reflect_Bool 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_Bool 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_Character.swift b/validation-test/Reflection/reflect_Character.swift index 6665bf6225a81..3d16f73c50f9c 100644 --- a/validation-test/Reflection/reflect_Character.swift +++ b/validation-test/Reflection/reflect_Character.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_Character -// RUN: %target-run %target-swift-reflection-test %t/reflect_Character 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_Character 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_Dictionary.swift b/validation-test/Reflection/reflect_Dictionary.swift index 87f4672958992..063ead6260bba 100644 --- a/validation-test/Reflection/reflect_Dictionary.swift +++ b/validation-test/Reflection/reflect_Dictionary.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_Dictionary -// RUN: %target-run %target-swift-reflection-test %t/reflect_Dictionary 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_Dictionary 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_Double.swift b/validation-test/Reflection/reflect_Double.swift index c15df5bbd1678..9a0e5c3b36254 100644 --- a/validation-test/Reflection/reflect_Double.swift +++ b/validation-test/Reflection/reflect_Double.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_Double -// RUN: %target-run %target-swift-reflection-test %t/reflect_Double 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_Double 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_Float.swift b/validation-test/Reflection/reflect_Float.swift index 1f5fa1d8b6640..15f6ac732ebf3 100644 --- a/validation-test/Reflection/reflect_Float.swift +++ b/validation-test/Reflection/reflect_Float.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_Float -// RUN: %target-run %target-swift-reflection-test %t/reflect_Float 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_Float 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_Int.swift b/validation-test/Reflection/reflect_Int.swift index 80e4b01e1f161..4fe4e205151fc 100644 --- a/validation-test/Reflection/reflect_Int.swift +++ b/validation-test/Reflection/reflect_Int.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_Int -// RUN: %target-run %target-swift-reflection-test %t/reflect_Int 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_Int 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_Int16.swift b/validation-test/Reflection/reflect_Int16.swift index 46e7b6c44a66f..2e5bbceb9af22 100644 --- a/validation-test/Reflection/reflect_Int16.swift +++ b/validation-test/Reflection/reflect_Int16.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_Int16 -// RUN: %target-run %target-swift-reflection-test %t/reflect_Int16 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_Int16 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_Int32.swift b/validation-test/Reflection/reflect_Int32.swift index 08bf4a9d6f1f6..dc9b693f31add 100644 --- a/validation-test/Reflection/reflect_Int32.swift +++ b/validation-test/Reflection/reflect_Int32.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_Int32 -// RUN: %target-run %target-swift-reflection-test %t/reflect_Int32 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_Int32 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_Int64.swift b/validation-test/Reflection/reflect_Int64.swift index a51aad1217b42..dc924359ecaa4 100644 --- a/validation-test/Reflection/reflect_Int64.swift +++ b/validation-test/Reflection/reflect_Int64.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_Int64 -// RUN: %target-run %target-swift-reflection-test %t/reflect_Int64 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_Int64 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_Int8.swift b/validation-test/Reflection/reflect_Int8.swift index ae9ccc4fd43dc..e6437313ce5ea 100644 --- a/validation-test/Reflection/reflect_Int8.swift +++ b/validation-test/Reflection/reflect_Int8.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_Int8 -// RUN: %target-run %target-swift-reflection-test %t/reflect_Int8 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_Int8 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_NSArray.swift b/validation-test/Reflection/reflect_NSArray.swift index 4bb099a6f6cba..b882e59813316 100644 --- a/validation-test/Reflection/reflect_NSArray.swift +++ b/validation-test/Reflection/reflect_NSArray.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_NSArray -// RUN: %target-run %target-swift-reflection-test %t/reflect_NSArray 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_NSArray 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_NSNumber.swift b/validation-test/Reflection/reflect_NSNumber.swift index df292302dff4a..d225ace3333cf 100644 --- a/validation-test/Reflection/reflect_NSNumber.swift +++ b/validation-test/Reflection/reflect_NSNumber.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_NSNumber -// RUN: %target-run %target-swift-reflection-test %t/reflect_NSNumber 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_NSNumber 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_NSSet.swift b/validation-test/Reflection/reflect_NSSet.swift index 840f251e3a952..e869d1b62b35c 100644 --- a/validation-test/Reflection/reflect_NSSet.swift +++ b/validation-test/Reflection/reflect_NSSet.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_NSSet -// RUN: %target-run %target-swift-reflection-test %t/reflect_NSSet 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_NSSet 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_NSString.swift b/validation-test/Reflection/reflect_NSString.swift index 32cbb454bba79..15d349c254355 100644 --- a/validation-test/Reflection/reflect_NSString.swift +++ b/validation-test/Reflection/reflect_NSString.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_NSString -// RUN: %target-run %target-swift-reflection-test %t/reflect_NSString 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_NSString 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_Set.swift b/validation-test/Reflection/reflect_Set.swift index 07e962d056fdd..acc57f4bee3a7 100644 --- a/validation-test/Reflection/reflect_Set.swift +++ b/validation-test/Reflection/reflect_Set.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_Set -// RUN: %target-run %target-swift-reflection-test %t/reflect_Set 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_Set 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_String.swift b/validation-test/Reflection/reflect_String.swift index 6bcc4d2834a3c..ab59a7927e6f2 100644 --- a/validation-test/Reflection/reflect_String.swift +++ b/validation-test/Reflection/reflect_String.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_String -// RUN: %target-run %target-swift-reflection-test %t/reflect_String 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_String 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_UInt.swift b/validation-test/Reflection/reflect_UInt.swift index 82596a5de82e6..71ad6c82436cf 100644 --- a/validation-test/Reflection/reflect_UInt.swift +++ b/validation-test/Reflection/reflect_UInt.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_UInt -// RUN: %target-run %target-swift-reflection-test %t/reflect_UInt 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_UInt 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_UInt16.swift b/validation-test/Reflection/reflect_UInt16.swift index d118b287a33cf..9229b5b95dc06 100644 --- a/validation-test/Reflection/reflect_UInt16.swift +++ b/validation-test/Reflection/reflect_UInt16.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_UInt16 -// RUN: %target-run %target-swift-reflection-test %t/reflect_UInt16 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_UInt16 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_UInt32.swift b/validation-test/Reflection/reflect_UInt32.swift index 6ae2abfeca3c9..2ebfc4451da7f 100644 --- a/validation-test/Reflection/reflect_UInt32.swift +++ b/validation-test/Reflection/reflect_UInt32.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_UInt32 -// RUN: %target-run %target-swift-reflection-test %t/reflect_UInt32 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_UInt32 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_UInt64.swift b/validation-test/Reflection/reflect_UInt64.swift index 7b8c39e05f8e0..0f528771e9556 100644 --- a/validation-test/Reflection/reflect_UInt64.swift +++ b/validation-test/Reflection/reflect_UInt64.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_UInt64 -// RUN: %target-run %target-swift-reflection-test %t/reflect_UInt64 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_UInt64 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_UInt8.swift b/validation-test/Reflection/reflect_UInt8.swift index 7838ab6f6c7c6..f9f991cbc3074 100644 --- a/validation-test/Reflection/reflect_UInt8.swift +++ b/validation-test/Reflection/reflect_UInt8.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_UInt8 -// RUN: %target-run %target-swift-reflection-test %t/reflect_UInt8 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_UInt8 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_empty_class.swift b/validation-test/Reflection/reflect_empty_class.swift index fb0bd977cba62..55b42d6f91d91 100644 --- a/validation-test/Reflection/reflect_empty_class.swift +++ b/validation-test/Reflection/reflect_empty_class.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_empty_class -// RUN: %target-run %target-swift-reflection-test %t/reflect_empty_class 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_empty_class 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/Reflection/reflect_multiple_types.swift b/validation-test/Reflection/reflect_multiple_types.swift index b6a43154ae670..51a51bdc22b92 100644 --- a/validation-test/Reflection/reflect_multiple_types.swift +++ b/validation-test/Reflection/reflect_multiple_types.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_multiple_types -// RUN: %target-run %target-swift-reflection-test %t/reflect_multiple_types 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_multiple_types 2>&1 | %FileCheck %s --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // REQUIRES: executable_test diff --git a/validation-test/SIL/verify_all_overlays.sil b/validation-test/SIL/verify_all_overlays.sil index caa86c6fb1474..424e9d5b7e040 100644 --- a/validation-test/SIL/verify_all_overlays.sil +++ b/validation-test/SIL/verify_all_overlays.sil @@ -1,4 +1,4 @@ -// RUN: for x in %platform-sdk-overlay-dir/*.swiftmodule; do [[ $(basename "$x") = Swift.swiftmodule ]] && continue; llvm-bcanalyzer $x | FileCheck %s; %target-sil-opt -sdk %sdk -enable-sil-verify-all $x > /dev/null; done +// RUN: for x in %platform-sdk-overlay-dir/*.swiftmodule; do [[ $(basename "$x") = Swift.swiftmodule ]] && continue; llvm-bcanalyzer $x | %FileCheck %s; %target-sil-opt -sdk %sdk -enable-sil-verify-all $x > /dev/null; done // CHECK-NOT: Unknown diff --git a/validation-test/StdlibUnittest/Android.swift b/validation-test/StdlibUnittest/Android.swift index 025695293cd6a..3ed3e5f9c4caa 100644 --- a/validation-test/StdlibUnittest/Android.swift +++ b/validation-test/StdlibUnittest/Android.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-stdlib-swift | FileCheck %s +// RUN: %target-run-stdlib-swift | %FileCheck %s // REQUIRES: executable_test import Swift diff --git a/validation-test/StdlibUnittest/CheckEquatable.swift.gyb b/validation-test/StdlibUnittest/CheckEquatable.swift.gyb index 825baf2274a13..8487bcdde8262 100644 --- a/validation-test/StdlibUnittest/CheckEquatable.swift.gyb +++ b/validation-test/StdlibUnittest/CheckEquatable.swift.gyb @@ -1,5 +1,5 @@ // RUN: %target-run-simple-swiftgyb > %t.stdout 2>&1 -// RUN: FileCheck %s < %t.stdout +// RUN: %FileCheck %s < %t.stdout // REQUIRES: executable_test import StdlibUnittest diff --git a/validation-test/StdlibUnittest/ChildProcessShutdown/FailIfChildCrashesDuringShutdown.swift b/validation-test/StdlibUnittest/ChildProcessShutdown/FailIfChildCrashesDuringShutdown.swift index 4e3e271720b37..7d9ba05a633aa 100644 --- a/validation-test/StdlibUnittest/ChildProcessShutdown/FailIfChildCrashesDuringShutdown.swift +++ b/validation-test/StdlibUnittest/ChildProcessShutdown/FailIfChildCrashesDuringShutdown.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift 2>&1 | FileCheck %s +// RUN: %target-run-simple-swift 2>&1 | %FileCheck %s // REQUIRES: executable_test import StdlibUnittest diff --git a/validation-test/StdlibUnittest/ChildProcessShutdown/FailIfChildExitsDuringShutdown.swift b/validation-test/StdlibUnittest/ChildProcessShutdown/FailIfChildExitsDuringShutdown.swift index 7f6a79559fa32..25334f2a39b31 100644 --- a/validation-test/StdlibUnittest/ChildProcessShutdown/FailIfChildExitsDuringShutdown.swift +++ b/validation-test/StdlibUnittest/ChildProcessShutdown/FailIfChildExitsDuringShutdown.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift 2>&1 | FileCheck %s +// RUN: %target-run-simple-swift 2>&1 | %FileCheck %s // REQUIRES: executable_test import StdlibUnittest diff --git a/validation-test/StdlibUnittest/CommandLine.swift b/validation-test/StdlibUnittest/CommandLine.swift index 9ca9fe5b9a5bb..db639092a3bdf 100644 --- a/validation-test/StdlibUnittest/CommandLine.swift +++ b/validation-test/StdlibUnittest/CommandLine.swift @@ -1,9 +1,9 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-build-swift %s -o %t/main.out -// RUN: %target-run %t/main.out | FileCheck -check-prefix=CHECK-EMPTY %s -// RUN: %target-run %t/main.out --abc | FileCheck -check-prefix=CHECK-1 %s -// RUN: %target-run %t/main.out --abc def | FileCheck -check-prefix=CHECK-2 %s -// RUN: %target-run %t/main.out a --bcd efghijk | FileCheck -check-prefix=CHECK-3 %s +// RUN: %target-run %t/main.out | %FileCheck -check-prefix=CHECK-EMPTY %s +// RUN: %target-run %t/main.out --abc | %FileCheck -check-prefix=CHECK-1 %s +// RUN: %target-run %t/main.out --abc def | %FileCheck -check-prefix=CHECK-2 %s +// RUN: %target-run %t/main.out a --bcd efghijk | %FileCheck -check-prefix=CHECK-3 %s // REQUIRES: executable_test import StdlibUnittest diff --git a/validation-test/StdlibUnittest/Common.swift b/validation-test/StdlibUnittest/Common.swift index 8f8bc89c90933..b8521ae1e830c 100644 --- a/validation-test/StdlibUnittest/Common.swift +++ b/validation-test/StdlibUnittest/Common.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test import SwiftPrivate diff --git a/validation-test/StdlibUnittest/CrashingTests.swift b/validation-test/StdlibUnittest/CrashingTests.swift index 2398ae7a2541c..127584944cfcd 100644 --- a/validation-test/StdlibUnittest/CrashingTests.swift +++ b/validation-test/StdlibUnittest/CrashingTests.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift 2>&1 | FileCheck %s +// RUN: %target-run-simple-swift 2>&1 | %FileCheck %s // REQUIRES: executable_test import StdlibUnittest diff --git a/validation-test/StdlibUnittest/Filter.swift b/validation-test/StdlibUnittest/Filter.swift index 14c188921c7a7..1a2d41ba2d6ff 100644 --- a/validation-test/StdlibUnittest/Filter.swift +++ b/validation-test/StdlibUnittest/Filter.swift @@ -1,6 +1,6 @@ // RUN: %target-build-swift %s -o %t.out -// RUN: %target-run %t.out --stdlib-unittest-filter abc | FileCheck --check-prefix=CHECK-ABC %s -// RUN: %target-run %t.out --stdlib-unittest-filter xyz | FileCheck --check-prefix=CHECK-XYZ %s +// RUN: %target-run %t.out --stdlib-unittest-filter abc | %FileCheck --check-prefix=CHECK-ABC %s +// RUN: %target-run %t.out --stdlib-unittest-filter xyz | %FileCheck --check-prefix=CHECK-XYZ %s // CHECK-ABC: StdlibUnittest: using filter: abc{{$}} // CHECK-ABC: [ RUN ] Filter.abc{{$}} diff --git a/validation-test/StdlibUnittest/ForgotToRunTests.swift b/validation-test/StdlibUnittest/ForgotToRunTests.swift index 10469f74dd3a5..f8c1ab1a97240 100644 --- a/validation-test/StdlibUnittest/ForgotToRunTests.swift +++ b/validation-test/StdlibUnittest/ForgotToRunTests.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift 2>&1 | FileCheck %s +// RUN: %target-run-simple-swift 2>&1 | %FileCheck %s // REQUIRES: executable_test import StdlibUnittest diff --git a/validation-test/StdlibUnittest/FreeBSD.swift b/validation-test/StdlibUnittest/FreeBSD.swift index 81c623af5ee4f..1e654bf8a9202 100644 --- a/validation-test/StdlibUnittest/FreeBSD.swift +++ b/validation-test/StdlibUnittest/FreeBSD.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-stdlib-swift | FileCheck %s +// RUN: %target-run-stdlib-swift | %FileCheck %s // REQUIRES: executable_test import Swift diff --git a/validation-test/StdlibUnittest/IOS.swift b/validation-test/StdlibUnittest/IOS.swift index 468f9ed8d2ec1..bef3ec9ee9ef2 100644 --- a/validation-test/StdlibUnittest/IOS.swift +++ b/validation-test/StdlibUnittest/IOS.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-stdlib-swift | FileCheck %s +// RUN: %target-run-stdlib-swift | %FileCheck %s // REQUIRES: executable_test import Swift diff --git a/validation-test/StdlibUnittest/IOSSimulator.swift b/validation-test/StdlibUnittest/IOSSimulator.swift index 5aef35884f40a..f480022ae64ac 100644 --- a/validation-test/StdlibUnittest/IOSSimulator.swift +++ b/validation-test/StdlibUnittest/IOSSimulator.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-stdlib-swift | FileCheck %s +// RUN: %target-run-stdlib-swift | %FileCheck %s // REQUIRES: executable_test import Swift diff --git a/validation-test/StdlibUnittest/Linux.swift b/validation-test/StdlibUnittest/Linux.swift index 3a03a849e4be2..4ce4724d2a539 100644 --- a/validation-test/StdlibUnittest/Linux.swift +++ b/validation-test/StdlibUnittest/Linux.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-stdlib-swift | FileCheck %s +// RUN: %target-run-stdlib-swift | %FileCheck %s // REQUIRES: executable_test import Swift diff --git a/validation-test/StdlibUnittest/Misc.swift b/validation-test/StdlibUnittest/Misc.swift index b2f516edc5275..75371fcadd3c0 100644 --- a/validation-test/StdlibUnittest/Misc.swift +++ b/validation-test/StdlibUnittest/Misc.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test import StdlibUnittest diff --git a/validation-test/StdlibUnittest/NSException.swift b/validation-test/StdlibUnittest/NSException.swift index 5d127e224c169..202e7b97aad4c 100644 --- a/validation-test/StdlibUnittest/NSException.swift +++ b/validation-test/StdlibUnittest/NSException.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift 2>&1 | FileCheck %s +// RUN: %target-run-simple-swift 2>&1 | %FileCheck %s // REQUIRES: executable_test // REQUIRES: objc_interop diff --git a/validation-test/StdlibUnittest/PS4.swift b/validation-test/StdlibUnittest/PS4.swift index a3ce7e8732f09..3e6b319ced826 100644 --- a/validation-test/StdlibUnittest/PS4.swift +++ b/validation-test/StdlibUnittest/PS4.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-stdlib-swift | FileCheck %s +// RUN: %target-run-stdlib-swift | %FileCheck %s // REQUIRES: executable_test import Swift diff --git a/validation-test/StdlibUnittest/RaceTest.swift b/validation-test/StdlibUnittest/RaceTest.swift index ec5345f693692..4b6f0256f9123 100644 --- a/validation-test/StdlibUnittest/RaceTest.swift +++ b/validation-test/StdlibUnittest/RaceTest.swift @@ -1,5 +1,5 @@ // RUN: %target-build-swift -Xfrontend -disable-access-control -module-name a %s -o %t.out -// RUN: %target-run %t.out | FileCheck %s +// RUN: %target-run %t.out | %FileCheck %s import StdlibUnittest diff --git a/validation-test/StdlibUnittest/RunAllTestsCalledTwice.swift b/validation-test/StdlibUnittest/RunAllTestsCalledTwice.swift index 48697f0d2914d..d3f16a2b91bc3 100644 --- a/validation-test/StdlibUnittest/RunAllTestsCalledTwice.swift +++ b/validation-test/StdlibUnittest/RunAllTestsCalledTwice.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift 2>&1 | FileCheck %s +// RUN: %target-run-simple-swift 2>&1 | %FileCheck %s // REQUIRES: executable_test import StdlibUnittest diff --git a/validation-test/execution/interpret-with-dependencies-linux.swift b/validation-test/execution/interpret-with-dependencies-linux.swift index 1bce744e6b058..44313ff0640a8 100644 --- a/validation-test/execution/interpret-with-dependencies-linux.swift +++ b/validation-test/execution/interpret-with-dependencies-linux.swift @@ -4,7 +4,7 @@ // RUN: echo 'int abc = 42;' | %clang -x c - -shared -fPIC -o %t/libabc.so // RUN: echo 'int test() { extern int abc; return abc; }' | %clang -x c - -L%t -shared -fPIC -labc -o %t/libfoo.so -// RUN: %swift_driver -I %S/Inputs/custom-modules -L%t %s | FileCheck %s +// RUN: %swift_driver -I %S/Inputs/custom-modules -L%t %s | %FileCheck %s // CHECK: {{okay}} // Now test a dependency on a library in the compiler's resource directory. @@ -15,7 +15,7 @@ // RUN: mkdir -p %t/other // RUN: ln -s %t/libfoo.so %t/other -// RUN: %swift_driver -I %S/Inputs/custom-modules -L%t/other -resource-dir %t/rsrc/ %s | FileCheck %s +// RUN: %swift_driver -I %S/Inputs/custom-modules -L%t/other -resource-dir %t/rsrc/ %s | %FileCheck %s import foo diff --git a/validation-test/execution/interpret-with-dependencies.swift b/validation-test/execution/interpret-with-dependencies.swift index 75bd2b9757f37..6f1a17082285b 100644 --- a/validation-test/execution/interpret-with-dependencies.swift +++ b/validation-test/execution/interpret-with-dependencies.swift @@ -4,7 +4,7 @@ // RUN: echo 'int abc = 42;' | %clang -x c - -dynamiclib -Xlinker -install_name -Xlinker libabc.dylib -o %t/libabc.dylib // RUN: echo 'int test() { extern int abc; return abc; }' | %clang -x c - -L%t -dynamiclib -labc -o %t/libfoo.dylib -// RUN: %swift_driver -I %S/Inputs/custom-modules -L%t %s | FileCheck %s +// RUN: %swift_driver -I %S/Inputs/custom-modules -L%t %s | %FileCheck %s // CHECK: {{okay}} // Now test a dependency on a library in the compiler's resource directory. @@ -15,7 +15,7 @@ // RUN: mkdir -p %t/other // RUN: ln -s %t/libfoo.dylib %t/other -// RUN: %swift_driver -I %S/Inputs/custom-modules -L%t/other -resource-dir %t/rsrc/ %s | FileCheck %s +// RUN: %swift_driver -I %S/Inputs/custom-modules -L%t/other -resource-dir %t/rsrc/ %s | %FileCheck %s import foo diff --git a/validation-test/execution/testability.swift b/validation-test/execution/testability.swift index e317441a0e286..d87e5007b3efa 100644 --- a/validation-test/execution/testability.swift +++ b/validation-test/execution/testability.swift @@ -11,5 +11,5 @@ // RUN: %target-build-swift -O -emit-library -c %S/../../test/Interpreter/Inputs/testability_helper.swift -enable-testing -force-single-frontend-invocation -o %t/testability_helper.o -emit-module // RUN: %target-build-swift -O %S/../../test/Interpreter/testability.swift -I %t -Xlinker %t/testability_helper.o -o %t/main -// RUN: %target-run %t/main | FileCheck %S/../../test/Interpreter/testability.swift +// RUN: %target-run %t/main | %FileCheck %S/../../test/Interpreter/testability.swift // REQUIRES: executable_test diff --git a/validation-test/stdlib/CollectionOld.swift b/validation-test/stdlib/CollectionOld.swift index c01f12595b938..9cc0640fdeeb1 100644 --- a/validation-test/stdlib/CollectionOld.swift +++ b/validation-test/stdlib/CollectionOld.swift @@ -1,5 +1,5 @@ // RUN: %target-run-simple-swift --stdlib-unittest-in-process | tee %t.txt -// RUN: FileCheck %s < %t.txt +// RUN: %FileCheck %s < %t.txt // note: remove the --stdlib-unittest-in-process once all the FileCheck tests // have been converted to StdlibUnittest // REQUIRES: executable_test diff --git a/validation-test/stdlib/HashingICU.swift b/validation-test/stdlib/HashingICU.swift index ee4e5562e2772..cba5411909655 100644 --- a/validation-test/stdlib/HashingICU.swift +++ b/validation-test/stdlib/HashingICU.swift @@ -1,4 +1,4 @@ -// RUN: %target-run-simple-swift | FileCheck %s +// RUN: %target-run-simple-swift | %FileCheck %s // REQUIRES: executable_test // REQUIRES: OS=linux-gnu diff --git a/validation-test/stdlib/MicroStdlib/MicroStdlib.swift b/validation-test/stdlib/MicroStdlib/MicroStdlib.swift index 1d191b24365b4..06d29551076d4 100644 --- a/validation-test/stdlib/MicroStdlib/MicroStdlib.swift +++ b/validation-test/stdlib/MicroStdlib/MicroStdlib.swift @@ -6,7 +6,7 @@ // RUN: ls %t/Swift.o // RUN: %target-clang -x c -c %S/Inputs/RuntimeStubs.c -o %t/RuntimeStubs.o // RUN: %target-build-swift -I %t -module-name main -o %t/hello %S/Inputs/main.swift %t/Swift.o %t/RuntimeStubs.o -// RUN: %target-run %t/hello | FileCheck %s +// RUN: %target-run %t/hello | %FileCheck %s // REQUIRES: executable_test // CHECK: Hello diff --git a/validation-test/stdlib/NewArray.swift.gyb b/validation-test/stdlib/NewArray.swift.gyb index 80e33c2b7249b..4125f15c46b6a 100644 --- a/validation-test/stdlib/NewArray.swift.gyb +++ b/validation-test/stdlib/NewArray.swift.gyb @@ -10,10 +10,10 @@ // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors // //===----------------------------------------------------------------------===// -// RUN-DISABLED: %target-run-simple-swift | FileCheck %s +// RUN-DISABLED: %target-run-simple-swift | %FileCheck %s // RUN: rm -rf %t && mkdir -p %t && %gyb %s -o %t/NewArray.swift // RUN: %line-directive %t/NewArray.swift -- %target-build-swift %t/NewArray.swift -o %t/a.out -Xfrontend -disable-access-control -// RUN: %target-run %t/a.out 2>&1 | %line-directive %t/NewArray.swift -- FileCheck %t/NewArray.swift --check-prefix=CHECK --check-prefix=CHECK-%target-runtime +// RUN: %target-run %t/a.out 2>&1 | %line-directive %t/NewArray.swift -- %FileCheck %t/NewArray.swift --check-prefix=CHECK --check-prefix=CHECK-%target-runtime // REQUIRES: executable_test import StdlibUnittest diff --git a/validation-test/stdlib/UnicodeTrieGenerator.gyb b/validation-test/stdlib/UnicodeTrieGenerator.gyb index 11e9f5bf41457..4c7663765fb1a 100644 --- a/validation-test/stdlib/UnicodeTrieGenerator.gyb +++ b/validation-test/stdlib/UnicodeTrieGenerator.gyb @@ -1,6 +1,6 @@ %{ -# RUN: rm -rf %t && mkdir -p %t && %gyb %s | FileCheck %s +# RUN: rm -rf %t && mkdir -p %t && %gyb %s | %FileCheck %s from __future__ import print_function