[nfc][tests] Update most IRGen tests to use %cxx-all-targets lit substitution.

zoecarver · zoecarver · commit c18da8b90d57 · 2022-02-18T15:48:30.000-08:00
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.
diff --git a/Swift.swiftdoc b/Swift.swiftdoc
diff --git a/Swift.swiftmodule b/Swift.swiftmodule
diff --git a/Swift.swiftsourceinfo b/Swift.swiftsourceinfo
diff --git a/test/Interop/Cxx/class/debug-info-irgen.swift b/test/Interop/Cxx/class/debug-info-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swiftxx-frontend -I %S/Inputs %s -emit-ir -g | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir -g | %FileCheck %s)
 
 // Validate that we don't crash when trying to deserialize C++ type debug info.
 // Note, however, that the actual debug info is not generated, see SR-13223.
diff --git a/test/Interop/Cxx/class/destructors-correct-abi-irgen.swift b/test/Interop/Cxx/class/destructors-correct-abi-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %swift -I %S/Inputs -enable-cxx-interop -emit-ir %s | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 import Destructors
 
diff --git a/test/Interop/Cxx/class/destructors-non-trivial-implicit-irgen.swift b/test/Interop/Cxx/class/destructors-non-trivial-implicit-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -enable-cxx-interop -I %S/Inputs %s -emit-ir | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 import Destructors
 
diff --git a/test/Interop/Cxx/class/inline-function-codegen/constructor-calls-function-from-nested-struct-irgen.swift b/test/Interop/Cxx/class/inline-function-codegen/constructor-calls-function-from-nested-struct-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 import ConstructorCallsFunctionFromNestedStruct
 
diff --git a/test/Interop/Cxx/class/inline-function-codegen/constructor-calls-function-irgen.swift b/test/Interop/Cxx/class/inline-function-codegen/constructor-calls-function-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 import ConstructorCallsFunction
 
diff --git a/test/Interop/Cxx/class/inline-function-codegen/constructor-calls-method-irgen.swift b/test/Interop/Cxx/class/inline-function-codegen/constructor-calls-method-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 import ConstructorCallsMethod
 
diff --git a/test/Interop/Cxx/class/inline-function-codegen/field-init-calls-function-irgen.swift b/test/Interop/Cxx/class/inline-function-codegen/field-init-calls-function-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 import FieldInitCallsFunction
 
diff --git a/test/Interop/Cxx/class/inline-function-codegen/method-calls-function-irgen.swift b/test/Interop/Cxx/class/inline-function-codegen/method-calls-function-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 import MethodCallsFunction
 
diff --git a/test/Interop/Cxx/class/inline-function-codegen/method-calls-method-from-nested-struct-irgen.swift b/test/Interop/Cxx/class/inline-function-codegen/method-calls-method-from-nested-struct-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 import MethodCallsMethodFromNestedStruct
 
diff --git a/test/Interop/Cxx/class/inline-function-codegen/method-calls-method-irgen.swift b/test/Interop/Cxx/class/inline-function-codegen/method-calls-method-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 import MethodCallsMethod
 
diff --git a/test/Interop/Cxx/class/inline-function-codegen/static-var-init-calls-function-irgen.swift b/test/Interop/Cxx/class/inline-function-codegen/static-var-init-calls-function-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop -validate-tbd-against-ir=none | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir -validate-tbd-against-ir=none | %FileCheck %s)
 
 // TODO: See why -validate-tbd-against-ir=none is needed here (SR-14069)
 
diff --git a/test/Interop/Cxx/class/type-classification-non-trivial-irgen.swift b/test/Interop/Cxx/class/type-classification-non-trivial-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swiftxx-frontend -I %S/Inputs %s -emit-ir | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 // Verify that non-trival/address-only C++ classes are constructed and accessed
 // correctly. Make sure that we correctly IRGen functions that construct
diff --git a/test/Interop/Cxx/extern-var/extern-var-irgen.swift b/test/Interop/Cxx/extern-var/extern-var-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 import ExternVar
 
diff --git a/test/Interop/Cxx/namespace/classes-irgen.swift b/test/Interop/Cxx/namespace/classes-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir -I %S/Inputs -enable-cxx-interop %s | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 import Classes
 
diff --git a/test/Interop/Cxx/namespace/free-functions-irgen.swift b/test/Interop/Cxx/namespace/free-functions-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir -I %S/Inputs -enable-cxx-interop %s | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 import FreeFunctions
 
diff --git a/test/Interop/Cxx/namespace/templates-irgen.swift b/test/Interop/Cxx/namespace/templates-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir -I %S/Inputs -enable-cxx-interop %s | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 import Templates
 
diff --git a/test/Interop/Cxx/static/inline-static-member-var-irgen.swift b/test/Interop/Cxx/static/inline-static-member-var-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir -I %S/Inputs -enable-cxx-interop %s | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 import InlineStaticMemberVar
 
diff --git a/test/Interop/Cxx/static/static-member-func-irgen.swift b/test/Interop/Cxx/static/static-member-func-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 import StaticMemberFunc
 
diff --git a/test/Interop/Cxx/templates/function-template-irgen.swift b/test/Interop/Cxx/templates/function-template-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 import FunctionTemplates
 
diff --git a/test/Interop/Cxx/templates/linkage-of-swift-symbols-for-imported-types-irgen.swift b/test/Interop/Cxx/templates/linkage-of-swift-symbols-for-imported-types-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 import LinkageOfSwiftSymbolsForImportedTypes
 
diff --git a/test/Interop/Cxx/templates/mangling-irgen.swift b/test/Interop/Cxx/templates/mangling-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 import Mangling
 
diff --git a/test/Interop/Cxx/templates/partially-pre-defined-class-template-irgen.swift b/test/Interop/Cxx/templates/partially-pre-defined-class-template-irgen.swift
@@ -1,5 +1,7 @@
-// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
+
 // REQUIRES: rdar67257133
+
 import PartiallyPreDefinedClassTemplate
 
 public func getWrappedMagicInt() -> CInt {
diff --git a/test/Interop/Cxx/value-witness-table/custom-destructors-non-virtual-irgen.swift b/test/Interop/Cxx/value-witness-table/custom-destructors-non-virtual-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -enable-cxx-interop -I %S/Inputs %s -emit-ir | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 // This tests output needs to be updated for arm64.
 // XFAIL: CPU=arm64e
diff --git a/test/Interop/Cxx/value-witness-table/witness-layout-opts-irgen.swift b/test/Interop/Cxx/value-witness-table/witness-layout-opts-irgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)
 
 // This test checks that the compiler uses well-known witness tables for types
 // that have the appropriate size/shape (for example, { i8 x 4 } -> i32).
diff --git a/utils/update_checkout/update-checkout-config.json b/utils/update_checkout/update-checkout-config.json
@@ -160,7 +160,6 @@
                 "sourcekit-lsp": "main",
                 "swift-format": "main",
                 "swift-installer-scripts": "main",
-<<<<<<< HEAD
                 "swift-experimental-string-processing": "dev/6"
             }
         },

Original file line number	Diff line number	Diff 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)`
`2`	`2`
`3`	`3`	`// Validate that we don't crash when trying to deserialize C++ type debug info.`
`4`	`4`	`// Note, however, that the actual debug info is not generated, see SR-13223.`
Original file line number	Diff line number	Diff 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)`
`2`	`2`
`3`	`3`	`import Destructors`
`4`	`4`
Original file line number	Diff line number	Diff 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)`
`2`	`2`
`3`	`3`	`import Destructors`
`4`	`4`
Original file line number	Diff line number	Diff 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)`
`2`	`2`
`3`	`3`	`import ConstructorCallsFunctionFromNestedStruct`
`4`	`4`