diff options
| -rw-r--r-- | .github/workflows/unit_tests.yaml | 3 | ||||
| -rw-r--r-- | lib/spack/spack/test/relocate.py | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml index 26df165093..fa53ecd5bc 100644 --- a/.github/workflows/unit_tests.yaml +++ b/.github/workflows/unit_tests.yaml @@ -186,9 +186,10 @@ jobs: flags: unittests,linux,clingo # Run unit tests on MacOS macos: - runs-on: macos-latest + runs-on: ${{ matrix.os }} strategy: matrix: + os: [macos-latest, macos-14] python-version: ["3.11"] steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # @v2 diff --git a/lib/spack/spack/test/relocate.py b/lib/spack/spack/test/relocate.py index 0ed6af59e2..fbc232e3ca 100644 --- a/lib/spack/spack/test/relocate.py +++ b/lib/spack/spack/test/relocate.py @@ -9,6 +9,8 @@ import shutil import pytest +import archspec.cpu + import spack.concretize import spack.paths import spack.platforms @@ -282,6 +284,7 @@ def test_relocate_text_bin_raise_if_new_prefix_is_longer(tmpdir): @pytest.mark.requires_executables("install_name_tool", "file", "cc") +@pytest.mark.skipif(str(archspec.cpu.host().family) != "x86_64", reason="failing on Apple M1/M2") def test_fixup_macos_rpaths(make_dylib, make_object_file): # For each of these tests except for the "correct" case, the first fixup # should make changes, and the second fixup should be a null-op. |