Fix macOS detection when running standalone

.github/workflows/pr-check.yml

@@ -63,6 +63,46 @@ jobs:
         with:
           files: coverage.json
 
+  mac-unittest:
+    name: python${{ matrix.python-version }}
+    runs-on: macos-latest
+
+    strategy:
+      matrix:
+        python-version:
+          - '3.11'
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install test dependencies
+        run: |
+          python -m pip install --upgrade tox tox-gh-actions coverage
+
+      - name: Run tests
+        run: tox
+
+      - name: Convert coverage information
+        if: ${{ always() && github.event.repository.owner.login == 'alisw' }}
+        run: |
+          coverage combine .tox/coverage.*
+          # Codecov only understands XML, JSON and LCOV files.
+          # Apparently, patching os.readlink in unit tests interferes with
+          # finding some source files, but our source shouldn't be affected, so
+          # ignore these errors.
+          coverage json --ignore-errors -o coverage.json
+
+      - name: Upload coverage information
+        if: ${{ always() && github.event.repository.owner.login == 'alisw' }}
+        uses: codecov/codecov-action@v3
+        with:
+          files: coverage.json
+
   lint:
     name: lint
     runs-on: ubuntu-latest

alibuild_helpers/utilities.py

@@ -134,10 +134,13 @@ def format(s, **kwds):
 def doDetectArch(hasOsRelease, osReleaseLines, platformTuple, platformSystem, platformProcessor):
   if platformSystem == "Darwin":
     import platform
-    if platform.machine() == "x86_64":
-      return "osx_x86-64"
-    else:
-      return "osx_arm64"
+    processor = platformProcessor
+    if not processor:
+      if platform.machine() == "x86_64":
+        processor = "x86-64"
+      else:
+        processor = "arm64"
+    return "osx_%s" % processor.replace("_", "-")
   distribution, version, flavour = platformTuple
   distribution = distribution.lower()
   # If platform.dist does not return something sensible,

tests/test_utilities.py

@@ -115,6 +115,7 @@
 
 architecturePayloads = [
   ['osx_x86-64', False, [], ('','',''), 'Darwin', 'x86-64'],
+  ['osx_arm64', False, [], ('','',''), 'Darwin', 'arm64'],
   ['slc5_x86-64', False, [], ('redhat', '5.XX', 'Boron'), 'Linux', 'x86-64'],
   ['slc6_x86-64', False, [], ('centos', '6.X', 'Carbon'), 'Linux', 'x86-64'],
   ['slc7_x86-64', False, [], ('centos', '7.X', 'Ptor'), 'Linux', 'x86-64'],