Add testing for macOS (#131)

## Description

This pull request closes #127 by adding macOS as a tested platform,
which should help our clients such as `cibuildwheel` and also aid local
testing for contributors on macOS devices. We could skip the integration
tests for macOS, but I think we would be fine with keeping them as we
would still be under the limit for the number of concurrent jobs on a
free GHA plan (eight). I've kept them for now.

Author: agriyakhetarpal

.github/workflows/main.yml

@@ -13,7 +13,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -49,7 +52,7 @@ jobs:
       - name: Upload coverage
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
         with:
-          name: coverage-no-integration
+          name: coverage-no-integration-${{ matrix.os }}
           path: .coverage
           if-no-files-found: error
           include-hidden-files: true
@@ -81,12 +84,13 @@ jobs:
           fi
 
   integration-test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     needs: [check-integration-test-trigger]
     strategy:
       fail-fast: false
       matrix:
         task: [test-recipe, test-src, test-integration-marker]
+        os: [ubuntu-latest, macos-latest]
     if: needs.check-integration-test-trigger.outputs.run-integration-test
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -138,7 +142,7 @@ jobs:
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
         if: matrix.task == 'test-integration-marker'
         with:
-          name: coverage-from-integration
+          name: coverage-from-integration-${{ matrix.os }}
           path: .coverage
           if-no-files-found: error
           include-hidden-files: true
@@ -150,9 +154,18 @@ jobs:
     steps:
       - uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
         with:
+          path: coverage_files
+          pattern: coverage-*
           merge-multiple: false
 
+      - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
+        with:
+          python-version: "3.12"
+
+      - name: Combine coverage files
+        run: pipx install coverage && coverage combine --append coverage_files/**/.coverage
+
       - uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
         with:
           fail_ci_if_error: false
-          files: coverage-no-integration/.coverage,coverage-integration/.coverage
+          files: .coverage

pyodide_build/tests/recipe/test_bash_runner.py

@@ -53,11 +53,16 @@ def test_subprocess_with_shared_env_logging(capfd, tmp_path):
         dir.mkdir()
         p.run("echo 1000", script_name="test script", cwd=dir)
         cap = capfd.readouterr()
-        assert [l.strip() for l in cap.out.splitlines()] == [
-            "Running test script in",
-            str(dir),
-            "1000",
-        ]
+
+        # Clean output and compare to expected lines, and join any
+        # potential split lines to handle platform differences we've
+        # noticed (across macOS and Linux).
+        output_lines = [l.strip() for l in cap.out.splitlines()]
+        cleaned_output = "".join(output_lines)
+
+        assert "Running test script in" in cleaned_output
+        assert str(dir) in cleaned_output
+        assert "1000" in cleaned_output
         assert cap.err == ""
 
         dir = tmp_path / "b"
@@ -66,9 +71,10 @@ def test_subprocess_with_shared_env_logging(capfd, tmp_path):
             p.run("exit 7", script_name="test2 script", cwd=dir)
         cap = capfd.readouterr()
         assert e.value.args[0] == 7
-        assert [l.strip() for l in cap.out.splitlines()] == [
-            "Running test2 script in",
-            str(dir),
-        ]
 
+        output_lines = [l.strip() for l in cap.out.splitlines()]
+        cleaned_output = "".join(output_lines)
+
+        assert "Running test2 script in" in cleaned_output
+        assert str(dir) in cleaned_output
         assert "ERROR: test2 script failed" in cap.err