Skip to content

Commit c3183cb

Browse files
committed
[wasm] Use only symbol map for library tests
1 parent 12263ee commit c3183cb

File tree

1 file changed

+19
-10
lines changed

1 file changed

+19
-10
lines changed

eng/testing/tests.wasm.targets

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
- for AOT library tests, we use WasmNativeStrip=false, so we already have symbols
2020
-->
2121
<WasmNativeStrip Condition="'$(WasmNativeStrip)' == ''">false</WasmNativeStrip>
22-
<WasmEmitSymbolMap Condition="'$(WasmEmitSymbolMap)' == '' and '$(RunAOTCompilation)' != 'true'">true</WasmEmitSymbolMap>
22+
<WasmEmitSymbolMap Condition="'$(WasmEmitSymbolMap)' == ''">true</WasmEmitSymbolMap>
2323

2424
<!-- Run only if previous command succeeded -->
2525
<_ShellCommandSeparator Condition="'$(OS)' == 'Windows_NT'">&amp;&amp;</_ShellCommandSeparator>
@@ -168,16 +168,9 @@
168168
AssemblyFile="$(WasmBuildTasksAssemblyPath)" />
169169

170170
<Target Name="_BundleAOTTestWasmAppForHelix" DependsOnTargets="PrepareForWasmBuildApp">
171-
<PropertyGroup Condition="'$(IsHighAotMemoryUsageTest)' == 'true' and '$(ContinuousIntegrationBuild)' == 'true'">
172-
<DisableParallelEmccCompile Condition="'$(DisableParallelEmccCompile)' == ''">true</DisableParallelEmccCompile>
173-
<EmccLinkOptimizationFlag Condition="'$(EmccLinkOptimizationFlag)' == ''">-O2</EmccLinkOptimizationFlag>
174-
</PropertyGroup>
175-
176171
<PropertyGroup>
177172
<_MainAssemblyPath Condition="'%(WasmAssembliesToBundle.FileName)' == $(AssemblyName) and '%(WasmAssembliesToBundle.Extension)' == '.dll'">%(WasmAssembliesToBundle.Identity)</_MainAssemblyPath>
178173
<RuntimeConfigFilePath>$([System.IO.Path]::ChangeExtension($(_MainAssemblyPath), '.runtimeconfig.json'))</RuntimeConfigFilePath>
179-
<EmccLinkOptimizationFlag Condition="'$(EmccLinkOptimizationFlag)' == ''">-O1 -Wl,-O0 -Wl,-lto-O0</EmccLinkOptimizationFlag>
180-
<WasmNativeStrip>true</WasmNativeStrip>
181174
</PropertyGroup>
182175

183176
<Error Text="Item WasmAssembliesToBundle is empty. This is likely an authoring error." Condition="@(WasmAssembliesToBundle->Count()) == 0" />
@@ -215,6 +208,9 @@
215208
<_WasmPropertyNames Include="_WasmDevel" />
216209
<_WasmPropertyNames Include="_WasmStrictVersionMatch" />
217210
<_WasmPropertyNames Include="WasmEmitSymbolMap" />
211+
<_WasmPropertyNames Include="WasmNativeDebugSymbols" />
212+
<_WasmPropertyNames Include="EmccExtraCFlags" />
213+
<_WasmPropertyNames Include="EmccExtraLDFlags" />
218214

219215
<_WasmPropertiesToPass
220216
Include="$(%(_WasmPropertyNames.Identity))"
@@ -255,11 +251,24 @@
255251
<WasmMainJSPath Condition="'$(WasmMainJSPath)' == ''">$(MonoProjectRoot)\wasm\test-main.js</WasmMainJSPath>
256252
<WasmInvariantGlobalization>$(InvariantGlobalization)</WasmInvariantGlobalization>
257253
<WasmGenerateRunV8Script>true</WasmGenerateRunV8Script>
258-
259-
<WasmNativeDebugSymbols Condition="'$(DebuggerSupport)' == 'true' and '$(WasmNativeDebugSymbols)' == ''">true</WasmNativeDebugSymbols>
260254
<WasmDebugLevel Condition="'$(DebuggerSupport)' == 'true' and '$(WasmDebugLevel)' == ''">-1</WasmDebugLevel>
261255
</PropertyGroup>
262256

257+
<PropertyGroup Condition="'$(BuildAOTTestsOnHelix)' == 'true' and '$(IsHighAotMemoryUsageTest)' == 'true' and '$(ContinuousIntegrationBuild)' == 'true'">
258+
<DisableParallelEmccCompile Condition="'$(DisableParallelEmccCompile)' == ''">true</DisableParallelEmccCompile>
259+
<EmccLinkOptimizationFlag Condition="'$(EmccLinkOptimizationFlag)' == ''">-O2</EmccLinkOptimizationFlag>
260+
</PropertyGroup>
261+
262+
<PropertyGroup>
263+
<EmccLinkOptimizationFlag Condition="'$(EmccLinkOptimizationFlag)' == ''">-O1 -Wl,-O0 -Wl,-lto-O0</EmccLinkOptimizationFlag>
264+
265+
<!-- Use symbol map instead of generating full dwarf info -->
266+
<WasmNativeDebugSymbols Condition="'$(WasmNativeDebugSymbols)' == ''">false</WasmNativeDebugSymbols>
267+
<WasmNativeStrip Condition="'$(WasmNativeStrip)' == ''">true</WasmNativeStrip>
268+
<EmccExtraCFlags>$(EmccExtraCFlags) -g2</EmccExtraCFlags>
269+
<EmccExtraLDFlags>$(EmccExtraLDFlags) --profiling-funcs</EmccExtraLDFlags>
270+
</PropertyGroup>
271+
263272
<ItemGroup Condition="'$(IncludeSatelliteAssembliesInVFS)' == 'true' and '$(BuildAOTTestsOnHelix)' != 'true'">
264273
<_SatelliteAssemblies Include="$(PublishDir)*\*.resources.dll" />
265274
<_SatelliteAssemblies CultureName="$([System.IO.Directory]::GetParent('%(Identity)').Name)" />

0 commit comments

Comments
 (0)