8000 gh-125669: Do not run `-ugui` tests by default on `make test` (#125730) · python/cpython@1f16df4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1f16df4

Browse files
sobolevnsobolevn
authored
gh-125669: Do not run -ugui tests by default on make test (#125730)
Adds `make ci` target for use in CI and keeping `make test` for the local development.
1 parent 1064141 commit 1f16df4

File tree

6 files changed

+20
-4
lines changed

6 files changed

+20
-4
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ jobs:
468468
- name: Display build info
469469
run: make pythoninfo
470470
- name: Tests
471-
run: xvfb-run make test
471+
run: xvfb-run make ci
472472

473473
build_tsan:
474474
name: 'Thread sanitizer'

‎.github/workflows/reusable-macos.yml

Lines changed: 1 addition & 1 deletion
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

‎.github/workflows/reusable-ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,4 @@ jobs:
105105
run: sudo mount "$CPYTHON_RO_SRCDIR" -oremount,rw
106106
- name: Tests
107107
working-directory: ${{ env.CPYTHON_BUILDDIR }}
108-
run: xvfb-run make test
108+
run: xvfb-run make ci

‎Doc/using/configure.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1142,13 +1142,21 @@ make test
11421142
^^^^^^^^^
11431143

11441144
Build the ``all`` target and run the Python test suite with the
1145-
``--fast-ci`` option. Variables:
1145+
``--fast-ci`` option without GUI tests. Variables:
11461146

11471147
* ``TESTOPTS``: additional regrtest command-line options.
11481148
* ``TESTPYTHONOPTS``: additional Python command-line options.
11491149
* ``TESTTIMEOUT``: timeout in seconds (default: 10 minutes).
11501150

11511151

1152+
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+
11521160
make buildbottest
11531161
^^^^^^^^^^^^^^^^^
11541162

‎Makefile.pre.in

Lines changed: 6 additions & 0 deletions
Original 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
21062106
test: 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)
21082114

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

‎Misc/NEWS.d/next/Tests/2024-10-21-14-10-56.gh-issue-125730.kcWbvI.rst

Lines changed: 2 additions & 0 deletions
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.

0 commit comments

Comments
 (0)
0