Merge branch 'main' into t/main/gh8121_radar139977454_swift_test_on_windows

Author: bkhouri

CHANGELOG.md

@@ -3,6 +3,13 @@ Note: This is in reverse chronological order, so newer entries are added to the
 Swift Next
 -----------
 
+Swift 6.2
+---------
+
+* [#8314]
+
+  Starting from tools-version 6.2, `SwiftSetting` provides a `strictMemorySafety` setting to enable the strict memory safety checking introduced in [SE-0458].
+
 Swift 6.0
 -----------
 
@@ -393,7 +400,7 @@ Swift 3.0
 [SE-0387]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0387-cross-compilation-destinations.md
 [SE-0391]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0391-package-registry-publish.md
 [SE-0387 proposal text]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0387-cross-compilation-destinations.md#swift-sdk-installation-and-configuration
-
+[SE-0458]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0458-strict-memory-safety.md
 [SR-5918]: https://bugs.swift.org/browse/SR-5918
 [SR-6978]: https://bugs.swift.org/browse/SR-6978
 [SR-13566]: https://bugs.swift.org/browse/SR-13566

CMakeLists.txt

@@ -52,7 +52,11 @@ find_package(Foundation QUIET)
 find_package(SQLite3 REQUIRED)
 
 # Enable `package` modifier for the whole package.
-add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:-package-name;SwiftPM>")
+if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
+  add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:-package-name;SwiftPM>" -L/usr/local/lib)
+else()
+  add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:-package-name;SwiftPM>")
+endif()
 
 add_subdirectory(BuildSupport/SwiftSyntax)
 add_subdirectory(Sources)

CONTRIBUTING.md

@@ -174,26 +174,19 @@ Clone the following repositories beside the SwiftPM directory:
    $> git clone https://github.com/apple/swift-tools-support-core
    ```
 
-4. [Yams] and checkout tag with the [latest version](https://github.com/jpsim/Yams.git/tags) before 5.0.0.
-
-   For example, if the latest tag is 4.0.6:
-   ```sh
-   $> git clone https://github.com/jpsim/yams --branch 4.0.6
-   ```
-
-5. [swift-driver]
+4. [swift-driver]
    ```sh
    $> git clone https://github.com/apple/swift-driver
    ```
 
-6. [swift-system] and check out tag with the [latest version](https://github.com/apple/swift-system/tags).
+5. [swift-system] and check out tag with the [latest version](https://github.com/apple/swift-system/tags).
 
     For example, if the latest tag is 1.0.0:
     ```sh
     $> git clone https://github.com/apple/swift-system --branch 1.0.0
     ```
 
-7. [swift-collections] and check out tag with the [latest version](https://github.com/apple/swift-collections/tags).
+6. [swift-collections] and check out tag with the [latest version](https://github.com/apple/swift-collections/tags).
 
     For example, if the latest tag is 1.0.1:
     ```sh
@@ -217,6 +210,16 @@ Clone the following repositories beside the SwiftPM directory:
    $> git clone https://github.com/apple/swift-certificates
    ```
 
+10. [swift-syntax]
+   ```sh
+   $> git clone https://github.com/swiftlang/swift-syntax
+   ```
+
+11. [swift-toolchain-sqlite]
+   ```sh
+   $> git clone https://github.com/swiftlang/swift-toolchain-sqlite
+   ```
+
 [swift-argument-parser]: https://github.com/apple/swift-argument-parser
 [swift-collections]: https://github.com/apple/swift-collections
 [swift-driver]: https://github.com/apple/swift-driver
@@ -226,7 +229,8 @@ Clone the following repositories beside the SwiftPM directory:
 [swift-crypto]: https://github.com/apple/swift-crypto
 [swift-asn1]: https://github.com/apple/swift-asn1
 [swift-certificates]: https://github.com/apple/swift-certificates
-[Yams]: https://github.com/jpsim/yams
+[swift-toolchain-sqlite]: https://github.com/swiftlang/swift-toolchain-sqlite
+[swift-syntax]: https://github.com/swiftlang/swift-syntax
 
 
 #### Building
@@ -319,7 +323,7 @@ Note there are several Linux and Swift versions options to choose from, e.g.:
 3. Create a new branch
 4. Make your code changes
 5. Try to keep your changes (when possible) below 200 lines of code.
-6. We use [SwiftFormat](https://www.github.com/nicklockwood/SwiftFormat) to enforce code style. Please install and run SwiftFormat before submitting your PR.
+6. We use [SwiftFormat](https://www.github.com/nicklockwood/SwiftFormat) to enforce code style. Please install and run SwiftFormat before submitting your PR, ideally isolating formatting changes only to code changed for the original goal of the PR. This will keep the PR diff smaller.
 7. Commit (include the Radar link or GitHub issue id in the commit message if possible and a description your changes). Try to have only 1 commit in your PR (but, of course, if you add changes that can be helpful to be kept aside from the previous commit, make a new commit for them).
 8. Push the commit / branch to your fork
 9. Make a PR from your fork / branch to `apple: main`

Documentation/Design/EvolutionIdeas.md

@@ -190,7 +190,7 @@ Bug: N/A
 We need an easy way to edit the Package.swift manifest from automated tools, for
 cases where you don't want users to have to update the Swift code directly. We
 think that it's possible to provide an API to allow this, probably using
-[`SwiftSyntax`](https://github.com/apple/swift/tree/master/tools/SwiftSyntax).
+[`SwiftSyntax`](https://github.com/swiftlang/swift-syntax).
 
 Thread: N/A
 Bug: N/A

Documentation/Usage.md

@@ -140,7 +140,7 @@ You can link against system libraries using the package manager. To do so, you'l
 need to add a special `target` of type `.systemLibrary`, and a `module.modulemap`
 for each system library you're using.
 
-Let's see an example of adding [libgit2](https://libgit2.github.com) as a
+Let's see an example of adding [libgit2](https://github.com/libgit2/libgit2) as a
 dependency to an executable target.
 
 Create a directory called `example`, and initialize it as a package that

Fixtures/Miscellaneous/CheckTestLibraryEnvironmentVariable/Tests/CheckTestLibraryEnvironmentVariableTests/CheckTestLibraryEnvironmentVariableTests.swift

@@ -1,8 +1,21 @@
 import XCTest
 
 final class CheckTestLibraryEnvironmentVariableTests: XCTestCase {
-    func testEnvironmentVariable() throws {
-        let envvar = ProcessInfo.processInfo.environment["SWIFT_TESTING_ENABLED"]
-        XCTAssertEqual(envvar, "0")
+    func testEnvironmentVariables() throws {
+        #if !os(macOS)
+        try XCTSkipIf(true, "Test is macOS specific")
+        #endif
+
+        let testingEnabled = ProcessInfo.processInfo.environment["SWIFT_TESTING_ENABLED"]
+        XCTAssertEqual(testingEnabled, "0")
+
+        if ProcessInfo.processInfo.environment["CONTAINS_SWIFT_TESTING"] != nil {
+            let frameworkPath = try XCTUnwrap(ProcessInfo.processInfo.environment["DYLD_FRAMEWORK_PATH"])
+            let libraryPath = try XCTUnwrap(ProcessInfo.processInfo.environment["DYLD_LIBRARY_PATH"])
+            XCTAssertTrue(
+                frameworkPath.contains("testing") || libraryPath.contains("testing"),
+                "Expected 'testing' in '\(frameworkPath)' or '\(libraryPath)'"
+            )
+        }
     }
 }

Fixtures/Traits/DisablingEmptyDefaultsExample/Package.swift

@@ -0,0 +1,18 @@
+// swift-tools-version: 6.1
+
+import PackageDescription
+
+let package = Package(
+    name: "DisablingEmptyDefaultsExample",
+    dependencies: [
+        .package(
+            path: "../Package11",
+            traits: []
+        ),
+    ],
+    targets: [
+        .executableTarget(
+            name: "DisablingEmptyDefaultsExample"
+        ),
+    ]
+)

Fixtures/Traits/DisablingEmptyDefaultsExample/Sources/DisablingEmptyDefaultsExample/Example.swift

@@ -0,0 +1,6 @@
+@main
+struct Example {
+    static func main() {
+
+    }
+}

Fixtures/Traits/Package11/Package.swift

@@ -0,0 +1,18 @@
+// swift-tools-version: 6.1
+
+import PackageDescription
+
+let package = Package(
+    name: "Package11",
+    products: [
+        .library(
+            name: "Package11Library1",
+            targets: ["Package11Library1"]
+        ),
+    ],
+    targets: [
+        .target(
+            name: "Package11Library1"
+        ),
+    ]
+)

Fixtures/Traits/Package11/Sources/Package11Library1/Library.swift

@@ -0,0 +1,3 @@
+public func hello() {
+    print("Package11Library1")
+}

IntegrationTests/Tests/IntegrationTests/BasicTests.swift

@@ -19,7 +19,6 @@ final class BasicTests: XCTestCase {
 
     func testExamplePackageDealer() throws {
         try XCTSkipIf(isSelfHosted, "These packages don't use the latest runtime library, which doesn't work with self-hosted builds.")
-        try skipUnlessAtLeastSwift6()
 
         try withTemporaryDirectory { tempDir in
             let packagePath = tempDir.appending(component: "dealer")
@@ -94,8 +93,6 @@ final class BasicTests: XCTestCase {
     }
 
     func testSwiftPackageInitExec() throws {
-        try skipUnlessAtLeastSwift6()
-
         try withTemporaryDirectory { tempDir in
             // Create a new package with an executable target.
             let packagePath = tempDir.appending(component: "Project")
@@ -121,8 +118,6 @@ final class BasicTests: XCTestCase {
     }
 
     func testSwiftPackageInitExecTests() throws {
-        try skipUnlessAtLeastSwift6()
-
         try XCTSkip("FIXME: swift-test invocations are timing out in Xcode and self-hosted CI")
 
         try withTemporaryDirectory { tempDir in
@@ -146,8 +141,6 @@ final class BasicTests: XCTestCase {
     }
 
     func testSwiftPackageInitLib() throws {
-        try skipUnlessAtLeastSwift6()
-
         try withTemporaryDirectory { tempDir in
             // Create a new package with an executable target.
             let packagePath = tempDir.appending(component: "Project")
@@ -166,8 +159,6 @@ final class BasicTests: XCTestCase {
     }
 
     func testSwiftPackageLibsTests() throws {
-        try skipUnlessAtLeastSwift6()
-
         try XCTSkip("FIXME: swift-test invocations are timing out in Xcode and self-hosted CI")
 
         try withTemporaryDirectory { tempDir in
@@ -226,8 +217,6 @@ final class BasicTests: XCTestCase {
     }
 
     func testSwiftRun() throws {
-        try skipUnlessAtLeastSwift6()
-
         try withTemporaryDirectory { tempDir in
             let packagePath = tempDir.appending(component: "secho")
             try localFileSystem.createDirectory(packagePath)
@@ -255,8 +244,6 @@ final class BasicTests: XCTestCase {
     }
 
     func testSwiftTest() throws {
-        try skipUnlessAtLeastSwift6()
-
         try XCTSkip("FIXME: swift-test invocations are timing out in Xcode and self-hosted CI")
 
         try withTemporaryDirectory { tempDir in
@@ -378,9 +365,3 @@ private extension Character {
         }
     }
 }
-
-private func skipUnlessAtLeastSwift6() throws {
-    #if compiler(<6.0)
-    try XCTSkipIf(true, "Skipping because test requires at least Swift 6.0")
-    #endif
-}

IntegrationTests/Tests/IntegrationTests/SwiftPMTests.swift

@@ -49,6 +49,38 @@ final class SwiftPMTests: XCTestCase {
         }
     }
 
+    func testSwiftBuild() throws {
+        #if os(Linux)
+        if FileManager.default.contents(atPath: "/etc/system-release").map { String(decoding: $0, as: UTF8.self) == "Amazon Linux release 2 (Karoo)\n" } ?? false {
+            throw XCTSkip("Skipping SwiftBuild testing on Amazon Linux because of platform issues.")
+        }
+        #endif
+
+        // Test SwiftBuildSystem
+        do {
+            try withTemporaryDirectory { tmpDir in
+                let packagePath = tmpDir.appending(component: "foo")
+                try localFileSystem.createDirectory(packagePath)
+                try sh(swiftPackage, "--package-path", packagePath, "init", "--type", "executable")
+                try sh(swiftBuild, "--package-path", packagePath, "--build-system", "swiftbuild")
+                // SWBINTTODO: Path issues related to swift run of the output from swiftbuild buildsystem
+                //let (stdout, stderr)  = try sh(swiftRun, "--package-path", packagePath, "--build-system", "swiftbuild")
+                //XCTAssertMatch(stdout, .contains("Hello, world!"))
+            }
+        }
+
+        do {
+            try withTemporaryDirectory { tmpDir in
+                let packagePath = tmpDir.appending(component: "foo")
+                try localFileSystem.createDirectory(packagePath)
+                try sh(swiftPackage, "--package-path", packagePath, "init", "--type", "library")
+                try sh(swiftBuild, "--package-path", packagePath, "--build-system", "swiftbuild")
+                // SWBINTTODO: Path issues related to swift test of the output from a swiftbuild buildsystem
+                //try sh(swiftTest, "--package-path", packagePath, "--build-system", "swiftbuild")
+            }
+        }
+    }
+
     func testArchCustomization() throws {
         #if !os(macOS)
         try XCTSkip("Test requires macOS")