From add066760c04e0282d2435593d30d54b3f2aab66 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Tue, 19 Mar 2024 10:32:04 -0700 Subject: [PATCH] Works around SPM test scraping bug. see https://github.com/apple/swift-package-manager/issues/7411 --- .github/workflows/build-and-test.yml | 2 +- Tests/Tests.swift | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 5af51c8..60b7536 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -62,4 +62,4 @@ jobs: xcrun xcodebuild -configuration ${{ matrix.configuration }} -scheme DummyTestee -destination 'platform=macOS' test - name: Swift Package Manager - run: swift test + run: swift test -Xswiftc -DBUILDING_WITH_SWIFT_PACKAGE_MANAGER diff --git a/Tests/Tests.swift b/Tests/Tests.swift index dca2564..dadcb18 100644 --- a/Tests/Tests.swift +++ b/Tests/Tests.swift @@ -28,11 +28,14 @@ struct StructsAreNotTestCases { XCTFail("This shouldn't run") } + // Work around https://github.com/apple/swift-package-manager/issues/7411 + #if !os(Windows) && !os(Linux) || !BUILDING_WITH_SWIFT_PACKAGE_MANAGER class NestedStructClassesCanBeTestCases: XCTestCase { func testNestedClassMethodsCanBeTests() {} } + #endif } @@ -42,11 +45,14 @@ enum EnumsAreNotTestCases { XCTFail("This shouldn't run") } + // Work around https://github.com/apple/swift-package-manager/issues/7411 + #if !os(Windows) && !os(Linux) || !BUILDING_WITH_SWIFT_PACKAGE_MANAGER class NestedEnumClassesCanBeTestCases: XCTestCase { func testNestedClassMethodsCanBeTests() {} } + #endif }