From: Steve Dower <steve.dower@python.org>
Date: Tue, 7 Jul 2020 23:24:39 +0000 (+0100)
Subject: bpo-41173: Copy test results file from ARM worker before uploading (GH-21305)
X-Git-Tag: v3.10.0a1~426
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10772ec1505a4583d662c051e577eb2d4fb6e755;p=thirdparty%2FPython%2Fcpython.git

bpo-41173: Copy test results file from ARM worker before uploading (GH-21305)
---

diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat
index a0fc6b9a9458..25c796a60e17 100644
--- a/Tools/buildbot/test.bat
+++ b/Tools/buildbot/test.bat
@@ -36,8 +36,10 @@ 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%
-ssh %SSH_SERVER% "set TEMP=%REMOTE_PYTHON_DIR%temp& %REMOTE_PYTHON_DIR%PCbuild\rt.bat" %rt_args%
-exit /b %ERRORLEVEL%
+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"
+exit /b %ERR%
 
 :Arm32SshHelp
 echo SSH_SERVER environment variable must be set to administrator@[ip address]