Improve test suite layering

.github/workflows/build-and-test-linux.yml

@@ -12,41 +12,107 @@ jobs:
     - uses: actions/checkout@v5
 
     - name: Install build dependencies
-      run: sudo apt install cmake libsuitesparse-dev libboost-filesystem-dev python3-pybind11
-
-    - name: Install uv for testing
-      uses: astral-sh/setup-uv@v7
-      with:
-        version: "0.9.18"
-        enable-cache: false
-
-    - name: Install python
-      run: uv python install 3.13
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y cmake libsuitesparse-dev libboost-filesystem-dev libgtest-dev python3-pybind11
 
     - name: Create build dir
       run: mkdir ci-build
 
     - name: Configure CMake
       working-directory: ci-build
-      run: cmake .. --preset linux-gcc-portable
+      run: cmake .. --preset linux-gcc-portable -DBUILD_CXX_TESTS=ON
 
     - name: Build
       working-directory: ci-build
       run: cmake --build . -j 4
 
-    - name: Test environment
+    - name: Run C++ unit tests
       working-directory: ci-build
-      run: |
-        uv venv
-        uv pip install git+https://github.com/daisy-model/daisypy-test
+      run: ctest -L cxx-unit --output-on-failure
 
-    - name: Test
+    - name: Build Debian package
       working-directory: ci-build
-      run: ctest --output-on-failure
+      run: cpack -G DEB
+
+    - name: Build packaged test bundle
+      run: make test-bundle
 
-    - name: Upload test log
+    - name: Upload Linux Debian package
+      uses: actions/upload-artifact@v5
+      with:
+        name: ci-linux-package
+        path: ci-build/*.deb
+        if-no-files-found: error
+
+    - name: Upload Linux test bundle
+      uses: actions/upload-artifact@v5
+      with:
+        name: ci-linux-test-bundle
+        path: build/test-bundle/*.zip
+        if-no-files-found: error
+
+    - name: Upload C++ test log
       if: ${{ !cancelled() }}
       uses: actions/upload-artifact@v5
       with:
         name: test-output-ubuntu
-        path: build/Testing
+        path: ci-build/Testing
+
+  package-test:
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Install test dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y unzip
+
+    - name: Install uv for packaged tests
+      uses: astral-sh/setup-uv@v7
+      with:
+        version: "0.9.18"
+        enable-cache: true
+
+    - name: Install python
+      run: uv python install 3.13
+
+    - name: Download Linux Debian package
+      uses: actions/download-artifact@v4
+      with:
+        name: ci-linux-package
+        path: ci-package
+
+    - name: Download Linux test bundle
+      uses: actions/download-artifact@v4
+      with:
+        name: ci-linux-test-bundle
+        path: ci-test-bundle
+
+    - name: Unpack test bundle
+      working-directory: ci-test-bundle
+      run: unzip *.zip
+
+    - name: Install Debian package
+      run: sudo apt-get install -y ./ci-package/*.deb
+
+    - name: Run packaged tests
+      run: |
+        bundle_root="$(find ci-test-bundle -maxdepth 1 -type d -name 'daisy-test-suite-*' -print -quit)"
+        if [ -z "$bundle_root" ]; then
+          echo "Packaged test bundle not found." >&2
+          exit 1
+        fi
+        uv run --with git+https://github.com/daisy-model/daisypy-test \
+          python "$bundle_root/run_packaged_tests.py" \
+          --bundle-root "$bundle_root" \
+          --daisy-bin "/usr/bin/daisy" \
+          --output-root "$PWD/package-test-results"
+
+    - name: Upload packaged test output
+      if: ${{ !cancelled() }}
+      uses: actions/upload-artifact@v5
+      with:
+        name: packaged-test-output-ubuntu
+        path: package-test-results

.github/workflows/build-and-test-macos.yml

@@ -15,52 +15,126 @@ jobs:
       run: brew untap aws/tap || true
 
     - name: Install build dependencies using brew
-      run: brew install cmake boost suite-sparse pybind11
+      run: brew install cmake boost googletest suite-sparse pybind11
 
     - name: Install uv
       uses: astral-sh/setup-uv@v7
       with:
         version: "0.9.18"
-        enable-cache: false
+        enable-cache: true
 
     - name: Install python
       run: uv python install 3.13
 
+    - name: Resolve managed python root
+      id: python-root
+      run: |
+        python_root="$(find "$(uv python dir)" -maxdepth 1 -mindepth 1 -type d -name 'cpython-3.13*' -print -quit)"
+        if [ -z "$python_root" ]; then
+          echo "Managed Python 3.13 installation not found." >&2
+          exit 1
+        fi
+        echo "root=$python_root" >> "$GITHUB_OUTPUT"
+
     - name: Create build dir
       run: mkdir ci-build
 
     - name: Configure CMake
       working-directory: ci-build
       run: >
         cmake ..
-        -DUV_INSTALLED_PYTHON_ROOT_DIR=$( ls -d $( uv python dir )/* | grep 3.13 )
+        -DUV_INSTALLED_PYTHON_ROOT_DIR="${{ steps.python-root.outputs.root }}"
+        -DBUILD_CXX_TESTS=ON
         --preset macos-clang-portable
 
     - name: Build
       working-directory: ci-build
       run: cmake --build . -j 4
 
+    - name: Run C++ unit tests
+      working-directory: ci-build
+      run: ctest -L cxx-unit --output-on-failure
+
     - name: Pack
       working-directory: ci-build
       run: cpack -G ZIP
 
-    - name: Install
-      working-directory: ci-build
-      run: unzip $( ls | grep -e "daisy.*Darwin-python.*zip" )
+    - name: Build packaged test bundle
+      run: make test-bundle
 
-    - name: Setup test environment
-      working-directory: ci-build
-      run: |
-        uv venv
-        uv pip install git+https://github.com/daisy-model/daisypy-test
+    - name: Upload macOS package
+      uses: actions/upload-artifact@v5
+      with:
+        name: ci-macos-package
+        path: ci-build/daisy-*Darwin-python*.zip
+        if-no-files-found: error
 
-    - name: Test
-      working-directory: ci-build
-      run: ctest --output-on-failure
+    - name: Upload macOS test bundle
+      uses: actions/upload-artifact@v5
+      with:
+        name: ci-macos-test-bundle
+        path: build/test-bundle/*.zip
+        if-no-files-found: error
 
-    - name: Upload test log
+    - name: Upload C++ test log
       if: ${{ !cancelled() }}
       uses: actions/upload-artifact@v5
       with:
         name: test-output-macos
         path: ci-build/Testing
+
+  package-test:
+    needs: build
+    runs-on: macos-latest
+
+    steps:
+    - name: Install uv
+      uses: astral-sh/setup-uv@v7
+      with:
+        version: "0.9.18"
+        enable-cache: true
+
+    - name: Install python
+      run: uv python install 3.13
+
+    - name: Download macOS package
+      uses: actions/download-artifact@v4
+      with:
+        name: ci-macos-package
+        path: ci-package
+
+    - name: Download macOS test bundle
+      uses: actions/download-artifact@v4
+      with:
+        name: ci-macos-test-bundle
+        path: ci-test-bundle
+
+    - name: Unpack package and test bundle
+      run: |
+        unzip ci-package/*.zip -d ci-install
+        unzip ci-test-bundle/*.zip -d ci-test-bundle
+
+    - name: Run packaged tests
+      run: |
+        bundle_root="$(find ci-test-bundle -maxdepth 1 -type d -name 'daisy-test-suite-*' -print -quit)"
+        daisy_bin="$(find ci-install -type f -path '*/Daisy/bin/daisy' -print -quit)"
+        if [ -z "$bundle_root" ]; then
+          echo "Packaged test bundle not found." >&2
+          exit 1
+        fi
+        if [ -z "$daisy_bin" ]; then
+          echo "Packaged Daisy binary not found." >&2
+          exit 1
+        fi
+        uv run --with git+https://github.com/daisy-model/daisypy-test \
+          python "$bundle_root/run_packaged_tests.py" \
+          --bundle-root "$bundle_root" \
+          --daisy-bin "$daisy_bin" \
+          --output-root "$PWD/package-test-results"
+
+    - name: Upload packaged test output
+      if: ${{ !cancelled() }}
+      uses: actions/upload-artifact@v5
+      with:
+        name: packaged-test-output-macos
+        path: package-test-results