diff options
| author | Jan Vorlicek <janvorli@microsoft.com> | 2019-05-30 22:07:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-30 22:07:06 +0200 |
| commit | 7e17986ff71a70ba328895e0b99e1de83d1bf5b5 (patch) | |
| tree | b421c03e2d39f8ea1628c9d0ff621ed2178b90f0 | |
| parent | d651f0ae68a78741b5c9c18696245035d4aba27a (diff) | |
| download | coreclr-7e17986ff71a70ba328895e0b99e1de83d1bf5b5.tar.gz coreclr-7e17986ff71a70ba328895e0b99e1de83d1bf5b5.tar.bz2 coreclr-7e17986ff71a70ba328895e0b99e1de83d1bf5b5.zip | |
Add build-tools.cmd (#24817)
* Add build-tools.cmd
This script builds selected tools in the src/tools directory (for the
time being, it builds just the runincontext tool). This is a preparation
step to enable nightly runs with unloadability tests. The
build-tools.cmd should build helper tools needed during test runs.
* Remove the build-tools.cmd
* Build the tools as part of the managed runtime build.
* Update the R2RDump project to put binaries into the bin/Product/...
* Update runincontext.cmd/sh scripts
Reflect the new location of the runincontext binary
| -rw-r--r-- | src/build.proj | 1 | ||||
| -rw-r--r-- | src/tools/r2rdump/R2RDump.csproj | 1 | ||||
| -rw-r--r-- | src/tools/runincontext/runincontext.csproj | 7 | ||||
| -rw-r--r-- | tests/scripts/runincontext.cmd | 2 | ||||
| -rwxr-xr-x | tests/scripts/runincontext.sh | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/src/build.proj b/src/build.proj index bc6e47fb3a..96b5fa19e2 100644 --- a/src/build.proj +++ b/src/build.proj @@ -8,6 +8,7 @@ <!-- List the projects that need to be built --> <ItemGroup> <ProjectReference Condition="'$(SkipSOS)' != 'true'" Include="ToolBox\SOS\NETCore\SOS.NETCore.csproj" /> + <ProjectReference Condition="'$(BuildManagedTools)' == 'true'" Include="tools/runincontext/runincontext.csproj" /> <ProjectReference Condition="'$(BuildManagedTools)' == 'true'" Include="tools/r2rdump/R2RDump.csproj" /> <ProjectReference Include="System.Private.CoreLib\System.Private.CoreLib.csproj" /> </ItemGroup> diff --git a/src/tools/r2rdump/R2RDump.csproj b/src/tools/r2rdump/R2RDump.csproj index 18c2cadb8d..c0faab3ccc 100644 --- a/src/tools/r2rdump/R2RDump.csproj +++ b/src/tools/r2rdump/R2RDump.csproj @@ -15,6 +15,7 @@ <CLSCompliant>false</CLSCompliant> <NoWarn>8002,NU1701</NoWarn> <RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers> + <OutputPath>$(BinDir)</OutputPath> </PropertyGroup> <ItemGroup> diff --git a/src/tools/runincontext/runincontext.csproj b/src/tools/runincontext/runincontext.csproj index ee5ab21ab9..e0a3129a64 100644 --- a/src/tools/runincontext/runincontext.csproj +++ b/src/tools/runincontext/runincontext.csproj @@ -1,4 +1,5 @@ <Project Sdk="Microsoft.NET.Sdk"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <OutputType>Exe</OutputType> @@ -6,10 +7,6 @@ <RuntimeFrameworkVersion>$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion> <UseAppHost>false</UseAppHost> <CLRTestKind>BuildOnly</CLRTestKind> + <OutputPath>$(BinDir)</OutputPath> </PropertyGroup> - - <ItemGroup> - <Compile Include="runincontext.cs" /> - </ItemGroup> - </Project> diff --git a/tests/scripts/runincontext.cmd b/tests/scripts/runincontext.cmd index 5b1d70cc85..c5c0e65920 100644 --- a/tests/scripts/runincontext.cmd +++ b/tests/scripts/runincontext.cmd @@ -13,4 +13,4 @@ @rem 3. - n. Additional arguments that were passed to the test .cmd set CORE_LIBRARIES=%1 -%_DebuggerFullPath% "%CORE_ROOT%\corerun.exe" "%CORE_ROOT%\..\..\runincontext\runincontext\runincontext.exe" %RunInContextExtraArgs% /referencespath:%CORE_ROOT%\ %1%2 %3 %4 %5 %6 %7 %8 %9 +%_DebuggerFullPath% "%CORE_ROOT%\corerun.exe" "%CORE_ROOT%\runincontext.dll" %RunInContextExtraArgs% /referencespath:%CORE_ROOT%\ %1%2 %3 %4 %5 %6 %7 %8 %9 diff --git a/tests/scripts/runincontext.sh b/tests/scripts/runincontext.sh index 27b6a48428..fa9db00a04 100755 --- a/tests/scripts/runincontext.sh +++ b/tests/scripts/runincontext.sh @@ -14,4 +14,4 @@ # 3. - n. Additional arguments that were passed to the test .sh export CORE_LIBRARIES=$1 -$_DebuggerFullPath "$CORE_ROOT/corerun" "$CORE_ROOT/../../runincontext/runincontext/runincontext.exe" $RunInContextExtraArgs /referencespath:$CORE_ROOT/ $1$2 $3 $4 $5 $6 $7 $8 $9 +$_DebuggerFullPath "$CORE_ROOT/corerun" "$CORE_ROOT/runincontext.dll" $RunInContextExtraArgs /referencespath:$CORE_ROOT/ $1$2 $3 $4 $5 $6 $7 $8 $9 |