diff options
| author | Victor Stinner <vstinner@python.org> | 2023-09-19 13:50:27 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-19 13:50:27 (GMT) |
| commit | 67d9363372d9b214d9aa1812163866c9804aa55a (patch) | |
| tree | 902535249a57976e0d6c06aad0db943c7509a00e | |
| parent | f2636d2c45aae0a04960dcfbc7d9a2a8a36ba3bc (diff) | |
| download | cpython-67d9363372d9b214d9aa1812163866c9804aa55a.zip cpython-67d9363372d9b214d9aa1812163866c9804aa55a.tar.gz cpython-67d9363372d9b214d9aa1812163866c9804aa55a.tar.bz2 | |
gh-109566: Run GHA and buildbot tests with --fail-rerun (#109567)
| -rw-r--r-- | Makefile.pre.in | 2 | ||||
| -rw-r--r-- | PCbuild/rt.bat | 2 | ||||
| -rw-r--r-- | Tools/buildbot/test.bat | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 35f2545..7b03dd2 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1887,7 +1887,7 @@ buildbottest: all -@if which pybuildbot.identify >/dev/null 2>&1; then \ pybuildbot.identify "CC='$(CC)'" "CXX='$(CXX)'"; \ fi - $(TESTRUNNER) -j 1 -u all -W --slowest --fail-env-changed --timeout=$(TESTTIMEOUT) $(TESTOPTS) + $(TESTRUNNER) -j 1 -u all -W --slowest --fail-env-changed --fail-rerun --timeout=$(TESTTIMEOUT) $(TESTOPTS) # Like testall, but run Python tests with HOSTRUNNER directly. .PHONY: hostrunnertest diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat index 29813c5..cd32a38 100644 --- a/PCbuild/rt.bat +++ b/PCbuild/rt.bat @@ -32,7 +32,7 @@ set pcbuild=%~dp0 set suffix= set qmode= set dashO= -set regrtestargs= +set regrtestargs--fail-env-changed --fail-rerun set exe= :CheckOpts diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat index 25c796a..c1b2605 100644 --- a/Tools/buildbot/test.bat +++ b/Tools/buildbot/test.bat @@ -23,7 +23,7 @@ if "%PROCESSOR_ARCHITECTURE%"=="ARM" if "%arm32_ssh%"=="true" goto NativeExecuti if "%arm32_ssh%"=="true" goto :Arm32Ssh :NativeExecution -call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW --slowest --timeout=1200 --fail-env-changed %regrtest_args% +call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW --slowest --timeout=1200 %regrtest_args% exit /b %ERRORLEVEL% :Arm32Ssh @@ -35,7 +35,7 @@ if NOT "%REMOTE_PYTHON_DIR:~-1,1%"=="\" (set REMOTE_PYTHON_DIR=%REMOTE_PYTHON_DI set TEMP_ARGS=--temp %REMOTE_PYTHON_DIR%temp -set rt_args=%rt_opts% %dashU% -rwW --slowest --timeout=1200 --fail-env-changed %regrtest_args% %TEMP_ARGS% +set rt_args=%rt_opts% %dashU% -rwW --slowest --timeout=1200 %regrtest_args% %TEMP_ARGS% ssh %SSH_SERVER% "set TEMP=%REMOTE_PYTHON_DIR%temp& cd %REMOTE_PYTHON_DIR% & %REMOTE_PYTHON_DIR%PCbuild\rt.bat" %rt_args% set ERR=%ERRORLEVEL% scp %SSH_SERVER%:"%REMOTE_PYTHON_DIR%test-results.xml" "%PYTHON_SOURCE%\test-results.xml" |