tools/ci.sh: Add new Unix target with terse error messages.

agatti · agatti · commit fea036907682 · 2026-06-09T06:18:05.000+02:00
This commit adds a new CI target for the Unix port, which is the `standard` variant being built with terse error messages. Even though it won't cover all possible tests failing with terse error messages (some occur only in the `coverage` build variant), this should be a good start for preventing new tests to not assume a particular error message level. To make things automated, the new target is also added to the regular CI jobs set in the Unix port's GitHub workflow file. This closes #17707. Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
@@ -67,6 +67,18 @@ jobs:
       if: failure()
       run: tests/run-tests.py --print-failures
 
+  standard_terse:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+    - name: Build
+      run: tools/ci.sh unix_standard_terse_build
+    - name: Run main test suite
+      run: tools/ci.sh unix_standard_terse_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests.py --print-failures
+
   coverage:
     runs-on: ubuntu-latest
     steps:
diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
@@ -83,7 +83,9 @@
 #define MICROPY_PY_GC_COLLECT_RETVAL   (1)
 
 // Enable detailed error messages and warnings.
+#ifndef MICROPY_ERROR_REPORTING
 #define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_DETAILED)
+#endif
 #define MICROPY_WARNINGS               (1)
 #define MICROPY_PY_STR_BYTES_CMP_WARN  (1)
 
diff --git a/tools/ci.sh b/tools/ci.sh
@@ -715,6 +715,14 @@ function ci_unix_standard_v2_run_tests {
     ci_unix_run_tests_full_helper standard
 }
 
+function ci_unix_standard_terse_build {
+    ci_unix_build_helper VARIANT=standard CFLAGS_EXTRA="-DMICROPY_ERROR_REPORTING=MICROPY_ERROR_REPORTING_TERSE"
+}
+
+function ci_unix_standard_terse_run_tests {
+    make -C ports/unix VARIANT=standard test
+}
+
 function ci_unix_coverage_setup {
     pip3 install setuptools
     pip3 install pyelftools
