update

swiftlang · Nov 21, 2024 · a3ff42c · a3ff42c
1 parent 023ba9a
commit a3ff42c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/Tests/PackageSigningTests/SigningEntityTests.swift b/Tests/PackageSigningTests/SigningEntityTests.swift
@@ -70,9 +70,7 @@ struct SigningEntityTests {
     }
 
     @Test(
-        .enabledOn(platform: .MacOS),
-        .enableIfRealSigningIdentityTestEnabled,
-        .enableIfEnvVarSet("REAL_SIGNING_IDENTITY_LABEL")
+        .enabled(if: isMacOS() && isRealSigningIdentityTestEnabled() && isEnvironmentVariableSet("REAL_SIGNING_IDENTITY_LABEL"))
     )
     func fromKeychainCertificate() async throws {
         let label = try #require(Environment.current["REAL_SIGNING_IDENTITY_LABEL"])

diff --git a/Tests/PackageSigningTests/SigningIdentityTests.swift b/Tests/PackageSigningTests/SigningIdentityTests.swift
@@ -82,9 +82,7 @@ struct SigningIdentityTests {
     }
 
     @Test(
-        .enabledOn(platform: .MacOS),
-        .enableIfRealSigningIdentityTestEnabled,
-        .enableIfEnvVarSet("REAL_SIGNING_IDENTITY_LABEL")
+        .enabled(if: isMacOS() && isRealSigningIdentityTestEnabled() && isEnvironmentVariableSet("REAL_SIGNING_IDENTITY_LABEL"))
     )
     func testSigningIdentityFromKeychain() async throws {
         let label = try #require(Environment.current["REAL_SIGNING_IDENTITY_LABEL"])

diff --git a/Tests/PackageSigningTests/SigningTests.swift b/Tests/PackageSigningTests/SigningTests.swift
@@ -616,7 +616,7 @@ struct SigningTests {
     }
 
     @Test(
-        .enableIfRealSigningIdentityTestEnabled
+        .enabled(if: isRealSigningIdentityTestEnabled())
     )
     func cMSEndToEndWithRSAKeyADPCertificate() async throws {
 
@@ -676,7 +676,7 @@ struct SigningTests {
     }
 
     @Test(
-        .enableIfRealSigningIdentityTestEnabled
+        .enabled(if: isRealSigningIdentityTestEnabled())
     )
     func cMSEndToEndWithECKeyADPCertificate() async throws {
         let keyAndCertChain = try ecADPKeyAndCertChain()
@@ -735,9 +735,7 @@ struct SigningTests {
 
 
     @Test(
-        .enabledOn(platform: .MacOS),
-        .enableIfRealSigningIdentityTestEnabled,
-        .enableIfEnvVarSet("REAL_SIGNING_IDENTITY_LABEL")
+        .enabled(if: isMacOS() && isRealSigningIdentityTestEnabled() && isEnvironmentVariableSet("REAL_SIGNING_IDENTITY_LABEL"))
     )
     func testCMS1_0_0EndToEndWithADPSigningIdentityFromKeychain() async throws {
         let label = try #require(
@@ -793,9 +791,7 @@ struct SigningTests {
     }
 
     @Test(
-        .enabledOn(platform: .MacOS),
-        .enableIfRealSigningIdentityTestEnabled,
-        .enableIfEnvVarSet("REAL_SIGNING_IDENTITY_LABEL")
+        .enabled(if: isMacOS() && isRealSigningIdentityTestEnabled() && isEnvironmentVariableSet("REAL_SIGNING_IDENTITY_LABEL"))
     )
     func testCMSEndToEndWithECKeyADPSigningIdentityFromKeychain() async throws {
         let label = try #require(
@@ -849,9 +845,7 @@ struct SigningTests {
     }
 
     @Test(
-        .enabledOn(platform: .MacOS),
-        .enableIfRealSigningIdentityTestEnabled,
-        .enableIfEnvVarSet("REAL_SIGNING_IDENTITY_LABEL")
+        .enabled(if: isMacOS() && isRealSigningIdentityTestEnabled() && isEnvironmentVariableSet("REAL_SIGNING_IDENTITY_LABEL"))
     )
     func MSEndToEndWithRSAKeyADPSigningIdentityFromKeychain() async throws {
         let label = try #require(