diff --git a/Tests/TSCBasicTests/ProcessTests.swift b/Tests/TSCBasicTests/ProcessTests.swift index cb5f98df..5c63ecf1 100644 --- a/Tests/TSCBasicTests/ProcessTests.swift +++ b/Tests/TSCBasicTests/ProcessTests.swift @@ -466,12 +466,7 @@ class ProcessTests: XCTestCase { fileprivate extension Process { private static func env() -> [String:String] { - var env = ProcessEnv.vars - #if os(macOS) - // Many of these tests use Python which might not be in the default `PATH` when running these tests from Xcode. - env["PATH"] = "\(env["PATH"] ?? ""):/usr/local/bin" - #endif - return env + return ProcessEnv.vars } private static func script(_ name: String) -> String { diff --git a/Tests/TSCBasicTests/processInputs/deadlock-if-blocking-io b/Tests/TSCBasicTests/processInputs/deadlock-if-blocking-io index 88ad54d0..9bc79efe 100755 --- a/Tests/TSCBasicTests/processInputs/deadlock-if-blocking-io +++ b/Tests/TSCBasicTests/processInputs/deadlock-if-blocking-io @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys diff --git a/Tests/TSCBasicTests/processInputs/in-to-out b/Tests/TSCBasicTests/processInputs/in-to-out index 3b86f0d9..94490b16 100755 --- a/Tests/TSCBasicTests/processInputs/in-to-out +++ b/Tests/TSCBasicTests/processInputs/in-to-out @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys diff --git a/Tests/TSCBasicTests/processInputs/long-stdout-stderr b/Tests/TSCBasicTests/processInputs/long-stdout-stderr index d630a026..684fcca5 100755 --- a/Tests/TSCBasicTests/processInputs/long-stdout-stderr +++ b/Tests/TSCBasicTests/processInputs/long-stdout-stderr @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys diff --git a/Tests/TSCBasicTests/processInputs/simple-stdout-stderr b/Tests/TSCBasicTests/processInputs/simple-stdout-stderr index c4f58949..a840caee 100755 --- a/Tests/TSCBasicTests/processInputs/simple-stdout-stderr +++ b/Tests/TSCBasicTests/processInputs/simple-stdout-stderr @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys diff --git a/Utilities/ci.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Utilities/ci.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 00000000..f7e90ace --- /dev/null +++ b/Utilities/ci.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,79 @@ +{ + "object": { + "pins": [ + { + "package": "IndexStoreDB", + "repositoryURL": "https://github.com/apple/indexstore-db.git", + "state": { + "branch": "main", + "revision": "89ec16c2ac1bb271614e734a2ee792224809eb20", + "version": null + } + }, + { + "package": "swift-asn1", + "repositoryURL": "https://github.com/apple/swift-asn1.git", + "state": { + "branch": null, + "revision": "805deae27a7506dcad043604c00a9dc52d465dcb", + "version": "0.7.0" + } + }, + { + "package": "swift-certificates", + "repositoryURL": "https://github.com/apple/swift-certificates.git", + "state": { + "branch": null, + "revision": "54b9711034c0bd9b18f9ac0fb262d493130bcf13", + "version": "0.1.0" + } + }, + { + "package": "swift-collections", + "repositoryURL": "https://github.com/apple/swift-collections.git", + "state": { + "branch": null, + "revision": "937e904258d22af6e447a0b72c0bc67583ef64a2", + "version": "1.0.4" + } + }, + { + "package": "swift-crypto", + "repositoryURL": "https://github.com/apple/swift-crypto.git", + "state": { + "branch": null, + "revision": "da0fe44138ab86e380f40a2acbd8a611b07d3f64", + "version": "2.4.0" + } + }, + { + "package": "llbuild", + "repositoryURL": "https://github.com/apple/swift-llbuild.git", + "state": { + "branch": "main", + "revision": "4cc1ea448e236c2f4dfe622cec786bce4bd56c45", + "version": null + } + }, + { + "package": "SwiftSyntax", + "repositoryURL": "https://github.com/apple/swift-syntax.git", + "state": { + "branch": "main", + "revision": "2d5575b8771c5ccd5673428d959085ddb74dbbf7", + "version": null + } + }, + { + "package": "swift-system", + "repositoryURL": "https://github.com/apple/swift-system.git", + "state": { + "branch": null, + "revision": "836bc4557b74fe6d2660218d56e3ce96aff76574", + "version": "1.1.1" + } + } + ] + }, + "version": 1 +}