Skip to content

Commit c18da8b

Browse files
committed
[nfc][tests] Update most IRGen tests to use %cxx-all-targets lit substitution.
This patch updates most of the Interop/Cxx IRGen tests to use the %cxx-all-targets lit substituion which will run these tests on several targets. This commit only changes tests which didn't require further modification to pass, there are still 11 tests which could use this subsitution but would require some sort of change.
1 parent 957d8cc commit c18da8b

28 files changed

+26
-25
lines changed

Swift.swiftdoc

-400 Bytes
Binary file not shown.

Swift.swiftmodule

-64.8 KB
Binary file not shown.

Swift.swiftsourceinfo

-18.9 KB
Binary file not shown.

test/Interop/Cxx/class/debug-info-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swiftxx-frontend -I %S/Inputs %s -emit-ir -g | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir -g | %FileCheck %s)
22

33
// Validate that we don't crash when trying to deserialize C++ type debug info.
44
// Note, however, that the actual debug info is not generated, see SR-13223.

test/Interop/Cxx/class/destructors-correct-abi-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %swift -I %S/Inputs -enable-cxx-interop -emit-ir %s | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
import Destructors
44

test/Interop/Cxx/class/destructors-non-trivial-implicit-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend -enable-cxx-interop -I %S/Inputs %s -emit-ir | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
import Destructors
44

test/Interop/Cxx/class/inline-function-codegen/constructor-calls-function-from-nested-struct-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
import ConstructorCallsFunctionFromNestedStruct
44

test/Interop/Cxx/class/inline-function-codegen/constructor-calls-function-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
import ConstructorCallsFunction
44

test/Interop/Cxx/class/inline-function-codegen/constructor-calls-method-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
import ConstructorCallsMethod
44

test/Interop/Cxx/class/inline-function-codegen/field-init-calls-function-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
import FieldInitCallsFunction
44

test/Interop/Cxx/class/inline-function-codegen/method-calls-function-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
import MethodCallsFunction
44

test/Interop/Cxx/class/inline-function-codegen/method-calls-method-from-nested-struct-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
import MethodCallsMethodFromNestedStruct
44

test/Interop/Cxx/class/inline-function-codegen/method-calls-method-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
import MethodCallsMethod
44

test/Interop/Cxx/class/inline-function-codegen/static-var-init-calls-function-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop -validate-tbd-against-ir=none | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir -validate-tbd-against-ir=none | %FileCheck %s)
22

33
// TODO: See why -validate-tbd-against-ir=none is needed here (SR-14069)
44

test/Interop/Cxx/class/type-classification-non-trivial-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swiftxx-frontend -I %S/Inputs %s -emit-ir | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
// Verify that non-trival/address-only C++ classes are constructed and accessed
44
// correctly. Make sure that we correctly IRGen functions that construct

test/Interop/Cxx/extern-var/extern-var-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
import ExternVar
44

test/Interop/Cxx/namespace/classes-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir -I %S/Inputs -enable-cxx-interop %s | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
import Classes
44

test/Interop/Cxx/namespace/free-functions-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir -I %S/Inputs -enable-cxx-interop %s | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
import FreeFunctions
44

test/Interop/Cxx/namespace/templates-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir -I %S/Inputs -enable-cxx-interop %s | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
import Templates
44

test/Interop/Cxx/static/inline-static-member-var-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir -I %S/Inputs -enable-cxx-interop %s | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
import InlineStaticMemberVar
44

test/Interop/Cxx/static/static-member-func-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
import StaticMemberFunc
44

test/Interop/Cxx/templates/function-template-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
import FunctionTemplates
44

test/Interop/Cxx/templates/linkage-of-swift-symbols-for-imported-types-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
import LinkageOfSwiftSymbolsForImportedTypes
44

test/Interop/Cxx/templates/mangling-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
import Mangling
44

test/Interop/Cxx/templates/partially-pre-defined-class-template-irgen.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
2+
23
// REQUIRES: rdar67257133
4+
35
import PartiallyPreDefinedClassTemplate
46

57
public func getWrappedMagicInt() -> CInt {

test/Interop/Cxx/value-witness-table/custom-destructors-non-virtual-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend -enable-cxx-interop -I %S/Inputs %s -emit-ir | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
// This tests output needs to be updated for arm64.
44
// XFAIL: CPU=arm64e

test/Interop/Cxx/value-witness-table/witness-layout-opts-irgen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
1+
// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
22

33
// This test checks that the compiler uses well-known witness tables for types
44
// that have the appropriate size/shape (for example, { i8 x 4 } -> i32).

utils/update_checkout/update-checkout-config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@
160160
"sourcekit-lsp": "main",
161161
"swift-format": "main",
162162
"swift-installer-scripts": "main",
163-
<<<<<<< HEAD
164163
"swift-experimental-string-processing": "dev/6"
165164
}
166165
},

0 commit comments

Comments
 (0)