[wasm] WBT: Avoid using -O0 in tests

Some WBT tests started failing while compiling `aot-instances.dll.bc` when compiled with `-O0`. So, we avoid using that where possible. Issue: dotnet#93023
radical · Oct 4, 2023 · 24699db · 24699db
1 parent 782c9d3
commit 24699db
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildPublishTests.cs b/src/mono/wasm/Wasm.Build.Tests/BuildPublishTests.cs
@@ -79,7 +79,7 @@ public void BuildThenPublishWithAOT(BuildArgs buildArgs, RunHost host, string id
                 prefix: "build_publish", config: buildArgs.Config, appendUnicode: testUnicode);
 
             buildArgs = buildArgs with { ProjectName = projectName };
-            buildArgs = ExpandBuildArgs(buildArgs, extraProperties: "<_WasmDevel>true</_WasmDevel>");
+            buildArgs = ExpandBuildArgs(buildArgs);
 
             // no relinking for build
             bool relinked = false;

diff --git a/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/OptimizationFlagChangeTests.cs b/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/OptimizationFlagChangeTests.cs
@@ -23,7 +23,7 @@ public OptimizationFlagChangeTests(ITestOutputHelper output, SharedBuildPerTestC
     public static IEnumerable<object?[]> FlagsOnlyChangeData(bool aot)
         => ConfigWithAOTData(aot, config: "Release").Multiply(
                     new object[] { /*cflags*/ "/p:EmccCompileOptimizationFlag=-O1", /*ldflags*/ "" },
-                    new object[] { /*cflags*/ "",                                   /*ldflags*/ "/p:EmccLinkOptimizationFlag=-O0" }
+                    new object[] { /*cflags*/ "",                                   /*ldflags*/ "/p:EmccLinkOptimizationFlag=-O1" }
         ).WithRunHosts(RunHost.Chrome).UnwrapItemsAsArrays();
 
     [Theory]

diff --git a/src/mono/wasm/Wasm.Build.Tests/SatelliteAssembliesTests.cs b/src/mono/wasm/Wasm.Build.Tests/SatelliteAssembliesTests.cs
@@ -136,7 +136,8 @@ public void CheckThatSatelliteAssembliesAreNotAOTed(BuildArgs buildArgs, string
                                         projectTemplate: s_resourcesProjectTemplate,
                                         extraProperties: $@"
                                             <EmccCompileOptimizationFlag>-O0</EmccCompileOptimizationFlag>
-                                            <EmccLinkOptimizationFlag>-O0</EmccLinkOptimizationFlag>",
+                                            <EmccLinkOptimizationFlag>-O0</EmccLinkOptimizationFlag>
+                                            <WasmDedup>false</WasmDedup>", // -O0 can cause aot-instances.dll to blow up, and fail to compile, and it is not really needed here
                                         extraItems: $"<EmbeddedResource Include=\"{BuildEnvironment.RelativeTestAssetsPath}resx\\*\" />");
 
             BuildProject(buildArgs,