Skip to content

Commit 5a8f469

Browse files
radicalradical
committed
re-enable tests
1 parent 6b9085e commit 5a8f469

File tree

10 files changed

+29
-24
lines changed

10 files changed

+29
-24
lines changed

‎eng/testing/tests.wasm.targets‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<_XHarnessArgs Condition="'$(Scenario)' != 'WasmTestOnBrowser'">$(_XHarnessArgs) --engine=$(JSEngine) $(JSEngineArgs) --js-file=runtime.js</_XHarnessArgs>
2525
<_XHarnessArgs Condition="'$(BrowserHost)' == 'windows'">$(_XHarnessArgs) --browser=chrome --browser-path=%HELIX_CORRELATION_PAYLOAD%\chrome-win\chrome.exe</_XHarnessArgs>
2626
<_XHarnessArgs Condition="'$(IsFunctionalTest)' == 'true'" >$(_XHarnessArgs) --expected-exit-code=$(ExpectedExitCode)</_XHarnessArgs>
27+
<_XHarnessArgs >$(_XHarnessArgs) --timeout=3600</_XHarnessArgs>
2728
<_XHarnessArgs Condition="'$(WasmXHarnessArgs)' != ''" >$(_XHarnessArgs) $(WasmXHarnessArgs)</_XHarnessArgs>
2829

2930
<_AppArgs Condition="'$(IsFunctionalTest)' != 'true' and '$(Scenario)' != 'BuildWasmApps'">--run WasmTestRunner.dll $(AssemblyName).dll</_AppArgs>
@@ -36,7 +37,7 @@
3637
</PropertyGroup>
3738

3839
<PropertyGroup Condition="'$(BuildAOTTestsOnHelix)' == 'true'">
39-
<_AOTBuildCommand>dotnet msbuild publish/ProxyProjectForAOTOnHelix.proj /bl:$XHARNESS_OUT/AOTBuild.binlog</_AOTBuildCommand>
40+
<_AOTBuildCommand>dotnet msbuild publish/ProxyProjectForAOTOnHelix.proj /v:n /bl:$XHARNESS_OUT/AOTBuild.binlog</_AOTBuildCommand>
4041

4142
<!-- running aot-helix tests locally, so we can test with the same project file as CI -->
4243
<_AOTBuildCommand Condition="'$(ContinuousIntegrationBuild)' != 'true'">$(_AOTBuildCommand) /p:RuntimeSrcDir=$(RepoRoot) /p:RuntimeConfig=$(Configuration)</_AOTBuildCommand>

‎src/libraries/System.Collections/tests/System.Collections.Tests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
44
<TestRuntime>true</TestRuntime>
55
<DebuggerSupport Condition="'$(DebuggerSupport)' == '' and '$(TargetOS)' == 'Browser'">true</DebuggerSupport>
6+
<WasmXHarnessArgs>$(WasmXHarnessArgs) --timeout=3600</WasmXHarnessArgs>
67
</PropertyGroup>
78
<ItemGroup>
89
<!-- Common Collections tests -->

‎src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
4+
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
45
</PropertyGroup>
56
<ItemGroup>
67
<Compile Include="System\ComponentModel\BrowsableAttributeTests.cs" />
@@ -27,4 +28,4 @@
2728
<Compile Include="System\ComponentModel\ReadOnlyAttributeTests.cs" />
2829
<Compile Include="System\ComponentModel\RefreshPropertiesAttributeTests.cs" />
2930
</ItemGroup>
30-
</Project>
31+
</Project>

‎src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<RootNamespace />
66
<AssemblyVersion>9.9.9.9</AssemblyVersion>
77
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
8+
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
89
</PropertyGroup>
910
<ItemGroup>
1011
<Compile Include="Drawing\ColorConverterTests.cs" />

‎src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
4+
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
45
</PropertyGroup>
56
<ItemGroup>
67
<Compile Include="$(CommonTestPath)System\Collections\IEnumerableTest.cs"

‎src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1080,7 +1080,7 @@ public static void DCS_WithListOfXElement()
10801080
}
10811081

10821082
[Fact]
1083-
[ActiveIssue("https://github.com/dotnet/runtime/issues/51679", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
1083+
// [ActiveIssue("https://github.com/dotnet/runtime/issues/51679", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
10841084
public static void DCS_DerivedTypeWithDifferentOverrides()
10851085
{
10861086
var x = new DerivedTypeWithDifferentOverrides() { Name1 = "Name1", Name2 = "Name2", Name3 = "Name3", Name4 = "Name4", Name5 = "Name5" };

‎src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@
9393
<ProjectReference Include="$(CommonTestPath)StreamConformanceTests\StreamConformanceTests.csproj" />
9494
<ProjectReference Include="$(LibrariesProjectRoot)System.IO.Pipelines\src\System.IO.Pipelines.csproj" />
9595
</ItemGroup>
96-
</Project>
96+
</Project>

‎src/libraries/System.Threading.Tasks/tests/System.Runtime.CompilerServices/AsyncTaskMethodBuilderTests.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -642,10 +642,6 @@ public void AsyncTaskMethodBuilder_Completed_RemovedFromTracking()
642642
{
643643
RemoteExecutor.Invoke(() =>
644644
{
645-
// NOTE: This depends on private implementation details generally only used by the debugger.
646-
// If those ever change, this test will need to be updated as well.
647-
typeof(Task).GetField("s_asyncDebuggingEnabled", BindingFlags.NonPublic | BindingFlags.Static).SetValue(null, true);
648-
649645
for (int i = 0; i < 1000; i++)
650646
{
651647
static async Task YieldAsync(TaskCompletionSource tcs) => await tcs.Task;

‎src/libraries/tests.proj‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -262,31 +262,32 @@
262262

263263
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true'">
264264
<!-- Issue: https://github.com/dotnet/runtime/issues/50724 -->
265-
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Composition\tests\System.Composition.Tests.csproj" />
266-
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Dynamic.Runtime\tests\System.Dynamic.Runtime.Tests.csproj" />
267-
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Primitives\tests\FunctionalTests\System.Net.Primitives.Functional.Tests.csproj" />
268-
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection\tests\DI.Tests\Microsoft.Extensions.DependencyInjection.Tests.csproj" />
269-
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Logging.EventSource\tests\Microsoft.Extensions.Logging.EventSource.Tests.csproj" />
270-
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.DiagnosticSource\tests\System.Diagnostics.DiagnosticSource.Tests.csproj" />
271-
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Linq.Queryable\tests\System.Linq.Queryable.Tests.csproj" />
272-
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj" />
265+
<!--<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Composition\tests\System.Composition.Tests.csproj" />-->
266+
<!--<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Dynamic.Runtime\tests\System.Dynamic.Runtime.Tests.csproj" />-->
267+
<!--<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Primitives\tests\FunctionalTests\System.Net.Primitives.Functional.Tests.csproj" />-->
268+
<!--<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection\tests\DI.Tests\Microsoft.Extensions.DependencyInjection.Tests.csproj" />-->
269+
<!--<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Logging.EventSource\tests\Microsoft.Extensions.Logging.EventSource.Tests.csproj" />-->
270+
<!--<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.DiagnosticSource\tests\System.Diagnostics.DiagnosticSource.Tests.csproj" />-->
271+
<!--<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Linq.Queryable\tests\System.Linq.Queryable.Tests.csproj" />-->
272+
<!--<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj" />-->
273273

274274
<!-- Issue: https://github.com/dotnet/runtime/issues/51211 -->
275-
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.CompilerServices.VisualC\tests\System.Runtime.CompilerServices.VisualC.Tests.csproj" />
276-
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.TypeExtensions\tests\System.Reflection.TypeExtensions.Tests.csproj" />
277-
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.Emit.Lightweight\tests\System.Reflection.Emit.Lightweight.Tests.csproj" />
278-
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Binder\tests\Microsoft.Extensions.Configuration.Binder.Tests.csproj" />
275+
<!--<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.CompilerServices.VisualC\tests\System.Runtime.CompilerServices.VisualC.Tests.csproj" />-->
276+
<!--<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.TypeExtensions\tests\System.Reflection.TypeExtensions.Tests.csproj" />-->
277+
<!--<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.Emit.Lightweight\tests\System.Reflection.Emit.Lightweight.Tests.csproj" />-->
278+
<!--<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Binder\tests\Microsoft.Extensions.Configuration.Binder.Tests.csproj" />-->
279279

280-
<!-- Issue: https://github.com/dotnet/runtime/issues/51602 -->
280+
<!-- Issue: https://github.com/dotnet/runtime/issues/51602 --> <!-- IL2105 -->
281281
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ComponentModel.Primitives\tests\System.ComponentModel.Primitives.Tests.csproj" />
282282
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ObjectModel\tests\System.ObjectModel.Tests.csproj" />
283283
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj" />
284+
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ComponentModel.Annotations\tests\System.ComponentModel.Annotations.Tests.csproj" />
284285

285-
<!-- Issue: https://github.com/dotnet/runtime/issues/51708 -->
286+
<!-- Issue: https://github.com/dotnet/runtime/issues/51708 --> <!-- IL2103 -->
286287
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Linq.Expressions\tests\System.Linq.Expressions.Tests.csproj" />
287288

288-
<!-- MarkTypeForDynamicallyAccessedMembers stack overflow https://github.com/mono/linker/issues/1881 -->
289-
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ComponentModel.Annotations\tests\System.ComponentModel.Annotations.Tests.csproj" />
289+
<!-- Issue: https://github.com/dotnet/runtime/issues/56819 --> <!-- IL1005 -->
290+
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.csproj" />
290291

291292
<!-- IL2103 -->
292293
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj" />

‎src/mono/System.Private.CoreLib/src/ILLink/ILLink.Substitutions.wasm.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
<type fullname="System.Runtime.CompilerServices.RuntimeFeature">
1010
<method signature="System.Boolean get_IsDynamicCodeCompiled()" body="stub" value="false" />
1111
</type>
12+
<type fullname="System.Runtime.CompilerServices.RuntimeFeature">
13+
<method signature="System.Boolean get_IsDynamicCodeSupported()" body="stub" value="true" />
14+
</type>
1215
<type fullname="System.Resources.ResourceReader">
1316
<method signature="System.Boolean InitializeBinaryFormatter()" body="stub" value="false" />
1417
</type>

0 commit comments

Comments
 (0)