Fix testIncorrectDependencies failure on linux due to merge race

Author: owenv

Tests/FunctionalTests/PluginTests.swift

@@ -1173,13 +1173,11 @@ final class PluginTests: XCTestCase {
             XCTAssert(stdout.contains("Build complete!"), "output:\n\(stderr)\n\(stdout)")
         }
 
-#if os(macOS) // https://github.com/swiftlang/swift-package-manager/issues/8774
         // Try again with the Swift Build build system
         try await fixture(name: "Miscellaneous/Plugins") { path in
             let (stdout, stderr) = try await executeSwiftBuild(path.appending("IncorrectDependencies"), extraArgs: ["--build-system", "swiftbuild", "--build-tests"])
             XCTAssert(stdout.contains("Build complete!"), "output:\n\(stderr)\n\(stdout)")
         }
-#endif
     }
 
     func testSandboxViolatingBuildToolPluginCommands() async throws {

Tests/FunctionalTests/TestDiscoveryTests.swift

@@ -32,16 +32,15 @@ struct TestDiscoveryTests {
     @Test(arguments: [BuildSystemProvider.Kind.native, .swiftbuild])
     func discovery(_ buildSystem: BuildSystemProvider.Kind) async throws {
         try await fixture(name: "Miscellaneous/TestDiscovery/Simple") { fixturePath in
-            let (stdout, stderr) = try await executeSwiftTest(fixturePath, buildSystem: buildSystem)
+            let (stdout, stderr) = try await executeSwiftTest(fixturePath, extraArgs: ["-vv"], buildSystem: buildSystem)
             // in "swift test" build output goes to stderr
             #expect(stderr.contains("Build complete!"))
             // in "swift test" test output goes to stdout
             #expect(stdout.contains("Executed 3 tests"))
         }
     }
 
-    // FIXME: Fix --build-system swiftbuild link file list quoting on non-Darwin
-    @Test(arguments: [BuildSystemProvider.Kind.native])
+    @Test(.bug("https://github.com/swiftlang/swift-build/issues/13"), arguments: [BuildSystemProvider.Kind.native])
     func nonStandardName(_ buildSystem: BuildSystemProvider.Kind) async throws {
         try await fixture(name: "Miscellaneous/TestDiscovery/hello world") { fixturePath in
             let (stdout, stderr) = try await executeSwiftTest(fixturePath, buildSystem: buildSystem)
@@ -64,7 +63,7 @@ struct TestDiscoveryTests {
     }
 
     // FIXME: eliminate extraneous warnings with --build-system swiftbuild
-    @Test(.skipHostOS(.macOS), arguments: [BuildSystemProvider.Kind.native])
+    @Test(.bug("https://github.com/swiftlang/swift-build/issues/573"), .skipHostOS(.macOS), arguments: [BuildSystemProvider.Kind.native])
     func discovery_whenNoTests(_ buildSystem: BuildSystemProvider.Kind) async throws {
         try await fixture(name: "Miscellaneous/TestDiscovery/NoTests") { fixturePath in
             let (stdout, stderr) = try await executeSwiftTest(fixturePath, buildSystem: buildSystem)
@@ -78,7 +77,7 @@ struct TestDiscoveryTests {
     }
 
     // FIXME: --build-system swiftbuild should support hand-authored entry points.
-    @Test(.skipHostOS(.macOS), arguments: [BuildSystemProvider.Kind.native])
+    @Test(.bug("https://github.com/swiftlang/swift-build/issues/572"), .skipHostOS(.macOS), arguments: [BuildSystemProvider.Kind.native])
     func entryPointOverride(_ buildSystem: BuildSystemProvider.Kind) async throws {
         for name in SwiftModule.testEntryPointNames {
             try await fixture(name: "Miscellaneous/TestDiscovery/Simple") { fixturePath in