Update CompatibilityTests logic

Author: Kyle-Ye

Package.swift

@@ -133,6 +133,14 @@ if libraryEvolutionCondition {
     sharedSwiftSettings.append(.unsafeFlags(["-enable-library-evolution", "-no-verify-emitted-module-interface"]))
 }
 
+// MARK: - [env] OPENATTRIBUTEGRAPH_COMPATIBILITY_TEST
+
+let compatibilityTestCondition = envEnable("OPENATTRIBUTEGRAPH_COMPATIBILITY_TEST", default: true)
+sharedCSettings.append(.define("OpenAttributeGraph", to: compatibilityTestCondition ? "1" : "0"))
+if !compatibilityTestCondition {
+    sharedSwiftSettings.append(.define("OpenAttributeGraph"))
+}
+
 // MARK: - Targets
 
 let openAttributeGraphTarget = Target.target(
@@ -213,14 +221,21 @@ let package = Package(
         openAttributeGraphTarget,
         openAttributeGraphSPITarget,
         openAttributeGraphShimsTarget,
+    ],
+    cxxLanguageStandard: .cxx20
+)
 
+if !compatibilityTestCondition {
+    package.targets += [
         openAttributeGraphTestsTarget,
         openAttributeGraphCxxTestsTarget,
         openAttributeGraphShimsTestsTarget,
-        openAttributeGraphCompatibilityTestsTarget,
-    ],
-    cxxLanguageStandard: .cxx20
-)
+    ]
+}
+
+if buildForDarwinPlatform {
+    package.targets.append(openAttributeGraphCompatibilityTestsTarget)
+}
 
 extension Target {
     func addAGSettings() {
@@ -267,12 +282,6 @@ if attributeGraphCondition {
     package.platforms = [.iOS(.v13), .macOS(.v10_15), .macCatalyst(.v13), .tvOS(.v13), .watchOS(.v5)]
 }
 
-let compatibilityTestCondition = envEnable("OPENATTRIBUTEGRAPH_COMPATIBILITY_TEST")
-if compatibilityTestCondition && attributeGraphCondition {
-    openAttributeGraphCompatibilityTestsTarget.addCompatibilitySettings()
-} else {
-    openAttributeGraphCompatibilityTestsTarget.dependencies.append("OpenAttributeGraph")
-}
 
 extension [Platform] {
     static var nonDarwinPlatforms: [Platform] {

Tests/OpenAttributeGraphCompatibilityTests/Attribute/AttributeTestBase.swift

@@ -2,7 +2,15 @@
 //  GraphShims.swift
 //  OpenAttributeGraphCompatibilityTests
 
-#if OPENATTRIBUTEGRAPH_COMPATIBILITY_TEST
+#if OPENATTRIBUTEGRAPH
+@_exported import OpenAttributeGraph
+let compatibilityTestEnabled = false
+#if OPENATTRIBUTEGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
+public let swiftToolchainSupported = true
+#else
+public let swiftToolchainSupported = false
+#endif
+#else
 @_exported public import AttributeGraph
 public typealias OAGAttributeInfo = AGAttributeInfo
 public typealias OAGCachedValueOptions = AGCachedValueOptions
@@ -12,12 +20,4 @@ public typealias OAGValue = AGValue
 public typealias OAGValueOptions = AGValueOptions
 public let compatibilityTestEnabled = true
 public let swiftToolchainSupported = true
-#else
-@_exported import OpenAttributeGraph
-let compatibilityTestEnabled = false
-#if OPENATTRIBUTEGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
-public let swiftToolchainSupported = true
-#else
-public let swiftToolchainSupported = false
-#endif
 #endif

Tests/OpenAttributeGraphCompatibilityTests/GraphShims.swift

@@ -1,5 +1,5 @@
 //
-//  VersionTests.swift
+//  VersionCompatibilityTests.swift
 //  OpenAttributeGraphCompatibilityTests
 
 import Testing
@@ -9,18 +9,7 @@ struct VersionTests {
     @Test
     func versionNumber() async {
         await confirmation { confirm in
-            #if OPENATTRIBUTEGRAPH_COMPATIBILITY_TEST
-            switch Int32(ATTRIBUTEGRAPH_RELEASE) {
-                case ATTRIBUTEGRAPH_RELEASE_2021:
-                    #expect(AGVersion == 0x20014)
-                    confirm()
-                case ATTRIBUTEGRAPH_RELEASE_2024:
-                    #expect(AGVersion == 0x2001e)
-                    confirm()
-                default:
-                    break
-            }
-            #else
+            #if OPENATTRIBUTEGRAPH
             switch Int32(OPENATTRIBUTEGRAPH_RELEASE) {
                 case OPENATTRIBUTEGRAPH_RELEASE_2021:
                     #expect(OpenAttributeGraphVersionNumber.isApproximatelyEqual(to: 3.2))
@@ -33,6 +22,17 @@ struct VersionTests {
                 default:
                     break
             }
+            #else
+            switch Int32(ATTRIBUTEGRAPH_RELEASE) {
+                case ATTRIBUTEGRAPH_RELEASE_2021:
+                    #expect(AGVersion == 0x20014)
+                    confirm()
+                case ATTRIBUTEGRAPH_RELEASE_2024:
+                    #expect(AGVersion == 0x2001e)
+                    confirm()
+                default:
+                    break
+            }
             #endif
         }
     }