Foo

Author: bkhouri

Package.swift

@@ -55,17 +55,6 @@ let swiftPMDataModelProduct = (
     ]
 )
 
-let usePackageDependencies = ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil
-
-let swiftTestingTargetDep: [Target.Dependency]
-if !usePackageDependencies {
-    swiftTestingTargetDep = [
-        .product(name: "Testing", package: "swift-testing"),
-    ]
-} else {
-    swiftTestingTargetDep = []
-}
-
 /** The `libSwiftPM` set of interfaces to programmatically work with Swift
  packages.  `libSwiftPM` includes all of the SwiftPM code except the
  command line tools, while `libSwiftPMDataModel` includes only the data model.
@@ -82,6 +71,22 @@ let swiftPMProduct = (
     ]
 )
 
+let usePackageDependencies = ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil
+
+let swiftTestingTargetDep: [Target.Dependency]
+let swiftTestingPackageDep: [Package.Dependency]
+if usePackageDependencies {
+    swiftTestingTargetDep = []
+    swiftTestingPackageDep = []
+} else {
+    swiftTestingTargetDep = [
+        .product(name: "Testing", package: "swift-testing")
+    ]
+    swiftTestingPackageDep = [
+        // .package(path: "../swift-testing"),
+    ]
+}
+
 #if os(Windows)
 let includeDynamicLibrary: Bool = false
 let systemSQLitePkgConfig: String? = nil
@@ -764,7 +769,7 @@ let package = Package(
                 .product(name: "TSCTestSupport", package: "swift-tools-support-core"),
                 .product(name: "OrderedCollections", package: "swift-collections"),
                 "Workspace",
-            ]+ swiftTestingTargetDep,
+            ] + swiftTestingTargetDep,
             swiftSettings: [
                 .unsafeFlags(["-static"]),
             ]
@@ -1054,6 +1059,7 @@ if usePackageDependencies {
         .package(path: "../swift-toolchain-sqlite"),
     ]
 }
+package.dependencies += swiftTestingPackageDep
 
 /// If ENABLE_APPLE_PRODUCT_TYPES is set in the environment, then also define ENABLE_APPLE_PRODUCT_TYPES in each of the regular targets and test targets.
 if ProcessInfo.processInfo.environment["ENABLE_APPLE_PRODUCT_TYPES"] == "1" {