diff options
| author | Bruce Forstall <brucefo@microsoft.com> | 2019-01-04 11:03:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-04 11:03:25 -0800 |
| commit | f0c969a072c05c0d602d16d68bc6e130fd17be88 (patch) | |
| tree | 370fb201a0a1a3c9f797cfeabc8c63fbf97254b8 /tests/runtest.cmd | |
| parent | 3eb581cf79f0cf195d6395fafd5a8b355a602242 (diff) | |
| download | coreclr-f0c969a072c05c0d602d16d68bc6e130fd17be88.tar.gz coreclr-f0c969a072c05c0d602d16d68bc6e130fd17be88.tar.bz2 coreclr-f0c969a072c05c0d602d16d68bc6e130fd17be88.zip | |
Fix Windows arm32/arm64 testing (#21809)
* Fix Windows arm32/arm64 testing
After the conversion to runtest.py, we were not getting any
JIT or GC stress mode testing:
1. The generated test env batch file didn't have a ".bat" extension,
so Windows wouldn't execute it.
2. The Python generated temp file was locked, so couldn't be read.
Added more logging.
Diffstat (limited to 'tests/runtest.cmd')
| -rw-r--r-- | tests/runtest.cmd | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/tests/runtest.cmd b/tests/runtest.cmd index 7b458064df..ba7f6b59c1 100644 --- a/tests/runtest.cmd +++ b/tests/runtest.cmd @@ -7,18 +7,21 @@ set "__MsgPrefix=RUNTEST: " set __ThisScriptDir="%~dp0" -if /I not "%PROCESSOR_ARCHITECTURE%"=="arm64" ( - if /I not "%PROCESSOR_ARCHITECTURE%"=="arm" ( - call "%__ThisScriptDir%"\..\setup_vs_tools.cmd - if NOT '%ERRORLEVEL%' == '0' exit /b 1 - - if defined VS150COMNTOOLS ( - set __VSVersion=vs2017 - ) else ( - set __VSVersion=vs2015 - ) - ) -) +if /I "%PROCESSOR_ARCHITECTURE%"=="arm64" goto :skip_vs_setup +if /I "%PROCESSOR_ARCHITECTURE%"=="arm" goto :skip_vs_setup + +REM If we're running in the x86 WoW layer on Windows arm64, we still don't check for VS. +if /I "%PROCESSOR_ARCHITEW6432%"=="arm64" goto :skip_vs_setup + +call "%__ThisScriptDir%"\..\setup_vs_tools.cmd +if NOT '%ERRORLEVEL%' == '0' exit /b 1 + +if defined VS150COMNTOOLS ( + set __VSVersion=vs2017 +) else ( + set __VSVersion=vs2015 +) +:skip_vs_setup :: Set the default arguments set __BuildArch=x64 |