huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use xunit.runner.json in Helix runs (#19922)

This commit is contained in:
Brennan 2020-03-17 12:26:40 -07:00 committed by GitHub
parent 4f5dbca39c
commit f5a2245957
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eng/helix/content/default.runner.json Normal file
View File

@ -0,0 +1,5 @@
{
"longRunningTestSeconds": 60,
"diagnosticMessages": true,
"maxParallelThreads": -1
}

5
eng/helix/content/runtests.cmd
View File

@ -49,6 +49,11 @@ echo Creating nuget restore directory: %NUGET_RESTORE%
mkdir %NUGET_RESTORE% mkdir %NUGET_RESTORE%
mkdir logs mkdir logs
REM "Rename default.runner.json to xunit.runner.json if there is not a custom one from the project"
if not EXIST ".\xunit.runner.json" (
copy default.runner.json xunit.runner.json
)
dir dir
%DOTNET_ROOT%\dotnet vstest %$target% -lt >discovered.txt %DOTNET_ROOT%\dotnet vstest %$target% -lt >discovered.txt

5
eng/helix/content/runtests.sh
View File

@ -108,7 +108,12 @@ then
# Ensure tools are on on PATH # Ensure tools are on on PATH
export PATH="$PATH:$DOTNET_CLI_HOME/.dotnet/tools" export PATH="$PATH:$DOTNET_CLI_HOME/.dotnet/tools"
fi
# Rename default.runner.json to xunit.runner.json if there is not a custom one from the project
if [ ! -f "xunit.runner.json" ]
then
cp default.runner.json xunit.runner.json
fi fi
if [ -e /proc/self/coredump_filter ]; then if [ -e /proc/self/coredump_filter ]; then

6
src/ProjectTemplates/Directory.Build.props
View File

@ -8,4 +8,10 @@
</PropertyGroup> </PropertyGroup>
<Import Project="TemplateProjects.props" Condition="'$(IsTestProject)' != 'true' AND '$(IsTestAssetProject)' != 'true'" /> <Import Project="TemplateProjects.props" Condition="'$(IsTestProject)' != 'true' AND '$(IsTestAssetProject)' != 'true'" />
<ItemGroup Condition="'$(IsTestProject)' == 'true'">
<Content Include="$(MSBuildThisFileDirectory)xunit.runner.json" Link="xunit.runner.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project> </Project>

5
src/ProjectTemplates/xunit.runner.json Normal file
View File

@ -0,0 +1,5 @@
{
"longRunningTestSeconds": 60,
"diagnosticMessages": true,
"maxParallelThreads": -1
}