Make xcodebuild testing work and do it in CI.

hylo-lang · Feb 27, 2024 · 37efaa0 · 37efaa0
1 parent cef47fa
commit 37efaa0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -39,9 +39,9 @@ jobs:
         with:
           runCmd: cmake -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DENABLE_TESTING=1 -GNinja -S . -B .devcontainer-build && cmake --build .devcontainer-build && ctest -V --test-dir .devcontainer-build
 
-      - name: 'Xcode (build only—"error: Scheme DummyTestee is not currently configured for the test action.")'
+      - name: Xcode
         if: ${{ matrix.os == 'macos-latest' }}
         run: |
           cmake -DENABLE_TESTING=1 -GXcode -S . -B .xcode-build
           cd .xcode-build
-          xcrun xcodebuild -configuration ${{ matrix.configuration }} -scheme DummyTestee -destination 'platform=macOS' build-for-testing
+          xcrun xcodebuild -configuration ${{ matrix.configuration }} -scheme DummyTestee -destination 'platform=macOS' test
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,6 +11,8 @@ project(SwiftCMakeXCTesting
 )
 enable_testing()
 
+set(CMAKE_XCODE_GENERATE_SCHEME YES)
+
 list(PREPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)
 
 option(SwiftCMakeXCTesting_FORCE_BUILD_GenerateXCTestMain