Skip to content

Commit 8fb28f0

Browse files
committed
gh-125669: Do not run -ugui tests by default on make test
1 parent 4b421e8 commit 8fb28f0

File tree

7 files changed

+9
-6
lines changed

7 files changed

+9
-6
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ jobs:
430430
- name: Display build info
431431
run: make pythoninfo
432432
- name: Tests
433-
run: xvfb-run make test
433+
run: xvfb-run make test TESTOPTS="-u gui"
434434

435435
build_tsan:
436436
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 test TESTOPTS="-u gui"

.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 test TESTOPTS="-u gui"

.github/workflows/reusable-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ jobs:
4343
run: >-
4444
.\PCbuild\rt.bat
4545
-p ${{ inputs.arch }}
46-
-d -q --fast-ci
46+
-d -q --fast-ci -ugui
4747
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}

Lib/test/libregrtest/cmdline.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ def _parse_args(args, **kwargs):
457457
# Similar to: -u "all,-cpu" --timeout=600
458458
if ns.use is None:
459459
ns.use = []
460-
ns.use.insert(0, ['all', '-cpu'])
460+
ns.use.insert(0, ['all', '-cpu', '-gui'])
461461
if ns.timeout is None:
462462
ns.timeout = 600 # 10 minutes
463463

Lib/test/test_regrtest.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,13 +432,15 @@ def test_fast_ci(self):
432432
args = ['--fast-ci']
433433
use_resources = sorted(cmdline.ALL_RESOURCES)
434434
use_resources.remove('cpu')
435+
use_resources.remove('gui')
435436
regrtest = self.check_ci_mode(args, use_resources)
436437
self.assertEqual(regrtest.timeout, 10 * 60)
437438

438439
def test_fast_ci_python_cmd(self):
439440
args = ['--fast-ci', '--python', 'python -X dev']
440441
use_resources = sorted(cmdline.ALL_RESOURCES)
441442
use_resources.remove('cpu')
443+
use_resources.remove('gui')
442444
regrtest = self.check_ci_mode(args, use_resources, rerun=False)
443445
self.assertEqual(regrtest.timeout, 10 * 60)
444446
self.assertEqual(regrtest.python_cmd, ('python', '-X', 'dev'))
@@ -448,6 +450,7 @@ def test_fast_ci_resource(self):
448450
args = ['--fast-ci', '-u-network']
449451
use_resources = sorted(cmdline.ALL_RESOURCES)
450452
use_resources.remove('cpu')
453+
use_resources.remove('gui')
451454
use_resources.remove('network')
452455
self.check_ci_mode(args, use_resources)
453456

PCbuild/rt.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ set pyname=python
3434
set suffix=
3535
set qmode=
3636
set dashO=
37-
set regrtestargs=--fast-ci
37+
set regrtestargs="--fast-ci -u gui"
3838
set exe=
3939

4040
:CheckOpts

0 commit comments

Comments
 (0)