gh-125669: Do not run `-ugui` tests by default on `make test` (#125730) · python/cpython@1f16df4

GitHub

Original file line numberDiff line numberDiff line change@@ -468,7 +468,7 @@ jobs:

468468 - name: Display build info

469469run: make pythoninfo

470470 - name: Tests

471-run: xvfb-run make test

471+run: xvfb-run make ci

472472473473build_tsan:

474474name: 'Thread sanitizer'

Original file line numberDiff line numberDiff line change@@ -69,4 +69,4 @@ jobs:

6969 --fail-on-improvement

7070 --path-prefix="./"

7171 - name: Tests

72-run: make test

72+run: make ci

Original file line numberDiff line numberDiff line change@@ -105,4 +105,4 @@ jobs:

105105run: sudo mount "$CPYTHON_RO_SRCDIR" -oremount,rw

106106 - name: Tests

107107working-directory: ${{ env.CPYTHON_BUILDDIR }}

108-run: xvfb-run make test

108+run: xvfb-run make ci

Original file line numberDiff line numberDiff line change@@ -1142,13 +1142,21 @@ make test

11421142^^^^^^^^^

1143114311441144Build the ``all`` target and run the Python test suite with the

1145-``--fast-ci`` option. Variables:

1145+``--fast-ci`` option without GUI tests. Variables:

1146114611471147* ``TESTOPTS``: additional regrtest command-line options.

11481148* ``TESTPYTHONOPTS``: additional Python command-line options.

11491149* ``TESTTIMEOUT``: timeout in seconds (default: 10 minutes).

11501150115111511152+make ci

1153+^^^^^^^

1154+1155+This is similar to ``make test``, but uses the ``-ugui`` to also run GUI tests.

1156+1157+.. versionadded:: 3.14

1158+1159+11521160make buildbottest

11531161^^^^^^^^^^^^^^^^^

11541162Original file line numberDiff line numberDiff line change@@ -2104,6 +2104,12 @@ cleantest: all

21042104# Similar to buildbottest, but use --fast-ci option, instead of --slow-ci.

21052105.PHONY: test

21062106test: all

2107+ $(TESTRUNNER) --fast-ci -u-gui --timeout=$(TESTTIMEOUT) $(TESTOPTS)

2108+2109+# Run a basic set of regression tests inside the CI.

2110+# This excludes some tests that are particularly resource-intensive.

2111+# Similar to test, but also runs GUI tests.

2112+ci: all

21072113 $(TESTRUNNER) --fast-ci --timeout=$(TESTTIMEOUT) $(TESTOPTS)

2108211421092115# Run the test suite for both architectures in a Universal build on OSX.

Original file line numberDiff line numberDiff line change@@ -0,0 +1,2 @@

1+Change ``make test`` to not run GUI tests by default. Use ``make ci`` to run

2+tests with GUI tests instead.