diff options
| author | Aaron Robinson <arobins@microsoft.com> | 2018-09-12 19:34:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-12 19:34:46 -0700 |
| commit | 5699a504640a322935f7f57f3ea627cee494c804 (patch) | |
| tree | c629d16fdde3a5c12950770f14ba2f8412ceecd0 /build-test.cmd | |
| parent | 7b18dcc33400b3e2f314a10228f2520e031ee01b (diff) | |
| download | coreclr-5699a504640a322935f7f57f3ea627cee494c804.tar.gz coreclr-5699a504640a322935f7f57f3ea627cee494c804.tar.bz2 coreclr-5699a504640a322935f7f57f3ea627cee494c804.zip | |
Address msbuild issues with cross compiled tests in helix (#19901)
* Address msbuild issues with cross compiled tests in helix
* Fix test warning about duplicate types
Diffstat (limited to 'build-test.cmd')
| -rw-r--r-- | build-test.cmd | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/build-test.cmd b/build-test.cmd index c0f45b10cc..29bc779729 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -121,6 +121,16 @@ if defined __BuildAgainstPackagesArg ( ) ) +set TargetsWindowsArg= +set TargetsWindowsMsbuildArg= +if "%__TargetsWindows%"=="1" ( + set TargetsWindowsArg=-TargetsWindows=true + set TargetsWindowsMsbuildArg=/p:TargetsWindows=true +) else if "%__TargetsWindows%"=="0" ( + set TargetsWindowsArg=-TargetsWindows=false + set TargetsWindowsMsbuildArg=/p:TargetsWindows=false +) + @if defined _echo @echo on set __RunArgs=-BuildOS=%__BuildOS% -BuildType=%__BuildType% -BuildArch=%__BuildArch% @@ -324,8 +334,9 @@ for /l %%G in (1, 1, %__BuildLoopCount%) do ( set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%";Append=!__AppendToLog! set TestBuildSlice=%%G - echo Running: msbuild %__ProjectDir%\tests\build.proj !__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! %__msbuildArgs% %__BuildAgainstPackagesMsbuildArg% !__PriorityMsbuildArg! %__UnprocessedBuildArgs% - call msbuild %__ProjectDir%\tests\build.proj !__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! %__msbuildArgs% %__BuildAgainstPackagesMsbuildArg% !__PriorityMsbuildArg! %__UnprocessedBuildArgs% + echo Running: msbuild %__ProjectDir%\tests\build.proj !__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! %TargetsWindowsMsbuildArg% %__msbuildArgs% %__BuildAgainstPackagesMsbuildArg% !__PriorityMsbuildArg! %__UnprocessedBuildArgs% + + call msbuild %__ProjectDir%\tests\build.proj !__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! %TargetsWindowsMsbuildArg% %__msbuildArgs% %__BuildAgainstPackagesMsbuildArg% !__PriorityMsbuildArg! %__UnprocessedBuildArgs% if errorlevel 1 ( echo %__MsgPrefix%Error: build failed. Refer to the build log files for details: @@ -398,16 +409,6 @@ if defined __RuntimeId ( set RuntimeIdArg=-RuntimeID="%__RuntimeId%" ) -set TargetsWindowsArg= -set TargetsWindowsMsbuildArg= -if "%__TargetsWindows%"=="1" ( - set TargetsWindowsArg=-TargetsWindows=true - set TargetsWindowsMsbuildArg=/p:TargetsWindows=true -) else if "%__TargetsWindows%"=="0" ( - set TargetsWindowsArg=-TargetsWindows=false - set TargetsWindowsMsbuildArg=/p:TargetsWindows=false -) - set __BuildLogRootName=Tests_Overlay_Managed set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log set __BuildWrn=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn |