From 06aef626cbcefc1aa8ba043112b4940e098187d1 Mon Sep 17 00:00:00 2001 From: Betsy McPhail Date: Thu, 21 Oct 2021 16:59:33 -0400 Subject: Update tests support for Windows Fixup common tests * Remove requirement for Python 2.6 * Skip new failing test Windows: Update url util to handle Windows paths (#27959) * update url util to handle windows paths * Update tests to handle fixed url handling * canonicalize path only when the path type matches the host platform * Skip some url tests on Windows Co-authored-by: Omar Padron Use threading.TIMEOUT_MAX when available (#24246) This value was introduced in Python 3.2. Specifying a timeout greater than this value will raise an OverflowError. Co-authored-by: Lou Lawrence Co-authored-by: John Parent Co-authored-by: Betsy McPhail --- bin/spack_cmd.bat | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'bin/spack_cmd.bat') diff --git a/bin/spack_cmd.bat b/bin/spack_cmd.bat index 56b6024665..839f1828da 100644 --- a/bin/spack_cmd.bat +++ b/bin/spack_cmd.bat @@ -16,7 +16,7 @@ popd :: Check if Python is on the PATH if not defined python_pf_ver ( (for /f "delims=" %%F in ('where python.exe') do ( - set python_pf_ver=%%F + set "python_pf_ver=%%F" goto :found_python ) ) 2> NUL ) @@ -25,19 +25,19 @@ if not defined python_pf_ver ( :: If not, look for Python from the Spack installer :get_builtin (for /f "tokens=*" %%g in ('dir /b /a:d "!spackinstdir!\Python*"') do ( - set python_ver=%%g)) 2> NUL + set "python_ver=%%g")) 2> NUL if not defined python_ver ( echo Python was not found on your system. echo Please install Python or add Python to your PATH. ) else ( - set py_path=!spackinstdir!\!python_ver! - set py_exe=!py_path!\python.exe + set "py_path=!spackinstdir!\!python_ver!" + set "py_exe=!py_path!\python.exe" ) goto :exitpoint ) else ( :: Python is already on the path - set py_exe=!python_pf_ver! + set "py_exe=!python_pf_ver!" (for /F "tokens=* USEBACKQ" %%F in ( `"!py_exe!" --version`) do (set "output=%%F")) 2>NUL if not "!output:Microsoft Store=!"=="!output!" goto :get_builtin -- cgit v1.2.3-60-g2f50