diff options
| author | Bruce Forstall <Bruce_Forstall@msn.com> | 2018-08-03 17:54:30 -0700 |
|---|---|---|
| committer | Bruce Forstall <Bruce_Forstall@msn.com> | 2018-08-03 17:54:30 -0700 |
| commit | c8480f5058ddaf203460befc6b8f8f26daa36ba0 (patch) | |
| tree | 33ecd815cf7663683b9f34a2e22f79ffb5cacb46 /build-test.cmd | |
| parent | a29c8dfa26b11189566dd09ff0e268accd339b40 (diff) | |
| download | coreclr-c8480f5058ddaf203460befc6b8f8f26daa36ba0.tar.gz coreclr-c8480f5058ddaf203460befc6b8f8f26daa36ba0.tar.bz2 coreclr-c8480f5058ddaf203460befc6b8f8f26daa36ba0.zip | |
Revert "Build managed tests with dotnet (#19254)"
This reverts commit 101baee1010eaad47cd7afd1e041a7f422aefa78.
Diffstat (limited to 'build-test.cmd')
| -rw-r--r-- | build-test.cmd | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/build-test.cmd b/build-test.cmd index b278996676..38c97b59d0 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -104,10 +104,7 @@ if [!processedArgs!]==[] ( :ArgsDone @REM Special handling for -priority=N argument. -if %__Priority% GTR 0 ( - set "__PriorityArg=-priority=%__Priority%" - set "__PriorityMsbuildArg=/p:priority=%__Priority%" -) +if %__Priority% GTR 0 (set "__PriorityArg=-priority=%__Priority%") if defined __BuildAgainstPackagesArg ( if not defined __RuntimeID ( @@ -120,7 +117,7 @@ if defined __BuildAgainstPackagesArg ( set __RunArgs=-BuildOS=%__BuildOS% -BuildType=%__BuildType% -BuildArch=%__BuildArch% REM As we move from buildtools to arcade, __RunArgs should be replaced with __msbuildArgs -set __msbuildArgs=/p:__BuildOS=%__BuildOS% /p:__BuildType=%__BuildType% /p:__BuildArch=%__BuildArch% /nologo /verbosity:minimal /clp:Summary +set __msbuildArgs=/p:__BuildOS=%__BuildOS% /p:__BuildType=%__BuildType% /p:__BuildArch=%__BuildArch% echo %__MsgPrefix%Commencing CoreCLR repo test build @@ -302,7 +299,7 @@ for /l %%G in (1, 1, %__BuildLoopCount%) do ( set __msbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%";Append=!__AppendToLog! set TestBuildSlice=%%G - call %__DotnetHost% msbuild %__ProjectDir%\tests\build.proj !__msbuildLog! !__msbuildWrn! !__msbuildErr! %__msbuildArgs% %__BuildAgainstPackagesMsbuildArg% %__PriorityMsbuildArg% %__PassThroughArg% %__unprocessedBuildArgs% + call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\build.proj -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__PriorityArg% %__PassThroughArg% %__unprocessedBuildArgs% if errorlevel 1 ( echo %__MsgPrefix%Error: build failed. Refer to the build log files for details: |