Skip to content

[wasm] Testing improvements. #37662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vargaz merged 4 commits into from
Jun 10, 2020
Merged

[wasm] Testing improvements. #37662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41f8570
Add System.Security.Cryptography.Algorithms to the pinvoke generator.
vargaz Jun 9, 2020
0b2c74c
Fix a stack overflow in WasmAppBuilder.
vargaz Jun 9, 2020
963adb6
[wasm] Unset MONO_LOG_MASK when running tests.
vargaz Jun 9, 2020
d16ce85
Turn off GC logging by default.
vargaz Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/testing/WasmRunnerTemplate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cd $EXECUTION_DIR
XHARNESS_OUT="$EXECUTION_DIR/xharness-output"

dotnet xharness wasm test --engine=$JAVASCRIPT_ENGINE \
--js-file=runtime.js \
--js-file=runtime.js -v \
--output-directory=$XHARNESS_OUT \
-- --enable-gc --run WasmTestRunner.dll ${@:2}

Expand Down
4 changes: 2 additions & 2 deletions src/mono/wasm/runtime/driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,8 @@ mono_wasm_load_runtime (const char *managed_path, int enable_debugging)
{
const char *interp_opts = "";

monoeg_g_setenv ("MONO_LOG_LEVEL", "debug", 0);
monoeg_g_setenv ("MONO_LOG_MASK", "gc", 0);
//monoeg_g_setenv ("MONO_LOG_LEVEL", "debug", 0);
//monoeg_g_setenv ("MONO_LOG_MASK", "gc", 0);
#ifdef ENABLE_NETCORE
monoeg_g_setenv ("DOTNET_SYSTEM_GLOBALIZATION_INVARIANT", "1", 0);
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/wasm.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

<ItemGroup>
<WasmPInvokeModules Include="libSystem.Native"/>
<WasmPInvokeModules Include="libSystem.Security.Cryptography.Native.OpenSsl"/>
<WasmPInvokeAssemblies Include="$(MonoArtifactsPath)\System.Private.CoreLib.dll"/>
<WasmPInvokeAssemblies Include="$(ArtifactsBinDir)\System.Runtime\$(NetCoreAppCurrent)-Unix-$(Configuration)\System.Runtime.dll"/>
<WasmPInvokeAssemblies Include="$(ArtifactsBinDir)\System.Console\$(NetCoreAppCurrent)-Browser-$(Configuration)\System.Console.dll"/>
Expand All @@ -19,6 +18,7 @@
<WasmPInvokeAssemblies Include="$(ArtifactsBinDir)\System.Net.Sockets\$(NetCoreAppCurrent)-Unix-$(Configuration)\System.Net.Sockets.dll"/>
<WasmPInvokeAssemblies Include="$(ArtifactsBinDir)\System.Net.Primitives\$(NetCoreAppCurrent)-Unix-$(Configuration)\System.Net.Primitives.dll"/>
<WasmPInvokeAssemblies Include="$(ArtifactsBinDir)\System.Net.NameResolution\$(NetCoreAppCurrent)-Unix-$(Configuration)\System.Net.NameResolution.dll"/>
<WasmPInvokeAssemblies Include="$(ArtifactsBinDir)\System.Security.Cryptography.Algorithms\$(NetCoreAppCurrent)-Browser-$(Configuration)\System.Security.Cryptography.Algorithms.dll"/>
</ItemGroup>

<Target Name="CheckEnv">
Expand Down
2 changes: 2 additions & 0 deletions tools-local/tasks/mobile.tasks/WasmAppBuilder/WasmAppBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ public override bool Execute ()

private void Add(MetadataLoadContext mlc, Assembly assembly)
{
if (_assemblies!.ContainsKey(assembly.GetName().Name!))
return;
_assemblies![assembly.GetName().Name!] = assembly;
foreach (var aname in assembly.GetReferencedAssemblies())
{
Expand Down