Add macOS-14 and macOS-15 support to testsuite workflow (fixes #1)

MLopez-Ibanez · MLopez-Ibanez · commit 2e49b9688321 · 2026-02-10T15:36:27.000Z
* .github/workflows/moocore.yml: Update matrix.
 * ./*.test: Replace GNU-specific long options with portable short options
   - Update sort --ignore-leading-blanks to sort -b
   - Update sort --stable to sort -s
   - Update cat --squeeze-blank to cat -s
diff --git a/.github/workflows/moocore.yml b/.github/workflows/moocore.yml
@@ -34,11 +34,11 @@ jobs:
           - { os: ubuntu-22.04,     cc: gcc-10 }
           - { os: ubuntu-22.04,     cc: gcc-11 }
           - { os: ubuntu-24.04-arm, cc: gcc-12 }
-          # FIXME: needs
-          # * brew install xz
-          # * fix options only available in GNU diff
-          #- { os: macos-15-intel, cc: clang, python-version: '3.10' }
-          #- { os: macos-14, cc: clang, python-version: '3.10' }
+          - { os: macos-14,         cc: clang  }
+          - { os: macos-14,         cc: gcc-13 }
+          - { os: macos-15-intel,   cc: clang  }
+          - { os: macos-15-intel,   cc: gcc-13 }
+
     env:
       CC: ${{ matrix.cc }}
 
diff --git a/eaf/input1.test b/eaf/input1.test
@@ -1 +1 @@
-${PROGRAM} --quiet -i- ../data/input1.dat | sort | cat --squeeze-blank
+${PROGRAM} --quiet -i- ../data/input1.dat | sort | cat -s
diff --git a/eaf/ran.1000pts.3d.10.test b/eaf/ran.1000pts.3d.10.test
@@ -1 +1 @@
-${PROGRAM} --quiet ../data/ran.1000pts.3d.10 | sort | cat --squeeze-blank
+${PROGRAM} --quiet ../data/ran.1000pts.3d.10 | sort | cat -s
diff --git a/eaf/spherical-3d-2000pts-10.test b/eaf/spherical-3d-2000pts-10.test
@@ -1 +1 @@
-xzcat ../data/${TESTNAME}.dat.xz | $PROGRAM --quiet | sort --stable | cat --squeeze-blank
+xzcat ../data/${TESTNAME}.dat.xz | $PROGRAM --quiet | sort -s | cat -s
diff --git a/nondominated/DTLZDiscontinuousShape.3d.front.1000pts.10.test b/nondominated/DTLZDiscontinuousShape.3d.front.1000pts.10.test
@@ -1 +1 @@
-$PROGRAM < ../data/${TESTNAME} --union --quiet --filter | sort --ignore-leading-blanks
+$PROGRAM < ../data/${TESTNAME} --union --quiet --filter | sort -b
diff --git a/nondominated/DTLZLinearShape.3d.front.1000pts.10.test b/nondominated/DTLZLinearShape.3d.front.1000pts.10.test
@@ -1 +1 @@
-$PROGRAM < ../data/${TESTNAME} --union --quiet --filter | sort --ignore-leading-blanks
+$PROGRAM < ../data/${TESTNAME} --union --quiet --filter | sort -b
diff --git a/nondominated/DTLZLinearShape.6d.front.700pts.10.test b/nondominated/DTLZLinearShape.6d.front.700pts.10.test
@@ -1 +1 @@
-xzcat ../data/${TESTNAME}.xz | $PROGRAM  --union --quiet --filter | sort --ignore-leading-blanks
+xzcat ../data/${TESTNAME}.xz | $PROGRAM  --union --quiet --filter | sort -b
diff --git a/nondominated/DTLZSphereShape.3d.front.1000pts.10.test b/nondominated/DTLZSphereShape.3d.front.1000pts.10.test
@@ -1 +1 @@
-$PROGRAM < ../data/${TESTNAME} --union --quiet --filter | sort --ignore-leading-blanks
+$PROGRAM < ../data/${TESTNAME} --union --quiet --filter | sort -b
diff --git a/nondominated/DTLZSphereShape.5d.front.1000pts.10.test b/nondominated/DTLZSphereShape.5d.front.1000pts.10.test
@@ -1 +1 @@
-$PROGRAM < ../data/${TESTNAME} --union --quiet --filter | sort --ignore-leading-blanks
+$PROGRAM < ../data/${TESTNAME} --union --quiet --filter | sort -b
diff --git a/nondominated/DTLZSphereShape.6d.front.1000pts.10.test b/nondominated/DTLZSphereShape.6d.front.1000pts.10.test
@@ -1 +1 @@
-xzcat ../data/${TESTNAME}.xz | $PROGRAM --union --quiet --filter | sort --ignore-leading-blanks
+xzcat ../data/${TESTNAME}.xz | $PROGRAM --union --quiet --filter | sort -b
diff --git a/nondominated/ran.1000pts.3d.10.test b/nondominated/ran.1000pts.3d.10.test
@@ -1 +1 @@
-xzcat ../eaf/${TESTNAME}.exp.xz | $PROGRAM --union --quiet --filter | sort --ignore-leading-blanks
+xzcat ../eaf/${TESTNAME}.exp.xz | $PROGRAM --union --quiet --filter | sort -b
diff --git a/nondominated/ran.1300pts.5d.10.test b/nondominated/ran.1300pts.5d.10.test
@@ -1 +1 @@
-xzcat ../data/${TESTNAME}.xz | $PROGRAM --maximise --union --quiet --filter | sort --ignore-leading-blanks
+xzcat ../data/${TESTNAME}.xz | $PROGRAM --maximise --union --quiet --filter | sort -b
diff --git a/nondominated/ran.9000pts.4d.10.test b/nondominated/ran.9000pts.4d.10.test
@@ -1 +1 @@
-xzcat ../data/${TESTNAME}.xz | $PROGRAM --maximise --union --quiet --filter | sort --ignore-leading-blanks
+xzcat ../data/${TESTNAME}.xz | $PROGRAM --maximise --union --quiet --filter | sort -b
diff --git a/nondominated/test2D-200k.test b/nondominated/test2D-200k.test
@@ -1 +1 @@
-xzcat ../data/${TESTNAME}.inp.xz | $PROGRAM --quiet --filter | sort --ignore-leading-blanks --stable
+xzcat ../data/${TESTNAME}.inp.xz | $PROGRAM --quiet --filter | sort -b -s

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-${PROGRAM} --quiet -i- ../data/input1.dat \| sort \| cat --squeeze-blank`
	`1`	`+${PROGRAM} --quiet -i- ../data/input1.dat \| sort \| cat -s`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-${PROGRAM} --quiet ../data/ran.1000pts.3d.10 \| sort \| cat --squeeze-blank`
	`1`	`+${PROGRAM} --quiet ../data/ran.1000pts.3d.10 \| sort \| cat -s`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-xzcat ../data/${TESTNAME}.dat.xz \| $PROGRAM --quiet \| sort --stable \| cat --squeeze-blank`
	`1`	`+xzcat ../data/${TESTNAME}.dat.xz \| $PROGRAM --quiet \| sort -s \| cat -s`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-$PROGRAM < ../data/${TESTNAME} --union --quiet --filter \| sort --ignore-leading-blanks`
	`1`	`+$PROGRAM < ../data/${TESTNAME} --union --quiet --filter \| sort -b`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-xzcat ../data/${TESTNAME}.xz \| $PROGRAM --union --quiet --filter \| sort --ignore-leading-blanks`
	`1`	`+xzcat ../data/${TESTNAME}.xz \| $PROGRAM --union --quiet --filter \| sort -b`