summaryrefslogtreecommitdiff
path: root/build-test.sh
diff options
context:
space:
mode:
authorEgor Chesakov <Egor.Chesakov@microsoft.com>2019-02-28 17:55:28 (GMT)
committerGitHub <noreply@github.com>2019-02-28 17:55:28 (GMT)
commit39b643fa45e62cd016b36c173d6166c41d85f0f7 (patch)
tree01a7dee672ac4b1ec8e0cf8cde33e7ae34593100 /build-test.sh
parent062597365c5fe0cbab66aa11447e8e6459179cd6 (diff)
downloadcoreclr-39b643fa45e62cd016b36c173d6166c41d85f0f7.zip
coreclr-39b643fa45e62cd016b36c173d6166c41d85f0f7.tar.gz
coreclr-39b643fa45e62cd016b36c173d6166c41d85f0f7.tar.bz2
Re-partition MSBuild test groups (#22885)
This changes a tests partitioning scheme of coreclr tests in several different ways: 1. Make the test groups are of equal (to some extent) sizes keeping the number of tests in one group less than 1000; 2. As a resulf of 1) this increases a number of groups needed for Pri0 tests to 3 and decreases a number of groups for Pri1 tests to 10; 3. This also changes a way of tests partitioning scheme is defined - instead of explicitly specifying MSBuild Include-patterns this defines a boundaries between test groups in a form of _StartsWith ItemGroup. Then I use StringComparer.Ordinal to pick tests that belong to a particular group.
Diffstat (limited to 'build-test.sh')
-rwxr-xr-xbuild-test.sh13
1 files changed, 6 insertions, 7 deletions
diff --git a/build-test.sh b/build-test.sh
index 87a185d..3b3ff61 100755
--- a/build-test.sh
+++ b/build-test.sh
@@ -312,22 +312,21 @@ build_MSBuild_projects()
# __SkipPackageRestore and __SkipTargetingPackBuild used to control build by tests/src/dirs.proj
export __SkipPackageRestore=false
export __SkipTargetingPackBuild=false
- export __BuildLoopCount=2
- export __TestGroupToBuild=1
+ export __NumberOfTestGroups=3
+
__AppendToLog=false
if [ -n "$__priority1" ]; then
- export __BuildLoopCount=16
- export __TestGroupToBuild=2
+ export __NumberOfTestGroups=10
fi
- for (( slice=1 ; slice <= __BuildLoopCount; slice = slice + 1 ))
+ for (( testGroupToBuild=1 ; testGroupToBuild <= __NumberOfTestGroups; testGroupToBuild = testGroupToBuild + 1 ))
do
__msbuildLog="\"/flp:Verbosity=normal;LogFile=${__BuildLog};Append=${__AppendToLog}\""
__msbuildWrn="\"/flp1:WarningsOnly;LogFile=${__BuildWrn};Append=${__AppendToLog}\""
__msbuildErr="\"/flp2:ErrorsOnly;LogFile=${__BuildErr};Append=${__AppendToLog}\""
- export TestBuildSlice=$slice
+ export __TestGroupToBuild=$testGroupToBuild
# Generate build command
buildArgs=("/nologo" "/verbosity:minimal" "/clp:Summary")
@@ -341,7 +340,7 @@ build_MSBuild_projects()
buildArgs+=("${__UnprocessedBuildArgs[@]}")
nextCommand="\"$__ProjectRoot/dotnet.sh\" msbuild ${buildArgs[@]}"
- echo "Building step '$stepName' slice=$slice via $nextCommand"
+ echo "Building step '$stepName' testGroupToBuild=$testGroupToBuild via $nextCommand"
eval $nextCommand
# Make sure everything is OK