Skip to content

Commit 5de4944

Browse files
committed
Revert "Limit JIT unit suite within the subsets which are stable in SDE."
This reverts commit 067e31e.
1 parent 161c3e9 commit 5de4944

29 files changed

+1528
-0
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<ItemGroup>
3+
<MergedWrapperProjectReference Include="coverage/**/*.??proj" />
4+
<MergedWrapperProjectReference Include="nullabletypes/**/*.??proj" />
5+
</ItemGroup>
6+
7+
<Import Project="$(TestSourceDir)MergedTestRunner.targets" />
8+
</Project>
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<ItemGroup>
3+
<MergedWrapperProjectReference Include="*/**/*.??proj" />
4+
5+
<!-- Directed_1 -->
6+
<MergedWrapperProjectReference Remove="coverage/**/*.??proj" />
7+
<MergedWrapperProjectReference Remove="nullabletypes/**/*.??proj" />
8+
9+
<!-- Directed_2 -->
10+
<MergedWrapperProjectReference Remove="cmov/**/*.??proj" />
11+
<MergedWrapperProjectReference Remove="perffix/**/*.??proj" />
12+
<MergedWrapperProjectReference Remove="PREFIX/**/*.??proj" />
13+
<MergedWrapperProjectReference Remove="shift/**/*.??proj" />
14+
</ItemGroup>
15+
16+
<Import Project="$(TestSourceDir)MergedTestRunner.targets" />
17+
</Project>
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<NumberOfStripesToUseInStress>8</NumberOfStripesToUseInStress>
4+
5+
<GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'osx'">true</GCStressIncompatible>
6+
<GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm'">true</GCStressIncompatible>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<MergedWrapperProjectReference Include="$(MSBuildThisFileDirectory)General/**/*.csproj" Exclude="$(MSBuildThisFileDirectory)General/**/*_ro.csproj" />
11+
</ItemGroup>
12+
13+
<Import Project="$(TestSourceDir)MergedTestRunner.targets" />
14+
</Project>
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<NumberOfStripesToUseInStress>8</NumberOfStripesToUseInStress>
4+
5+
<GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'osx'">true</GCStressIncompatible>
6+
<GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm'">true</GCStressIncompatible>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<MergedWrapperProjectReference Include="$(MSBuildThisFileDirectory)General/**/*_ro.csproj" />
11+
</ItemGroup>
12+
13+
<Import Project="$(TestSourceDir)MergedTestRunner.targets" />
14+
</Project>
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<NumberOfStripesToUseInStress>2</NumberOfStripesToUseInStress>
4+
5+
<GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'osx'">true</GCStressIncompatible>
6+
<GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm'">true</GCStressIncompatible>
7+
8+
<!-- Various platforms will always throw, so we don't want to spend cycles running tests unnecessarily -->
9+
<!-- We don't need to worry about coverage as we have a number of stress tests that can disable intrinsics per ISA and run on the normally supported platforms -->
10+
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x64' AND '$(TargetArchitecture)' != 'x86'">true</CLRTestTargetUnsupported>
11+
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' == 'x86' AND '$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<MergedWrapperProjectReference Include="$(MSBuildThisFileDirectory)X86/**/*.csproj" Exclude="$(MSBuildThisFileDirectory)X86/**/*_ro.csproj" />
16+
</ItemGroup>
17+
18+
<Import Project="$(TestSourceDir)MergedTestRunner.targets" />
19+
</Project>
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<NumberOfStripesToUseInStress>2</NumberOfStripesToUseInStress>
4+
5+
<GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'osx'">true</GCStressIncompatible>
6+
<GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm'">true</GCStressIncompatible>
7+
8+
<!-- Various platforms will always throw, so we don't want to spend cycles running tests unnecessarily -->
9+
<!-- We don't need to worry about coverage as we have a number of stress tests that can disable intrinsics per ISA and run on the normally supported platforms -->
10+
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x64' AND '$(TargetArchitecture)' != 'x86'">true</CLRTestTargetUnsupported>
11+
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' == 'x86' AND '$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<MergedWrapperProjectReference Include="$(MSBuildThisFileDirectory)X86/**/*_ro.csproj" />
16+
</ItemGroup>
17+
18+
<Import Project="$(TestSourceDir)MergedTestRunner.targets" />
19+
</Project>

src/tests/JIT/JIT_others.csproj

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<ItemGroup>
3+
<MergedWrapperProjectReference Include="*/**/*.??proj" />
4+
5+
<MergedWrapperProjectReference Remove="*/**/*_d.??proj" />
6+
<MergedWrapperProjectReference Remove="*/**/*_do.??proj" />
7+
<MergedWrapperProjectReference Remove="*/**/*_r.??proj" />
8+
<MergedWrapperProjectReference Remove="*/**/*_ro.??proj" />
9+
</ItemGroup>
10+
11+
<Import Project="JIT_RemoveMergedTests.projitems" />
12+
<Import Project="$(TestSourceDir)MergedTestRunner.targets" />
13+
</Project>

src/tests/JIT/JIT_r.csproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<ItemGroup>
3+
<MergedWrapperProjectReference Include="*/**/*_r.??proj" />
4+
</ItemGroup>
5+
6+
<Import Project="JIT_RemoveMergedTests.projitems" />
7+
<Import Project="$(TestSourceDir)MergedTestRunner.targets" />
8+
</Project>

src/tests/JIT/JIT_ro.csproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<ItemGroup>
3+
<MergedWrapperProjectReference Include="*/**/*_ro.??proj" />
4+
</ItemGroup>
5+
6+
<Import Project="JIT_RemoveMergedTests.projitems" />
7+
<Import Project="$(TestSourceDir)MergedTestRunner.targets" />
8+
</Project>
Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<HasMergedInTests>true</HasMergedInTests>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<MergedWrapperProjectReference Include="a*/**/*_d.??proj" />
7+
<MergedWrapperProjectReference Include="b*/**/*_d.??proj" />
8+
<MergedWrapperProjectReference Include="c*/**/*_d.??proj" />
9+
<MergedWrapperProjectReference Include="d*/**/*_d.??proj" />
10+
<MergedWrapperProjectReference Include="e*/**/*_d.??proj" />
11+
<ProjectReference Include="../common/localloc_common.ilproj" />
12+
<ProjectReference Include="../common/eh_common.csproj" />
13+
<ProjectReference Include="cctor/misc/testlib_misc.csproj" />
14+
<ProjectReference Include="Boxing/xlang/sinlib_cs.csproj" Aliases="sinlib_cs" />
15+
<ProjectReference Include="Boxing/xlang/sinlib_il.ilproj" Aliases="sinlib_il" />
16+
</ItemGroup>
17+
<ItemGroup>
18+
<Compile Include="Arrays\lcs\lcs.cs" />
19+
<Compile Include="Arrays\lcs\lcs2.cs" />
20+
<Compile Include="Arrays\lcs\lcsbas.cs" />
21+
<Compile Include="Arrays\lcs\lcsbox.cs" />
22+
<Compile Include="Arrays\lcs\lcsmax.cs" />
23+
<Compile Include="Arrays\lcs\lcsmixed.cs" />
24+
<Compile Include="Arrays\lcs\lcsval.cs" />
25+
<Compile Include="Arrays\lcs\lcsvalbox.cs" />
26+
<Compile Include="Arrays\misc\gcarr.cs" />
27+
<Compile Include="Arrays\misc\selfref.cs" />
28+
<Compile Include="AsgOp\i4\i4.cs" />
29+
<Compile Include="AsgOp\i4\i4flat.cs" />
30+
<Compile Include="AsgOp\i8\i8.cs" />
31+
<Compile Include="AsgOp\i8\i8flat.cs" />
32+
<Compile Include="AsgOp\r4\r4.cs" />
33+
<Compile Include="AsgOp\r4\r4flat.cs" />
34+
<Compile Include="AsgOp\r8\r8.cs" />
35+
<Compile Include="AsgOp\r8\r8flat.cs" />
36+
<Compile Include="Boxing\callconv\instance.cs" />
37+
<Compile Include="Boxing\functional\fibo.cs" />
38+
<Compile Include="Boxing\functional\sin.cs" />
39+
<Compile Include="Boxing\misc\enum.cs" />
40+
<Compile Include="Boxing\misc\nestval.cs" />
41+
<Compile Include="Boxing\misc\tailjump.cs" />
42+
<Compile Include="Boxing\morph\sin.cs" />
43+
<Compile Include="Boxing\seh\try.cs" />
44+
<Compile Include="Boxing\xlang\sin_cs.cs" />
45+
<Compile Include="Boxing\xlang\sin_il.cs" />
46+
<Compile Include="casts\coverage\castclass_call.cs" />
47+
<Compile Include="casts\coverage\castclass_ldarg.cs" />
48+
<Compile Include="casts\coverage\castclass_ldloc.cs" />
49+
<Compile Include="casts\coverage\castclass_newobj.cs" />
50+
<Compile Include="casts\coverage\isinst_call.cs" />
51+
<Compile Include="casts\coverage\isinst_ldarg.cs" />
52+
<Compile Include="casts\coverage\isinst_ldloc.cs" />
53+
<Compile Include="casts\coverage\isinst_newobj.cs" />
54+
<Compile Include="casts\iface\iface1.cs" />
55+
<Compile Include="casts\SEH\cast_throw.cs" />
56+
<Compile Include="casts\SEH\throw.cs" />
57+
<Compile Include="cctor\misc\assemname.cs" />
58+
<Compile Include="cctor\misc\Desktop\throw.cs" />
59+
<Compile Include="cctor\misc\throw.cs" />
60+
<Compile Include="cctor\simple\precise1.cs" />
61+
<Compile Include="cctor\simple\precise1b.cs" />
62+
<Compile Include="cctor\simple\precise2.cs" />
63+
<Compile Include="cctor\simple\precise4.cs" />
64+
<Compile Include="divrem\div\decimaldiv.cs" />
65+
<Compile Include="divrem\div\i4div.cs" />
66+
<Compile Include="divrem\div\i8div.cs" />
67+
<Compile Include="divrem\div\overlddiv.cs" />
68+
<Compile Include="divrem\div\r4div.cs" />
69+
<Compile Include="divrem\div\r8div.cs" />
70+
<Compile Include="divrem\div\u4div.cs" />
71+
<Compile Include="divrem\div\u8div.cs" />
72+
<Compile Include="divrem\rem\decimalrem.cs" />
73+
<Compile Include="divrem\rem\i4rem.cs" />
74+
<Compile Include="divrem\rem\i8rem.cs" />
75+
<Compile Include="divrem\rem\overldrem.cs" />
76+
<Compile Include="divrem\rem\r4rem.cs" />
77+
<Compile Include="divrem\rem\r8rem.cs" />
78+
<Compile Include="divrem\rem\u4rem.cs" />
79+
<Compile Include="divrem\rem\u8rem.cs" />
80+
<Compile Include="doublearray\dblarray1.cs" />
81+
<Compile Include="doublearray\dblarray2.cs" />
82+
<Compile Include="doublearray\dblarray3.cs" />
83+
<Compile Include="eh\basics\multihandler.cs" />
84+
<Compile Include="eh\basics\throwincatch.cs" />
85+
<Compile Include="eh\basics\throwinclassconstructor.cs" />
86+
<Compile Include="eh\basics\throwinfinally.cs" />
87+
<Compile Include="eh\basics\throwinfinallyerrpath.cs" />
88+
<Compile Include="eh\basics\throwinfinallyerrpathfn.cs" />
89+
<Compile Include="eh\basics\throwoutside.cs" />
90+
<Compile Include="eh\basics\trycatch.cs" />
91+
<Compile Include="eh\basics\trycatchtrycatch.cs" />
92+
<Compile Include="eh\basics\tryfinally.cs" />
93+
<Compile Include="eh\basics\tryfinallytrycatch.cs" />
94+
<Compile Include="eh\basics\tryfinallytryfinally.cs" />
95+
<Compile Include="eh\basics\trythrowcatch.cs" />
96+
<Compile Include="eh\basics\trythrowcatchfinally.cs" />
97+
<Compile Include="eh\cs\unsafe.cs" />
98+
<Compile Include="eh\deadcode\loopstrswitchgoto.cs" />
99+
<Compile Include="eh\finallyexec\catchrettoinnertry.cs" />
100+
<Compile Include="eh\finallyexec\localgotoinahandler.cs" />
101+
<Compile Include="eh\finallyexec\loopinfinally.cs" />
102+
<Compile Include="eh\finallyexec\nonlocalexittobeginningoftry.cs" />
103+
<Compile Include="eh\finallyexec\nonlocalgotoinatryblockinahandler.cs" />
104+
<Compile Include="eh\finallyexec\simplenonlocalexit.cs" />
105+
<Compile Include="eh\finallyexec\simplenonlocalexitnestedintrycatch.cs" />
106+
<Compile Include="eh\finallyexec\switchincatch.cs" />
107+
<Compile Include="eh\finallyexec\tryCatchFinallyThrow_nonlocalexit1.cs" />
108+
<Compile Include="eh\finallyexec\tryCatchFinallyThrow_nonlocalexit2.cs" />
109+
<Compile Include="eh\finallyexec\tryCatchFinallyThrow_nonlocalexit3.cs" />
110+
<Compile Include="eh\finallyexec\tryCatchFinallyThrow_nonlocalexit4.cs" />
111+
<Compile Include="eh\finallyexec\tryfinallythrow_nonlocalexit.cs" />
112+
<Compile Include="eh\generics\throwincatch.cs" />
113+
<Compile Include="eh\generics\trycatchnestedtype.cs" />
114+
<Compile Include="eh\generics\trycatchsimpletype.cs" />
115+
<Compile Include="eh\interactions\gcincatch.cs" />
116+
<Compile Include="eh\interactions\rangecheckinfinally.cs" />
117+
<Compile Include="eh\interactions\strswitchfinal.cs" />
118+
<Compile Include="eh\interactions\switchinfinally.cs" />
119+
<Compile Include="eh\leaves\catchretnonlocalexitinfunclet.cs" />
120+
<Compile Include="eh\leaves\nonlocalexitfromnestedcatch.cs" />
121+
<Compile Include="eh\leaves\oponerror.cs" />
122+
<Compile Include="eh\leaves\tryfinallyloop.cs" />
123+
<Compile Include="eh\nested\general\cascadedcatch.cs" />
124+
<Compile Include="eh\nested\general\methodthrowsinfinally.cs" />
125+
<Compile Include="eh\nested\general\rethrowincatchnestedinfinally.cs" />
126+
<Compile Include="eh\nested\general\throwinfinally.cs" />
127+
<Compile Include="eh\nested\general\throwinfinallynestedintry.cs" />
128+
<Compile Include="eh\nested\general\throwinnestedfinally.cs" />
129+
<Compile Include="eh\nested\general\trycatchintryfinally.cs" />
130+
<Compile Include="eh\nested\nonlocalexit\throwinfinallynestedintry_30.cs" />
131+
<Compile Include="eh\nested\nonlocalexit\throwinfinallyrecursive_20.cs" />
132+
<Compile Include="eh\nested\nonlocalexit\throwinfinally_50.cs" />
133+
<Compile Include="eh\regress\asurt\140713\innerFinally.cs" />
134+
<Compile Include="eh\regress\asurt\141358\uncaughtException.cs" />
135+
<Compile Include="eh\rethrow\rethrowinfinallyaftercatch.cs" />
136+
<Compile Include="eh\rethrow\rethrowwithhandlerscatchingbase.cs" />
137+
<Compile Include="eh\rethrow\samerethrowtwice.cs" />
138+
<Compile Include="eh\rethrow\samethrowtwice.cs" />
139+
<Compile Include="eh\rethrow\simplerethrow.cs" />
140+
<Compile Include="eh\rethrow\throwwithhandlerscatchingbase.cs" />
141+
<Compile Include="explicit\basic\refarg_c.cs" />
142+
<Compile Include="explicit\basic\refarg_f4.cs" />
143+
<Compile Include="explicit\basic\refarg_f8.cs" />
144+
<Compile Include="explicit\basic\refarg_i1.cs" />
145+
<Compile Include="explicit\basic\refarg_i2.cs" />
146+
<Compile Include="explicit\basic\refarg_i4.cs" />
147+
<Compile Include="explicit\basic\refarg_o.cs" />
148+
<Compile Include="explicit\basic\refarg_s.cs" />
149+
<Compile Include="explicit\misc\explicit1.cs" />
150+
<Compile Include="explicit\misc\explicit2.cs" />
151+
<Compile Include="explicit\misc\explicit3.cs" />
152+
<Compile Include="explicit\misc\explicit4.cs" />
153+
<Compile Include="explicit\misc\explicit5.cs" />
154+
<Compile Include="explicit\misc\explicit6.cs" />
155+
<Compile Include="explicit\misc\explicit7.cs" />
156+
<Compile Include="explicit\misc\explicit8.cs" />
157+
<Compile Include="explicit\rotate\rotarg_double.cs" />
158+
<Compile Include="explicit\rotate\rotarg_float.cs" />
159+
<Compile Include="explicit\rotate\rotarg_objref.cs" />
160+
<Compile Include="explicit\rotate\rotarg_valref.cs" />
161+
</ItemGroup>
162+
<Import Project="$(TestSourceDir)MergedTestRunner.targets" />
163+
</Project>

0 commit comments

Comments
 (0)