Skip to content

Disable CI blocking test #61403

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

Closed
agocke wants to merge 5 commits into from
Closed

Disable CI blocking test #61403

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5de3e0e
Add activeissues.targets and disable test
agocke Nov 10, 2021
b52ee3c
Update build.proj
agocke Nov 10, 2021
9cf453e
Add ItemGroup
agocke Nov 10, 2021
a41eed3
Respond to comments
agocke Nov 10, 2021
f249f57
Remove activeissues.targets
agocke Nov 10, 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
Prev Previous commit
Next Next commit
Respond to comments
  • Loading branch information
@agocke
agocke committed Nov 10, 2021
commit a41eed35b366e04ce728040fa9ffc59e4dd79ad9
6 changes: 0 additions & 6 deletions src/tests/activeissues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
<?xml version="1.0" ?>
<!-- Tracks ci-blocking issues -->
<Project DefaultTargets = "GetListOfTestCmds" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/DictionaryExpansion/*"
Condition="'$(RuntimeFlavor)' == 'mono' and '$(TargetOs)' == 'Android'">
<Issue>https://github.com/dotnet/runtime/issues/61322</Issue>
</ExcludeList>
</ItemGroup>
</Project>
2 changes: 0 additions & 2 deletions src/tests/build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ set "__RootBinDir=%__RepoRootDir%\artifacts"
set "__LogsDir=%__RootBinDir%\log"
set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs"

set __ActiveIssuesList=%__RepoRootDir%\src\tests\activeissues.targets
:: Default __Exclude to issues.targets
set __Exclude=%__RepoRootDir%\src\tests\issues.targets

Expand Down Expand Up @@ -120,7 +119,6 @@ if /i "%1" == "crossgen2" (set __DoCrossgen2=1&set __TestBuildMode=c
if /i "%1" == "composite" (set __CompositeBuildMode=1&set __DoCrossgen2=1&set __TestBuildMode=crossgen2&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
if /i "%1" == "pdb" (set __CreatePdb=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
if /i "%1" == "perfmap" (set __CreatePerfmap=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
if /i "%1" == "ActiveIssuesList" (set __ActiveIssuesList=%2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop)
if /i "%1" == "Exclude" (set __Exclude=%2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop)
if /i "%1" == "-priority" (set __Priority=%2&shift&set processedArgs=!processedArgs! %1=%2&shift&goto Arg_Loop)
if /i "%1" == "allTargets" (set "__BuildNeedTargetArg=/p:CLRTestBuildAllTargets=%1"&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
Expand Down
3 changes: 1 addition & 2 deletions src/tests/build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,10 @@
</ItemGroup>
</Target>

<Import Project="$(__ActiveIssuesList)" Condition="'$(__ActiveIssuesList)' != '' AND '$(XunitTestBinBase)' != ''" />
<Import Project="$(__Exclude)" Condition="'$(__Exclude)' != '' AND '$(XunitTestBinBase)' != ''" />
<PropertyGroup>
<HaveExcludes>False</HaveExcludes>
<HaveExcludes Condition="'$(__ActiveIssuesList)' != '' or '$(__Exclude)' != ''">True</HaveExcludes>
<HaveExcludes Condition="'$(__Exclude)' != ''">True</HaveExcludes>
</PropertyGroup>


Expand Down
2 changes: 0 additions & 2 deletions src/tests/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ build_Tests()

__ProjectFilesDir="$__TestDir"
__TestBinDir="$__TestWorkingDir"
__ActiveIssuesList="$__RepoRootDir/src/tests/activeissues.targets"
__Exclude="$__RepoRootDir/src/tests/issues.targets"

if [[ -f "${__TestWorkingDir}/build_info.json" ]]; then
Expand Down Expand Up @@ -111,7 +110,6 @@ build_Tests()
export __MonoBinDir
export __MsgPrefix
export __ErrMsgPrefix
export __ActiveIssuesList
export __Exclude

# Generate build command
Expand Down
8 changes: 8 additions & 0 deletions src/tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
<?xml version="1.0" ?>
<Project DefaultTargets = "GetListOfTestCmds" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Issues that were or are blocking CI -->
<ItemGroup>
<ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/DictionaryExpansion/*"
Condition="'$(RuntimeFlavor)' == 'mono' and '$(TargetOs)' == 'Android'">
<Issue>https://github.com/dotnet/runtime/issues/61322</Issue>
</ExcludeList>
</ItemGroup>

<!-- All OS/Arch/Runtime excludes -->
<ItemGroup Condition="'$(XunitTestBinBase)' != ''">
<ExcludeList Include="$(XunitTestBinBase)/readytorun/DynamicMethodGCStress/DynamicMethodGCStress/*">
Expand Down