8000 gh-109566: Run GHA and buildbot tests with --fail-rerun (#109567) · python/cpython@67d9363 · GitHub
[go: up one dir, main page]
Skip to content

Commit 67d9363

Browse files
vstinnervstinner
authored
gh-109566: Run GHA and buildbot tests with --fail-rerun (#109567)
1 parent f2636d2 commit 67d9363

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

‎Makefile.pre.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1887,7 +1887,7 @@ buildbottest: all
18871887
-@if which pybuildbot.identify >/dev/null 2>&1; then \
18881888
pybuildbot.identify "CC='$(CC)'" "CXX='$(CXX)'"; \
18891889
fi
1890-
$(TESTRUNNER) -j 1 -u all -W --slowest --fail-env-changed --timeout=$(TESTTIMEOUT) $(TESTOPTS)
1890+
$(TESTRUNNER) -j 1 -u all -W --slowest --fail-env-changed --fail-rerun --timeout=$(TESTTIMEOUT) $(TESTOPTS)
18911891

18921892
# Like testall, but run Python tests with HOSTRUNNER directly.
18931893
.PHONY: hostrunnertest

‎PCbuild/rt.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set pcbuild=%~dp0
3232
set suffix=
3333
set qmode=
3434
set dashO=
35-
set regrtestargs=
35+
set regrtestargs--fail-env-changed --fail-rerun
3636
set exe=
3737

3838
:CheckOpts

‎Tools/buildbot/test.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if "%PROCESSOR_ARCHITECTURE%"=="ARM" if "%arm32_ssh%"=="true" goto NativeExecuti
2323
if "%arm32_ssh%"=="true" goto :Arm32Ssh
2424

2525
:NativeExecution
26-
call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW --slowest --timeout=1200 --fail-env-changed %regrtest_args%
26+
call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW --slowest --timeout=1200 %regrtest_args%
2727
exit /b %ERRORLEVEL%
2828

2929
:Arm32Ssh
@@ -35,7 +35,7 @@ if NOT "%REMOTE_PYTHON_DIR:~-1,1%"=="\" (set REMOTE_PYTHON_DIR=%REMOTE_PYTHON_DI
3535

3636
set TEMP_ARGS=--temp %REMOTE_PYTHON_DIR%temp
3737

38-
set rt_args=%rt_opts% %dashU% -rwW --slowest --timeout=1200 --fail-env-changed %regrtest_args% %TEMP_ARGS%
38+
set rt_args=%rt_opts% %dashU% -rwW --slowest --timeout=1200 %regrtest_args% %TEMP_ARGS%
3939
ssh %SSH_SERVER% "set TEMP=%REMOTE_PYTHON_DIR%temp& cd %REMOTE_PYTHON_DIR% & %REMOTE_PYTHON_DIR%PCbuild\rt.bat" %rt_args%
4040
set ERR=%ERRORLEVEL%
4141
scp %SSH_SERVER%:"%REMOTE_PYTHON_DIR%test-results.xml" "%PYTHON_SOURCE%\test-results.xml"

0 commit comments

Comments
 (0)
0