python
diff --git a/‎Lib/test/test_regrtest.py
Copy file name to clipboardExpand all lines: Lib/test/test_regrtest.py
+8-4Lines changed: 8 additions & 4 deletions b/‎Lib/test/test_regrtest.py
Copy file name to clipboardExpand all lines: Lib/test/test_regrtest.py
+8-4Lines changed: 8 additions & 4 deletions
diff --git a/‎Tools/buildbot/remoteDeploy.bat
Copy file name to clipboardExpand all lines: Tools/buildbot/remoteDeploy.bat
+3Lines changed: 3 additions & 0 deletions b/‎Tools/buildbot/remoteDeploy.bat
Copy file name to clipboardExpand all lines: Tools/buildbot/remoteDeploy.bat
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎Tools/buildbot/test.bat
Copy file name to clipboardExpand all lines: Tools/buildbot/test.bat
+2Lines changed: 2 additions & 0 deletions b/‎Tools/buildbot/test.bat
Copy file name to clipboardExpand all lines: Tools/buildbot/test.bat
+2Lines changed: 2 additions & 0 deletions
@@ -616,8 +616,10 @@ def test_tools_buildbot_test(self):
         # Tools\buildbot\test.bat
         script = os.path.join(ROOT_DIR, 'Tools', 'buildbot', 'test.bat')
         test_args = ['--testdir=%s' % self.tmptestdir]
-        if platform.architecture()[0] == '64bit':
-            test_args.append('-x64')   # 64-bit build
+        if platform.machine() == 'AMD64':
+            test_args.append('-x64')   # 64-bit Intel build
+        if platform.machine() == 'ARM':
+            test_args.append('-arm32')   # 32-bit ARM build
         if not Py_DEBUG:
             test_args.append('+d')     # Release build, use python.exe
         self.run_batch(script, *test_args, *self.tests)
@@ -629,8 +631,10 @@ def test_pcbuild_rt(self):
         if not os.path.isfile(script):
             self.skipTest(f'File "{script}" does not exist')
         rt_args = ["-q"]             # Quick, don't run tests twice
-        if platform.architecture()[0] == '64bit':
-            rt_args.append('-x64')   # 64-bit build
+        if platform.machine() == 'AMD64':
+            rt_args.append('-x64')   # 64-bit Intel build
+        if platform.machine() == 'ARM':
+            rt_args.append('-arm32')   # 32-bit ARM build
         if Py_DEBUG:
             rt_args.append('-d')     # Debug build, use python_d.exe
         self.run_batch(script, *rt_args, *self.regrtest_args, *self.tests)
 
@@ -25,13 +25,16 @@ if NOT "%REMOTE_PYTHON_DIR:~-1,1%"=="\" (set REMOTE_PYTHON_DIR=%REMOTE_PYTHON_DI
 %SSH% %SSH_SERVER% "md %REMOTE_PYTHON_DIR%temp"
 %SSH% %SSH_SERVER% "md %REMOTE_PYTHON_DIR%Modules"
 %SSH% %SSH_SERVER% "md %REMOTE_PYTHON_DIR%PC"
+%SSH% %SSH_SERVER% "md %REMOTE_PYTHON_DIR%Tools"
 for /f "USEBACKQ" %%i in (`dir PCbuild\*.bat /b`) do @%SCP% PCBuild\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild"
 for /f "USEBACKQ" %%i in (`dir PCbuild\*.py /b`) do @%SCP% PCBuild\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild"
 for /f "USEBACKQ" %%i in (`dir PCbuild\arm32\*.exe /b`) do @%SCP% PCBuild\arm32\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild\arm32"
 for /f "USEBACKQ" %%i in (`dir PCbuild\arm32\*.pyd /b`) do @%SCP% PCBuild\arm32\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild\arm32"
 for /f "USEBACKQ" %%i in (`dir PCbuild\arm32\*.dll /b`) do @%SCP% PCBuild\arm32\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild\arm32"
 %SCP% -r "%PYTHON_SOURCE%Include" "%SSH_SERVER%:%REMOTE_PYTHON_DIR%Include"
 %SCP% -r "%PYTHON_SOURCE%Lib" "%SSH_SERVER%:%REMOTE_PYTHON_DIR%Lib"
+%SCP% -r "%PYTHON_SOURCE%Tools\buildbot" "%SSH_SERVER%:%REMOTE_PYTHON_DIR%Tools\buildbot"
+%SCP% -r "%PYTHON_SOURCE%Tools\scripts" "%SSH_SERVER%:%REMOTE_PYTHON_DIR%Tools\scripts"
 %SCP% "%PYTHON_SOURCE%Modules\Setup" "%SSH_SERVER%:%REMOTE_PYTHON_DIR%Modules"
 %SCP% "%PYTHON_SOURCE%PC\pyconfig.h" "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PC"
 
 
@@ -17,8 +17,10 @@ if "%1"=="+d" (set rt_opts=%rt_opts:-d=%) & shift & goto CheckOpts
 if "%1"=="+q" (set rt_opts=%rt_opts:-q=%) & shift & goto CheckOpts
 if NOT "%1"=="" (set regrtest_args=%regrtest_args% %1) & shift & goto CheckOpts
 
+if "%PROCESSOR_ARCHITECTURE%"=="ARM" if "%arm32_ssh%"=="true" goto NativeExecution
 if "%arm32_ssh%"=="true" goto :Arm32Ssh
 
+:NativeExecution
 call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW --slowest --timeout=1200 --fail-env-changed %regrtest_args%
 exit /b %ERRORLEVEL%