From 40f495ff2732904b7ff94fcc105b0668b5d588d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Gr=C3=A4nitz?= Date: Thu, 13 Mar 2025 19:01:58 +0100 Subject: [PATCH 1/2] Target-specific run-lines should use the respective target-specific substitutions --- test/FixCode/batch-mode.swift | 2 +- test/IDE/module_api_smoketest.swift | 2 +- test/IDE/rdar141440011.swift | 2 +- test/Sema/fixits-derived-conformances.swift | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/FixCode/batch-mode.swift b/test/FixCode/batch-mode.swift index 1313ca5231ab0..affc27fa01648 100644 --- a/test/FixCode/batch-mode.swift +++ b/test/FixCode/batch-mode.swift @@ -1,4 +1,4 @@ -// RUN: not %swift -typecheck -target %target-triple -primary-file %s -emit-fixits-path %t.main.remap -primary-file %S/Inputs/batch-mode-helper.swift -emit-fixits-path %t.helper.remap +// RUN: not %target-swift-frontend -typecheck -primary-file %s -emit-fixits-path %t.main.remap -primary-file %S/Inputs/batch-mode-helper.swift -emit-fixits-path %t.helper.remap // RUN: %FileCheck -check-prefix=CHECK-MAIN %s < %t.main.remap // RUN: %FileCheck -check-prefix=NEGATIVE-MAIN %s < %t.main.remap // RUN: %FileCheck -check-prefix=CHECK-HELPER %s < %t.helper.remap diff --git a/test/IDE/module_api_smoketest.swift b/test/IDE/module_api_smoketest.swift index d6edecb9b3a61..1ece0b188d86f 100644 --- a/test/IDE/module_api_smoketest.swift +++ b/test/IDE/module_api_smoketest.swift @@ -1,5 +1,5 @@ // RUN: %empty-directory(%t) -// RUN: %swift-ide-test -generate-module-api-description -- -target %target-triple -module-cache-path %t %s | %FileCheck %s +// RUN: %target-swift-ide-test -generate-module-api-description -module-cache-path %t %s | %FileCheck %s public struct Struct1 {} diff --git a/test/IDE/rdar141440011.swift b/test/IDE/rdar141440011.swift index 6b764e1b1f4c2..a458e62ee4fd3 100644 --- a/test/IDE/rdar141440011.swift +++ b/test/IDE/rdar141440011.swift @@ -2,7 +2,7 @@ public protocol MyProto {} public struct MyStruct: MyProto {} // RUN: %empty-directory(%t) -// RUN: %swift -emit-module -o %t/swift_mod.swiftmodule %s -parse-as-library -experimental-skip-all-function-bodies -experimental-skip-non-exportable-decls -experimental-lazy-typecheck -target %target-triple +// RUN: %target-swift-frontend -emit-module -o %t/swift_mod.swiftmodule %s -parse-as-library -experimental-skip-all-function-bodies -experimental-skip-non-exportable-decls -experimental-lazy-typecheck -target %target-triple // RUN: %target-swift-synthesize-interface -module-name swift_mod -I %t -o - -target %target-triple | %FileCheck %s // CHECK: public struct MyStruct : swift_mod.MyProto diff --git a/test/Sema/fixits-derived-conformances.swift b/test/Sema/fixits-derived-conformances.swift index cd77422b21c40..a7f246b2d5464 100644 --- a/test/Sema/fixits-derived-conformances.swift +++ b/test/Sema/fixits-derived-conformances.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-build-swift -emit-module -emit-library -module-name Types %S/Inputs/fixits-derived-conformances-multifile.swift -o %t/%target-library-name(Types) -// RUN: %swift -typecheck -target %target-triple -I %t -verify %s +// RUN: %target-swift-frontend -typecheck -I %t -verify %s import Types From 6e1b4ea86e9c5e4b92fece0daf097a2f8b6ae9fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Gr=C3=A4nitz?= Date: Fri, 14 Mar 2025 19:17:13 +0100 Subject: [PATCH 2/2] Address feedback --- test/IDE/rdar141440011.swift | 4 ++-- test/Sema/fixits-derived-conformances.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/IDE/rdar141440011.swift b/test/IDE/rdar141440011.swift index a458e62ee4fd3..b301c5b1ba140 100644 --- a/test/IDE/rdar141440011.swift +++ b/test/IDE/rdar141440011.swift @@ -2,7 +2,7 @@ public protocol MyProto {} public struct MyStruct: MyProto {} // RUN: %empty-directory(%t) -// RUN: %target-swift-frontend -emit-module -o %t/swift_mod.swiftmodule %s -parse-as-library -experimental-skip-all-function-bodies -experimental-skip-non-exportable-decls -experimental-lazy-typecheck -target %target-triple -// RUN: %target-swift-synthesize-interface -module-name swift_mod -I %t -o - -target %target-triple | %FileCheck %s +// RUN: %target-swift-frontend -emit-module -o %t/swift_mod.swiftmodule %s -parse-as-library -experimental-skip-all-function-bodies -experimental-skip-non-exportable-decls -experimental-lazy-typecheck +// RUN: %target-swift-synthesize-interface -module-name swift_mod -I %t -o - | %FileCheck %s // CHECK: public struct MyStruct : swift_mod.MyProto diff --git a/test/Sema/fixits-derived-conformances.swift b/test/Sema/fixits-derived-conformances.swift index a7f246b2d5464..1a748b2949c55 100644 --- a/test/Sema/fixits-derived-conformances.swift +++ b/test/Sema/fixits-derived-conformances.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-build-swift -emit-module -emit-library -module-name Types %S/Inputs/fixits-derived-conformances-multifile.swift -o %t/%target-library-name(Types) -// RUN: %target-swift-frontend -typecheck -I %t -verify %s +// RUN: %target-typecheck-verify-swift %s -I %t import Types