From 80c5cd15f04cfd8b9f2b956e465c42814e40051b Mon Sep 17 00:00:00 2001 From: Dmitri Gribenko Date: Sat, 3 Sep 2016 14:01:19 -0700 Subject: [PATCH] SILGen tests: always build modules and API notes when importing the mock SDK Previously, only test/SILGen/objc_nonnull_lie_hack.swift would build the API notes for the 'gizmo' module. Depending on the order in which tests ran, the module cache would either contain the 'gizmo' module with nullability annotations, or without. If we were unlucky and the module cache was created by a test that did not build the API notes, test/SILGen/objc_nonnull_lie_hack.swift failed. This change also removes 46 instances of '-enable-source-import' (63 more left in the testsuite). --- test/SILGen/NSApplicationMain.swift | 11 +++++++---- test/SILGen/c_materializeForSet_linkage.swift | 5 ++++- test/SILGen/cf.swift | 5 ++++- test/SILGen/collection_downcast.swift | 5 ++++- test/SILGen/collection_subtype_downcast.swift | 2 +- test/SILGen/collection_subtype_upcast.swift | 2 +- test/SILGen/collection_upcast.swift | 5 ++++- test/SILGen/default_arguments_imported.swift | 7 +++++-- test/SILGen/extensions_objc.swift | 7 +++++-- test/SILGen/external_definitions.swift | 5 ++++- test/SILGen/function_conversion_objc.swift | 5 ++++- test/SILGen/generic_objc_block_bridge.swift | 5 ++++- test/SILGen/let_decls_objc.swift | 7 +++++-- test/SILGen/lit.local.cfg | 3 ++- test/SILGen/mangling.swift | 5 ++++- test/SILGen/metatype_object_conversion.swift | 5 ++++- test/SILGen/newtype.swift | 7 +++++-- test/SILGen/nsmanaged-witness.swift | 5 ++++- test/SILGen/objc_attr_NSManaged.swift | 5 ++++- test/SILGen/objc_attr_NSManaged_multi.swift | 5 ++++- test/SILGen/objc_currying.swift | 1 + test/SILGen/objc_dealloc.swift | 5 ++++- test/SILGen/objc_enum.swift | 5 ++++- test/SILGen/objc_enum_unused_witnesses.swift | 5 ++++- test/SILGen/objc_extensions.swift | 5 ++++- test/SILGen/objc_final.swift | 5 ++++- test/SILGen/objc_generic_class.swift | 5 ++++- test/SILGen/objc_imported_init.swift | 5 ++++- test/SILGen/objc_init_ref_delegation.swift | 5 ++++- test/SILGen/objc_keypath.swift | 5 ++++- test/SILGen/objc_local.swift | 5 ++++- test/SILGen/objc_metatypes.swift | 5 ++++- test/SILGen/objc_nonnull_lie_hack.swift | 10 +++++----- test/SILGen/objc_ownership_conventions.swift | 5 ++++- test/SILGen/objc_properties.swift | 5 ++++- test/SILGen/objc_protocols.swift | 6 +++++- test/SILGen/objc_selector.swift | 5 ++++- test/SILGen/objc_super.swift | 5 ++++- test/SILGen/objc_thunks.swift | 5 ++++- test/SILGen/objc_witnesses.swift | 5 ++++- test/SILGen/pointer_conversion.swift | 5 ++++- test/SILGen/super_objc_class_method.swift | 5 ++++- test/SILGen/vtable_thunks.swift | 2 +- test/SILGen/vtables.swift | 5 ++++- test/SILGen/witness_tables.swift | 8 ++++++-- 45 files changed, 177 insertions(+), 56 deletions(-) diff --git a/test/SILGen/NSApplicationMain.swift b/test/SILGen/NSApplicationMain.swift index a60973c2087de..22788f151640c 100644 --- a/test/SILGen/NSApplicationMain.swift +++ b/test/SILGen/NSApplicationMain.swift @@ -1,8 +1,11 @@ -// 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: rm -rf %t && mkdir -p %t +// RUN: %build-silgen-test-overlays -// 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(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 -enable-source-import %s -D REFERENCE | %FileCheck %s -check-prefix=IR // REQUIRES: OS=macosx diff --git a/test/SILGen/c_materializeForSet_linkage.swift b/test/SILGen/c_materializeForSet_linkage.swift index 605273e5bb18d..b5fd442e2607e 100644 --- a/test/SILGen/c_materializeForSet_linkage.swift +++ b/test/SILGen/c_materializeForSet_linkage.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s +// 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 // REQUIRES: objc_interop diff --git a/test/SILGen/cf.swift b/test/SILGen/cf.swift index ca0e846ab145b..9cbb678a834e1 100644 --- a/test/SILGen/cf.swift +++ b/test/SILGen/cf.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -import-cf-types -sdk %S/Inputs %s -emit-silgen -o - | %FileCheck %s +// 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-cf-types %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/collection_downcast.swift b/test/SILGen/collection_downcast.swift index 89ad6279be58e..7af997113b8b3 100644 --- a/test/SILGen/collection_downcast.swift +++ b/test/SILGen/collection_downcast.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// 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 // REQUIRES: objc_interop diff --git a/test/SILGen/collection_subtype_downcast.swift b/test/SILGen/collection_subtype_downcast.swift index 172ee349e2e98..eac5ca65041bf 100644 --- a/test/SILGen/collection_subtype_downcast.swift +++ b/test/SILGen/collection_subtype_downcast.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %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 701ca80e30ed3..ac6e69e21cea0 100644 --- a/test/SILGen/collection_subtype_upcast.swift +++ b/test/SILGen/collection_subtype_upcast.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s struct S { var x, y: Int } diff --git a/test/SILGen/collection_upcast.swift b/test/SILGen/collection_upcast.swift index c26504006e0f9..7d7756de73427 100644 --- a/test/SILGen/collection_upcast.swift +++ b/test/SILGen/collection_upcast.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// 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 // FIXME: rdar://problem/19648117 Needs splitting objc parts out // XFAIL: linux diff --git a/test/SILGen/default_arguments_imported.swift b/test/SILGen/default_arguments_imported.swift index b63a22ef0fe3f..fb8c8e83d5dcd 100644 --- a/test/SILGen/default_arguments_imported.swift +++ b/test/SILGen/default_arguments_imported.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s +// 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 // Test SIL generation for imported default arguments. @@ -27,4 +30,4 @@ func testNullableDictionary(gizmo: Gizmo) { // CHECK-NOT: dictionaryLiteral // CHECK: function_ref @_TFSqCfT10nilLiteralT__GSqx_ gizmo.doTheOtherThing() -} // CHECK: {{^}$}} \ No newline at end of file +} // CHECK: {{^}$}} diff --git a/test/SILGen/extensions_objc.swift b/test/SILGen/extensions_objc.swift index 7ddc7ace82d5e..4e13a33c69fb2 100644 --- a/test/SILGen/extensions_objc.swift +++ b/test/SILGen/extensions_objc.swift @@ -1,5 +1,8 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen | %FileCheck %s -// +// 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 + // REQUIRES: objc_interop import Foundation diff --git a/test/SILGen/external_definitions.swift b/test/SILGen/external_definitions.swift index a40420f0c5641..9e064b85b4e85 100644 --- a/test/SILGen/external_definitions.swift +++ b/test/SILGen/external_definitions.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs %s -emit-silgen | %FileCheck %s +// RUN: rm -rf %t && mkdir -p %t +// RUN: %build-silgen-test-overlays + +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-silgen %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/function_conversion_objc.swift b/test/SILGen/function_conversion_objc.swift index 580e107683a45..c08660a0b97ee 100644 --- a/test/SILGen/function_conversion_objc.swift +++ b/test/SILGen/function_conversion_objc.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen -verify | %FileCheck %s +// 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 -verify | %FileCheck %s import Foundation diff --git a/test/SILGen/generic_objc_block_bridge.swift b/test/SILGen/generic_objc_block_bridge.swift index 8a42e698c3764..c640594f16cb8 100644 --- a/test/SILGen/generic_objc_block_bridge.swift +++ b/test/SILGen/generic_objc_block_bridge.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// 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 // REQUIRES: objc_interop diff --git a/test/SILGen/let_decls_objc.swift b/test/SILGen/let_decls_objc.swift index 13c4ec6585a22..a306f1a6f7c1a 100644 --- a/test/SILGen/let_decls_objc.swift +++ b/test/SILGen/let_decls_objc.swift @@ -1,5 +1,8 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen -// +// 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 + // REQUIRES: objc_interop import Foundation diff --git a/test/SILGen/lit.local.cfg b/test/SILGen/lit.local.cfg index 6e23c4ed470c4..20a8ee160f13f 100644 --- a/test/SILGen/lit.local.cfg +++ b/test/SILGen/lit.local.cfg @@ -4,4 +4,5 @@ config.substitutions = list(config.substitutions) config.substitutions.insert(0, ('%build-silgen-test-overlays', '%target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-module -o %t %S/Inputs/ObjectiveC.swift && ' '%target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-module -o %t %S/Inputs/Dispatch.swift && ' - '%target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-module -o %t %S/Inputs/Foundation.swift')) + '%target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-module -o %t %S/Inputs/Foundation.swift &&' + '%clang_apinotes -yaml-to-binary %S/Inputs/gizmo.apinotes -o %t/gizmo.apinotesc')) diff --git a/test/SILGen/mangling.swift b/test/SILGen/mangling.swift index c89f17a25ef65..81f364787cc89 100644 --- a/test/SILGen/mangling.swift +++ b/test/SILGen/mangling.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s +// 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 -Xllvm -sil-full-demangle %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/metatype_object_conversion.swift b/test/SILGen/metatype_object_conversion.swift index 0fab2ec3c063c..995c281a13a3a 100644 --- a/test/SILGen/metatype_object_conversion.swift +++ b/test/SILGen/metatype_object_conversion.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// 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 // REQUIRES: objc_interop diff --git a/test/SILGen/newtype.swift b/test/SILGen/newtype.swift index 50c7a12fa037e..0046aa36db966 100644 --- a/test/SILGen/newtype.swift +++ b/test/SILGen/newtype.swift @@ -1,6 +1,9 @@ -// 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: rm -rf %t && mkdir -p %t +// RUN: %build-silgen-test-overlays -// 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(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen %s -enable-swift-newtype | %FileCheck %s -check-prefix=CHECK-RAW + +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-sil %s -enable-swift-newtype | %FileCheck %s -check-prefix=CHECK-CANONICAL // REQUIRES: objc_interop diff --git a/test/SILGen/nsmanaged-witness.swift b/test/SILGen/nsmanaged-witness.swift index df598465d3bfd..090e3fdf265a0 100644 --- a/test/SILGen/nsmanaged-witness.swift +++ b/test/SILGen/nsmanaged-witness.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen | %FileCheck %s +// 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 // REQUIRES: objc_interop diff --git a/test/SILGen/objc_attr_NSManaged.swift b/test/SILGen/objc_attr_NSManaged.swift index 13193f1daff92..31a188cc8b151 100644 --- a/test/SILGen/objc_attr_NSManaged.swift +++ b/test/SILGen/objc_attr_NSManaged.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen | %FileCheck %s +// 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 // REQUIRES: objc_interop diff --git a/test/SILGen/objc_attr_NSManaged_multi.swift b/test/SILGen/objc_attr_NSManaged_multi.swift index 2e24dde77849f..17ae1ce65b913 100644 --- a/test/SILGen/objc_attr_NSManaged_multi.swift +++ b/test/SILGen/objc_attr_NSManaged_multi.swift @@ -1,4 +1,7 @@ -// 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: rm -rf %t && mkdir -p %t +// RUN: %build-silgen-test-overlays + +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen -primary-file %s %S/objc_attr_NSManaged.swift | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_currying.swift b/test/SILGen/objc_currying.swift index 932dc1acb2348..edef401855149 100644 --- a/test/SILGen/objc_currying.swift +++ b/test/SILGen/objc_currying.swift @@ -1,5 +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) -emit-silgen %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_dealloc.swift b/test/SILGen/objc_dealloc.swift index 219f17eeebfb1..08c8f53fd286f 100644 --- a/test/SILGen/objc_dealloc.swift +++ b/test/SILGen/objc_dealloc.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s +// 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 // REQUIRES: objc_interop diff --git a/test/SILGen/objc_enum.swift b/test/SILGen/objc_enum.swift index 2944c03e88cef..bf94792f8ea47 100644 --- a/test/SILGen/objc_enum.swift +++ b/test/SILGen/objc_enum.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen > %t.out +// 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 > %t.out // RUN: %FileCheck -check-prefix=CHECK -check-prefix=CHECK-%target-ptrsize %s < %t.out // RUN: %FileCheck -check-prefix=NEGATIVE %s < %t.out diff --git a/test/SILGen/objc_enum_unused_witnesses.swift b/test/SILGen/objc_enum_unused_witnesses.swift index ab9fa42648bbf..fa2b7c7b839c7 100644 --- a/test/SILGen/objc_enum_unused_witnesses.swift +++ b/test/SILGen/objc_enum_unused_witnesses.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s +// 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 // REQUIRES: objc_interop diff --git a/test/SILGen/objc_extensions.swift b/test/SILGen/objc_extensions.swift index 52367410768a3..83440f3dbd87d 100644 --- a/test/SILGen/objc_extensions.swift +++ b/test/SILGen/objc_extensions.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs/ -I %S/Inputs -enable-source-import %s | %FileCheck %s +// 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 // REQUIRES: objc_interop diff --git a/test/SILGen/objc_final.swift b/test/SILGen/objc_final.swift index 5551bb7bfe91b..e1c56838e810d 100644 --- a/test/SILGen/objc_final.swift +++ b/test/SILGen/objc_final.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen -emit-verbose-sil | %FileCheck %s +// 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 -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 980b7fddba9fb..e013992221699 100644 --- a/test/SILGen/objc_generic_class.swift +++ b/test/SILGen/objc_generic_class.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s +// 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 // REQUIRES: objc_interop diff --git a/test/SILGen/objc_imported_init.swift b/test/SILGen/objc_imported_init.swift index fc2267cbee4cd..f5e909f4845dc 100644 --- a/test/SILGen/objc_imported_init.swift +++ b/test/SILGen/objc_imported_init.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -verify -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// 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 %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 e349f775433b0..83bba275628df 100644 --- a/test/SILGen/objc_init_ref_delegation.swift +++ b/test/SILGen/objc_init_ref_delegation.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s +// 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 // REQUIRES: objc_interop diff --git a/test/SILGen/objc_keypath.swift b/test/SILGen/objc_keypath.swift index 85a4b479f6dc3..5d2df83a05d01 100644 --- a/test/SILGen/objc_keypath.swift +++ b/test/SILGen/objc_keypath.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -emit-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// RUN: rm -rf %t && mkdir -p %t +// RUN: %build-silgen-test-overlays + +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-sil %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_local.swift b/test/SILGen/objc_local.swift index 7eb9850cb15d4..636eb22e4e2a0 100644 --- a/test/SILGen/objc_local.swift +++ b/test/SILGen/objc_local.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// 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 // REQUIRES: objc_interop diff --git a/test/SILGen/objc_metatypes.swift b/test/SILGen/objc_metatypes.swift index ce585b880a97f..023070af59680 100644 --- a/test/SILGen/objc_metatypes.swift +++ b/test/SILGen/objc_metatypes.swift @@ -1,4 +1,7 @@ -// 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: 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 -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 aaedbd7727a88..6125772e63358 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: rm -rf %t && mkdir -p %t +// RUN: %build-silgen-test-overlays + +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen -primary-file %s | %FileCheck -check-prefix=SILGEN %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-sil -O -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 908b92fcdd1b9..5f058ecf790ac 100644 --- a/test/SILGen/objc_ownership_conventions.swift +++ b/test/SILGen/objc_ownership_conventions.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s +// 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 // REQUIRES: objc_interop diff --git a/test/SILGen/objc_properties.swift b/test/SILGen/objc_properties.swift index 125edf5535866..741f537004298 100644 --- a/test/SILGen/objc_properties.swift +++ b/test/SILGen/objc_properties.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend %s -emit-silgen -emit-verbose-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import | %FileCheck %s +// 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 -emit-verbose-sil | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_protocols.swift b/test/SILGen/objc_protocols.swift index cfa25d6d72181..6ce666fa8f246 100644 --- a/test/SILGen/objc_protocols.swift +++ b/test/SILGen/objc_protocols.swift @@ -1,4 +1,8 @@ -// 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: 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 %S/Inputs/objc_protocols_Bas.swift +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen %s -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 bc51cf77814be..e28789dd0a25f 100644 --- a/test/SILGen/objc_selector.swift +++ b/test/SILGen/objc_selector.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -emit-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// RUN: rm -rf %t && mkdir -p %t +// RUN: %build-silgen-test-overlays + +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-sil %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_super.swift b/test/SILGen/objc_super.swift index 31d6825476c4c..76fa1e756f10e 100644 --- a/test/SILGen/objc_super.swift +++ b/test/SILGen/objc_super.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s +// 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 // REQUIRES: objc_interop diff --git a/test/SILGen/objc_thunks.swift b/test/SILGen/objc_thunks.swift index 8deaad98d9fc1..ed0de42effc4a 100644 --- a/test/SILGen/objc_thunks.swift +++ b/test/SILGen/objc_thunks.swift @@ -1,4 +1,7 @@ -// 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: 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 -emit-silgen %s -emit-verbose-sil | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_witnesses.swift b/test/SILGen/objc_witnesses.swift index 480093d56230f..8ac265ac767c9 100644 --- a/test/SILGen/objc_witnesses.swift +++ b/test/SILGen/objc_witnesses.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// 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 // REQUIRES: objc_interop diff --git a/test/SILGen/pointer_conversion.swift b/test/SILGen/pointer_conversion.swift index b601e503325f8..b612274da674a 100644 --- a/test/SILGen/pointer_conversion.swift +++ b/test/SILGen/pointer_conversion.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// 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 // FIXME: rdar://problem/19648117 Needs splitting objc parts out // XFAIL: linux diff --git a/test/SILGen/super_objc_class_method.swift b/test/SILGen/super_objc_class_method.swift index 9815cb231e548..1e3d69975d923 100644 --- a/test/SILGen/super_objc_class_method.swift +++ b/test/SILGen/super_objc_class_method.swift @@ -1,4 +1,7 @@ -// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// 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 // REQUIRES: objc_interop diff --git a/test/SILGen/vtable_thunks.swift b/test/SILGen/vtable_thunks.swift index 5ec7532fd5437..81b2707a93971 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 -emit-silgen %s -disable-objc-attr-requires-foundation-module | %FileCheck %s protocol AddrOnly {} diff --git a/test/SILGen/vtables.swift b/test/SILGen/vtables.swift index 35ca425dff563..f6eb577e85832 100644 --- a/test/SILGen/vtables.swift +++ b/test/SILGen/vtables.swift @@ -1,4 +1,7 @@ -// 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: 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 -disable-objc-attr-requires-foundation-module | %FileCheck %s // FIXME: rdar://problem/19648117 Needs splitting objc parts out // XFAIL: linux diff --git a/test/SILGen/witness_tables.swift b/test/SILGen/witness_tables.swift index 590dd14bdcac9..131d916e44110 100644 --- a/test/SILGen/witness_tables.swift +++ b/test/SILGen/witness_tables.swift @@ -1,8 +1,12 @@ -// RUN: %target-swift-frontend -emit-silgen -I %S/Inputs -enable-source-import %s -disable-objc-attr-requires-foundation-module > %t.sil +// RUN: rm -rf %t && mkdir -p %t + +// RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/witness_tables_b.swift + +// RUN: %target-swift-frontend -emit-silgen %s -I %t -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: %target-swift-frontend -emit-silgen -I %S/Inputs -enable-source-import %s -disable-objc-attr-requires-foundation-module -enable-testing > %t.testable.sil +// RUN: %target-swift-frontend -emit-silgen %s -I %t -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