Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup of runtime test build scripts #58762

Merged
merged 11 commits into from
Oct 6, 2021
Merged

Cleanup of runtime test build scripts #58762

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
75bb058
Move native test build over to the src/tests/build.proj script
trylek Sep 3, 2021
7e7b798
Fix passing of TargetsWindows to test group builds
trylek Sep 29, 2021
c7e2eed
Clean up management of the TargetsWindows property
trylek Sep 29, 2021
250aa13
Put back binlog instrumentation to understand the missing dlls
trylek Sep 29, 2021
21700ae
Fix recursive passing of CLRTestBuildAllTargets to managed test group…
trylek Sep 30, 2021
5cbc2cd
Fix support for TestBuildMode property
trylek Sep 30, 2021
4270c4e
Fix composite build mode on Unix
trylek Sep 30, 2021
fd1e82c
Address part of Jeremy's PR feedback
trylek Oct 4, 2021
e559efd
Remove obsolete warnAsError suppression per Jeremy's PR feedback
trylek Oct 4, 2021
1340a1f
Remove CallTargets clauses from the scripts per Jeremy's PR feedback
trylek Oct 5, 2021
553ccd6
Revert "Remove obsolete warnAsError suppression per Jeremy's PR feedb…
trylek Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion eng/common/msbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,5 @@ if [[ "$ci" == true ]]; then
node_reuse=false
fi

echo "MSBuild $extra_args"
MSBuild $extra_args
ExitWithExitCode 0
5 changes: 0 additions & 5 deletions src/tests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,6 @@
<MonoBinDir>$(__MonoBinDir)</MonoBinDir>
</PropertyGroup>

<!-- Which tests can we build? Default: Build managed tests for this target.
At the command-line, the user can specify:
+ /p:CLRTestBuildAllTargets=allTargets Build managed tests for all target platforms.
-->

<!-- Language settings -->
<PropertyGroup>
<RunAnalyzers>false</RunAnalyzers>
Expand Down
3 changes: 2 additions & 1 deletion src/tests/build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,9 @@ echo test ^<xxx^>: Only build test project ^<xxx^> ^(relative or absolute projec
echo dir ^<xxx^>: Build all test projects in the folder ^<xxx^> ^(relative or absolute folder under src\tests^)
echo tree ^<xxx^>: Build all test projects in the subtree ^<xxx^> ^(relative or absolute folder under src\tests^)
echo rebuild: Clean up all test artifacts prior to building tests
echo allTargets: Build managed tests for all target platforms.
echo allTargets: Build managed tests for all target platforms (including test projects in which CLRTestTargetUnsupported resolves to true)
echo -verbose: enables detailed file logging for the msbuild tasks into the msbuild log file.
echo log: base file name to use for log files (used in lab pipelines that build tests in multiple steps to retain logs for each step)
exit /b 1

REM Exit_Failure:
Expand Down
6 changes: 4 additions & 2 deletions src/tests/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ build_Tests()
buildArgs+=("/p:NUMBER_OF_PROCESSORS=${__NumProc}")
buildArgs+=("${__UnprocessedBuildArgs[@]}")

# Disable warnAsError - coreclr issue 19922
# Disable warnAsError - https://github.com/dotnet/runtime/issues/11077
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As this issue has been closed, it's worth taking a look and seeing if we can remove the warnAsError flag.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed in the latest commit, let's see what the lab says.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted per your PR comment, I'm rerunning the outerloop job.

nextCommand="\"$__RepoRootDir/eng/common/msbuild.sh\" $__ArcadeScriptArgs --warnAsError false ${buildArgs[@]}"
echo "Building tests via $nextCommand"
eval $nextCommand
Expand Down Expand Up @@ -153,12 +153,14 @@ usage_list+=("-tree:xxx - build all tests in a given subtree");

usage_list+=("-crossgen2: Precompiles the framework managed assemblies in coreroot using the Crossgen2 compiler.")
usage_list+=("-priority1: include priority=1 tests in the build.")
usage_list+=("-allTargets: Build managed tests for all target platforms.")
usage_list+=("-allTargets: Build managed tests for all target platforms (including test projects in which CLRTestTargetUnsupported resolves to true).")

usage_list+=("-rebuild: if tests have already been built - rebuild them.")
usage_list+=("-runtests: run tests after building them.")
usage_list+=("-excludemonofailures: Mark the build as running on Mono runtime so that mono-specific issues are honored.")

usage_list+=("-log: base file name to use for log files (used in lab pipelines that build tests in multiple steps to retain logs for each step.")

# Obtain the location of the bash script to figure out where the root of the repo is.
__ProjectRoot="$(cd "$(dirname "$0")"; pwd -P)"
__RepoRootDir="$(cd "$__ProjectRoot"/../..; pwd -P)"
Expand Down