diff options
| author | Betsy McPhail <betsy.mcphail@kitware.com> | 2021-10-21 16:59:33 -0400 |
|---|---|---|
| committer | Peter Scheibel <scheibel1@llnl.gov> | 2022-03-17 09:01:01 -0700 |
| commit | 06aef626cbcefc1aa8ba043112b4940e098187d1 (patch) | |
| tree | 4cdf8ce004c824c5cff596dfe8634067b0305836 /bin/spack_cmd.bat | |
| parent | 31daf0f2b6bd769135e088294eff93a94342c3d2 (diff) | |
| download | spack-06aef626cbcefc1aa8ba043112b4940e098187d1.tar.gz spack-06aef626cbcefc1aa8ba043112b4940e098187d1.tar.bz2 spack-06aef626cbcefc1aa8ba043112b4940e098187d1.tar.xz spack-06aef626cbcefc1aa8ba043112b4940e098187d1.zip | |
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 <omar.padron@kitware.com>
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 <lou.lawrence@kitware.com>
Co-authored-by: John Parent <john.parent@kitware.com>
Co-authored-by: Betsy McPhail <betsy.mcphail@kitware.com>
Diffstat (limited to 'bin/spack_cmd.bat')
| -rw-r--r-- | bin/spack_cmd.bat | 10 |
1 files changed, 5 insertions, 5 deletions
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 |