|
138 | 138 | <MSBuild Projects="$(MSBuildThisFileDirectory)..\timing\timing.csproj" Targets="MSBuildTiming" />
|
139 | 139 | </Target>
|
140 | 140 | <ItemGroup>
|
141 |
| - <_RunTestTarget Include="RunNUnitTests" /> |
142 |
| - <_RunTestTarget Include="RunJavaInteropTests" /> |
143 |
| - <_RunTestTarget Include="RunApkTests" /> |
| 141 | + <_RunParallelTestTarget Include="RunNUnitTests" /> |
| 142 | + <_RunParallelTestTarget Include="RunJavaInteropTests" /> |
| 143 | + <_RunParallelTestTarget Include="RunApkTests" /> |
| 144 | + </ItemGroup> |
| 145 | + <ItemGroup> |
144 | 146 | <_RunTestTarget Include="RunPerformanceTests" />
|
145 | 147 | </ItemGroup>
|
146 | 148 | <Target Name="RunAllTests">
|
147 | 149 | <MSBuild
|
| 150 | + Condition=" '$(HostOS)' == 'Windows' " |
148 | 151 | ContinueOnError="ErrorAndContinue"
|
149 | 152 | Projects="$(MSBuildThisFileDirectory)RunTests.targets"
|
150 | 153 | RunEachTargetSeparately="True"
|
151 |
| - Targets="@(_RunTestTarget)" |
| 154 | + Targets="@(_RunParallelTestTarget)" |
152 | 155 | />
|
153 |
| - </Target> |
| 156 | + <ItemGroup Condition=" '$(USE_MSBUILD)' == '1' "> |
| 157 | + <_RunParallelTestTarget> |
| 158 | + <_BinLog>$(_XABinLogPrefix)-$([System.DateTime]::Now.ToString ("yyyyMMddTHHmmss"))-Target-%(Identity).binlog"</_BinLog> |
| 159 | + </_RunParallelTestTarget> |
| 160 | + </ItemGroup> |
| 161 | + <ItemGroup> |
| 162 | + <_Commands Include="@(_RunParallelTestTarget->'echo Executing in background: msbuild $(MSBuildThisFileDirectory)RunTests.targets %(_BinLog) /t:%(Identity)')" /> |
| 163 | + <_Commands Include="@(_RunParallelTestTarget->'msbuild $(MSBuildThisFileDirectory)RunTests.targets %(_BinLog) /t:%(Identity) &')" /> |
| 164 | + <_Commands Include="wait" /> |
| 165 | + <_Commands Include="exit 0" /> |
| 166 | + </ItemGroup> |
| 167 | + <PropertyGroup> |
| 168 | + <_ParallelTargets>$(MSBuildThisFileDirectory)..\..\bin\Test$(Configuration)\parallel-targets.sh</_ParallelTargets> |
| 169 | + </PropertyGroup> |
| 170 | + <WriteLinesToFile |
| 171 | + File="$(_ParallelTargets)" |
| 172 | + Lines="@(_Commands)" |
| 173 | + Overwrite="True" |
| 174 | + /> |
| 175 | + <Exec |
| 176 | + Condition=" '$(HostOS)' != 'Windows' " |
| 177 | + ContinueOnError="ErrorAndContinue" |
| 178 | + WorkingDirectory="$(_TopDir)" |
| 179 | + Command="bash "$(_ParallelTargets)"" |
| 180 | + /> |
| 181 | + <MSBuild |
| 182 | + ContinueOnError="ErrorAndContinue" |
| 183 | + Projects="$(MSBuildThisFileDirectory)RunTests.targets" |
| 184 | + RunEachTargetSeparately="True" |
| 185 | + Targets="@(_RunTestTarget)" |
| 186 | + /> |
| 187 | + </Target> |
154 | 188 | </Project>
|
155 |
| - |
|
0 commit comments