Parallelize building test code
Rob Mensching committed
Nov 12, 2022 at 20:29 UTC
5e5c542f75a33c0fb8b0ce50f6d66a310bf37ee7
4 files changed
+8
-24
src/test/burn/TestData/TestData.proj
+2
-10
@@ -1,16 +1,8 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
+<Project Sdk="Microsoft.Build.Traversal">
5
<ItemGroup>
6
- <TestDataProject Include="**\*.wixproj" />
6
+ <ProjectReference Include="**\*.wixproj" />
7
</ItemGroup>
8
-
9
- <Target Name="Build">
10
- <MSBuild Projects="%(TestDataProject.Identity)" />
11
- </Target>
12
-
13
- <Target Name="Restore">
14
- <MSBuild Projects="%(TestDataProject.Identity)" Targets="Restore" />
15
- </Target>
8
</Project>
src/test/burn/test_burn.cmd
+2
-2
@@ -13,8 +13,8 @@
13
14
@echo Burn integration tests %_C%
15
16
-msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror -bl:%_L%\test_burn_build.binlog || exit /b
17
-msbuild -t:Build -Restore TestData\TestData.proj -p:Configuration=%_C% -m -bl:%_L%\test_burn_data_build.binlog || exit /b
16
+msbuild -Restore -p:Configuration=%_C% -warnaserror -bl:%_L%\test_burn_build.binlog || exit /b
17
+msbuild -Restore TestData\TestData.proj -p:Configuration=%_C% -m -bl:%_L%\test_burn_data_build.binlog || exit /b
18
19
"%_B%\net35\win-x86\testexe.exe" /dm "%_B%\net6.0-windows\testhost.exe"
20
mt.exe -manifest "WixToolsetTest.BurnE2E\testhost.longpathaware.manifest" -updateresource:"%_B%\net6.0-windows\testhost.exe"
src/test/msi/TestData/TestData.proj
+2
-10
@@ -1,16 +1,8 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
+<Project Sdk="Microsoft.Build.Traversal">
5
<ItemGroup>
6
- <TestDataProject Include="**\*.wixproj" />
6
+ <ProjectReference Include="**\*.wixproj" />
7
</ItemGroup>
8
-
9
- <Target Name="Build">
10
- <MSBuild Projects="%(TestDataProject.Identity)" />
11
- </Target>
12
-
13
- <Target Name="Restore">
14
- <MSBuild Projects="%(TestDataProject.Identity)" Targets="Restore" />
15
- </Target>
8
</Project>
src/test/wix/WixE2E/WixE2EFixture.cs
+2
-2
@@ -211,9 +211,9 @@ namespace WixE2E
211
}
212
}
213
214
- private static MsbuildRunnerResult RestoreAndBuild(string projectPath, bool x64 = true)
214
+ private static MsbuildRunnerResult RestoreAndBuild(string projectPath, bool x64 = true, bool suppressValidation = true)
215
{
216
- return MsbuildRunner.Execute(projectPath, new[] { "-Restore", "-v:m", "-bl" }, x64);
216
+ return MsbuildRunner.Execute(projectPath, new[] { "-Restore", "-v:m", "-bl", $"-p:SuppressValidation={suppressValidation}" }, x64);
217
}
218
}
219
}