Skip to content

Commit 08ece3c

Browse files
committed
Apply PR feedback: simplify InvariantGlobalization gating, rename minimal_main.js
- Drop ConditionalTheory(IsMonoRuntime) on InvariantGlobalization tests; TestCategory=native already excludes them from the CoreCLR lane. - Flip RelinkingWithoutAOT back to TestCategory=native so it runs on Mono only. - Rename icu_main.js to minimal_main.js (the file is not ICU-specific). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 9dbd21a commit 08ece3c

3 files changed

Lines changed: 4 additions & 8 deletions

File tree

src/mono/wasm/Wasm.Build.Tests/InvariantGlobalizationTests.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,17 @@ public InvariantGlobalizationTests(ITestOutputHelper output, SharedBuildPerTestC
2929
.UnwrapItemsAsArrays();
3030

3131
// TODO: check that icu bits have been linked out
32-
// Gated to Mono until CoreCLR-Wasm provides a stub for libSystem.Globalization.Native
33-
// when InvariantGlobalization=true. See https://github.com/dotnet/runtime/issues/128219
34-
[ConditionalTheory(typeof(BuildTestBase), nameof(IsMonoRuntime))]
32+
[Theory]
3533
[MemberData(nameof(InvariantGlobalizationTestData), parameters: new object[] { /*aot*/ false })]
3634
[MemberData(nameof(InvariantGlobalizationTestData), parameters: new object[] { /*aot*/ true })]
3735
[TestCategory("native")]
3836
public async Task AOT_InvariantGlobalization(Configuration config, bool aot, bool? invariantGlobalization)
3937
=> await TestInvariantGlobalization(config, aot, invariantGlobalization);
4038

4139
// TODO: What else should we use to verify a relinked build?
42-
// Gated to Mono until CoreCLR-Wasm provides a stub for libSystem.Globalization.Native
43-
// when InvariantGlobalization=true. See https://github.com/dotnet/runtime/issues/128219
44-
[ConditionalTheory(typeof(BuildTestBase), nameof(IsMonoRuntime))]
40+
[Theory]
4541
[MemberData(nameof(InvariantGlobalizationTestData), parameters: new object[] { /*aot*/ false })]
46-
[TestCategory("native-coreclr")]
42+
[TestCategory("native")]
4743
public async Task RelinkingWithoutAOT(Configuration config, bool aot, bool? invariantGlobalization)
4844
=> await TestInvariantGlobalization(config, aot, invariantGlobalization, isNativeBuild: true);
4945

src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTestsBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ protected void DeleteFile(string pathRelativeToProjectDir)
432432
protected void ReplaceMainJsWithMinimalRunMain()
433433
{
434434
string mainJsPath = Path.Combine(_projectDir, "wwwroot", "main.js");
435-
File.Copy(Path.Combine(BuildEnvironment.TestAssetsPath, "EntryPoints", "icu_main.js"), mainJsPath, overwrite: true);
435+
File.Copy(Path.Combine(BuildEnvironment.TestAssetsPath, "EntryPoints", "minimal_main.js"), mainJsPath, overwrite: true);
436436
}
437437

438438
protected void UpdateBrowserMainJs(string? targetFramework = null, string runtimeAssetsRelativePath = DefaultRuntimeAssetsRelativePath, bool forwardConsole = false)
File renamed without changes.

0 commit comments

Comments
 (0)