diff options
| author | Michal Strehovský <MichalStrehovsky@users.noreply.github.com> | 2022-01-08 01:44:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-08 01:44:34 +0300 |
| commit | 03c5dbccb59e9bb9bfd415b60e1ea23f0cf045c7 (patch) | |
| tree | 3b7a75fcf51d11c9589f00186c3f860791709dcf /src/tests/build.cmd | |
| parent | 83c97613a37b78131df8d48bb6e64998d2b65d3e (diff) | |
Move init-vs-env in test build script down (#63433)
`init-vs-env.cmd` is going to set up the environment for x86 tools (the "VS Developer Command Prompt") and that messes with things if they run before we run vcvarsall to set the actual target architecture, so it's better not to have such window. We might not even run the vcvarsall line if native test build is skipped.
As an additional improvement, init-vs-env.cmd can also run vcvarsall and set up CMake, so I'm asking it to do it (done by passing an extra parameter to the script to specify which environment to activate).
I need this change for a subsequent change that is broken if we have x86 tools set up.
Diffstat (limited to 'src/tests/build.cmd')
| -rw-r--r-- | src/tests/build.cmd | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/tests/build.cmd b/src/tests/build.cmd index 511500ae2ab..c5ac3aec889 100644 --- a/src/tests/build.cmd +++ b/src/tests/build.cmd @@ -15,13 +15,6 @@ for %%i in ("%__RepoRootDir%") do SET "__RepoRootDir=%%~fi" set "__TestDir=%__RepoRootDir%\src\tests" -call %__RepoRootDir%\eng\native\init-vs-env.cmd -if NOT '%ERRORLEVEL%' == '0' exit /b 1 - -if defined VCINSTALLDIR ( - set "__VCToolsRoot=%VCINSTALLDIR%Auxiliary\Build" -) - :: Set the default arguments for build set __BuildArch=x64 set __BuildType=Debug @@ -196,6 +189,9 @@ set __msbuildArgs=%__CommonMSBuildArgs% /nologo /verbosity:minimal /clp:Summary echo Common MSBuild args: %__msbuildArgs% +call %__RepoRootDir%\eng\native\init-vs-env.cmd %__BuildArch% +if NOT '%ERRORLEVEL%' == '0' exit /b 1 + REM ========================================================================================= REM === REM === Native test build section @@ -211,10 +207,6 @@ echo %__MsgPrefix%Commencing build of native test components for %__BuildArch%/% REM Set the environment for the native build -REM Eval the output from set-cmake-path.ps1 -for /f "delims=" %%a in ('powershell -NoProfile -ExecutionPolicy ByPass "& ""%__RepoRootDir%\eng\native\set-cmake-path.ps1"""') do %%a -echo %__MsgPrefix%Using CMake from !CMakePath! - REM NumberOfCores is an WMI property providing number of physical cores on machine REM processor(s). It is used to set optimal level of CL parallelism during native build step if not defined NumberOfCores ( @@ -227,13 +219,6 @@ if not defined NumberOfCores ( ) echo %__MsgPrefix%Number of processor cores %NumberOfCores% -set __VCBuildArch=x86_amd64 -if /i "%__BuildArch%" == "x86" ( set __VCBuildArch=x86 ) -if /i "%__BuildArch%" == "arm" ( set __VCBuildArch=x86_arm ) -if /i "%__BuildArch%" == "arm64" ( set __VCBuildArch=x86_arm64 ) - -echo %__MsgPrefix%Using environment: "%__VCToolsRoot%\vcvarsall.bat" %__VCBuildArch% -call "%__VCToolsRoot%\vcvarsall.bat" %__VCBuildArch% @if defined _echo @echo on set __ExtraCmakeArgs= |