From e40e997f57986b4b9dcf8702c9d0b03b68f6d8ea Mon Sep 17 00:00:00 2001 From: Daniel-Genkin Date: Wed, 23 Jun 2021 21:20:45 -0400 Subject: [PATCH 1/2] Fixed config issue --- src/mono/sample/mbr/browser/runtime.js | 2 +- src/mono/sample/wasm/browser-bench/runtime.js | 2 +- src/mono/sample/wasm/browser-profile/runtime.js | 2 +- src/mono/sample/wasm/browser/runtime.js | 2 +- .../wasm/debugger/tests/debugger-test/runtime-debugger.js | 2 +- src/mono/wasm/runtime-test.js | 2 +- src/mono/wasm/runtime/library_mono.js | 4 ++-- src/tests/FunctionalTests/WebAssembly/Browser/AOT/runtime.js | 2 +- .../WebAssembly/Browser/NormalInterp/runtime.js | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/mono/sample/mbr/browser/runtime.js b/src/mono/sample/mbr/browser/runtime.js index 32918aa573a44..74781179a31f8 100644 --- a/src/mono/sample/mbr/browser/runtime.js +++ b/src/mono/sample/mbr/browser/runtime.js @@ -5,7 +5,7 @@ var Module = { config: null, preInit: async function() { - Module.config = await MONO.mono_wasm_load_config("./mono-config.json"); + await MONO.mono_wasm_load_config("./mono-config.json"); // sets Module.config implicitly }, // Called when the runtime is initialized and wasm is ready diff --git a/src/mono/sample/wasm/browser-bench/runtime.js b/src/mono/sample/wasm/browser-bench/runtime.js index 60c383d13cb52..f9bdf8b3af7ab 100644 --- a/src/mono/sample/wasm/browser-bench/runtime.js +++ b/src/mono/sample/wasm/browser-bench/runtime.js @@ -4,7 +4,7 @@ var Module = { config: null, preInit: async function() { - Module.config = await MONO.mono_wasm_load_config("./mono-config.json"); + await MONO.mono_wasm_load_config("./mono-config.json"); // sets Module.config implicitly }, // Called when the runtime is initialized and wasm is ready diff --git a/src/mono/sample/wasm/browser-profile/runtime.js b/src/mono/sample/wasm/browser-profile/runtime.js index 2c83ff54ef93d..f0636985d0358 100644 --- a/src/mono/sample/wasm/browser-profile/runtime.js +++ b/src/mono/sample/wasm/browser-profile/runtime.js @@ -5,7 +5,7 @@ var Module = { config: null, preInit: async function() { - Module.config = await MONO.mono_wasm_load_config("./mono-config.json"); + await MONO.mono_wasm_load_config("./mono-config.json"); // sets Module.config implicitly }, // Called when the runtime is initialized and wasm is ready diff --git a/src/mono/sample/wasm/browser/runtime.js b/src/mono/sample/wasm/browser/runtime.js index e97feef745a95..816136acf36b6 100644 --- a/src/mono/sample/wasm/browser/runtime.js +++ b/src/mono/sample/wasm/browser/runtime.js @@ -6,7 +6,7 @@ var Module = { config: null, preInit: async function() { - Module.config = await MONO.mono_wasm_load_config("./mono-config.json"); + await MONO.mono_wasm_load_config("./mono-config.json"); // sets Module.config implicitly }, // Called when the runtime is initialized and wasm is ready diff --git a/src/mono/wasm/debugger/tests/debugger-test/runtime-debugger.js b/src/mono/wasm/debugger/tests/debugger-test/runtime-debugger.js index 360aa9b8b3036..8fb1e86211afe 100644 --- a/src/mono/wasm/debugger/tests/debugger-test/runtime-debugger.js +++ b/src/mono/wasm/debugger/tests/debugger-test/runtime-debugger.js @@ -5,7 +5,7 @@ var Module = { config: null, preInit: async function() { - Module.config = await MONO.mono_wasm_load_config("./mono-config.json"); + await MONO.mono_wasm_load_config("./mono-config.json"); // sets Module.config implicitly }, // Called when the runtime is initialized and wasm is ready diff --git a/src/mono/wasm/runtime-test.js b/src/mono/wasm/runtime-test.js index 8b3395f4ec50e..89b9c5d70cc7e 100644 --- a/src/mono/wasm/runtime-test.js +++ b/src/mono/wasm/runtime-test.js @@ -211,7 +211,7 @@ var Module = { printErr, preInit: async function() { - Module.config = await MONO.mono_wasm_load_config("./mono-config.json"); + await MONO.mono_wasm_load_config("./mono-config.json"); // sets Module.config implicitly }, onAbort: function(x) { diff --git a/src/mono/wasm/runtime/library_mono.js b/src/mono/wasm/runtime/library_mono.js index e9cb8cd2b401d..c07e9dc22daf4 100644 --- a/src/mono/wasm/runtime/library_mono.js +++ b/src/mono/wasm/runtime/library_mono.js @@ -2384,9 +2384,9 @@ var MonoSupportLib = { } else { // shell or worker config = JSON.parse(read(configFilePath)); // read is a v8 debugger command } - return config; + Module.config = config; } catch(e) { - return {message: "failed to load config file", error: e}; + Module.config = {message: "failed to load config file", error: e}; } finally { Module.removeRunDependency(configFilePath); } diff --git a/src/tests/FunctionalTests/WebAssembly/Browser/AOT/runtime.js b/src/tests/FunctionalTests/WebAssembly/Browser/AOT/runtime.js index 65cba13a9b126..11f8d64f60c51 100644 --- a/src/tests/FunctionalTests/WebAssembly/Browser/AOT/runtime.js +++ b/src/tests/FunctionalTests/WebAssembly/Browser/AOT/runtime.js @@ -6,7 +6,7 @@ var Module = { config: null, preInit: async function() { - Module.config = await MONO.mono_wasm_load_config("./mono-config.json"); + await MONO.mono_wasm_load_config("./mono-config.json"); // sets Module.config implicitly }, onRuntimeInitialized: function () { diff --git a/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/runtime.js b/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/runtime.js index 1a8abf503fb33..b5227472674c6 100644 --- a/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/runtime.js +++ b/src/tests/FunctionalTests/WebAssembly/Browser/NormalInterp/runtime.js @@ -6,7 +6,7 @@ var Module = { config: null, preInit: async function() { - Module.config = await MONO.mono_wasm_load_config("./mono-config.json"); + await MONO.mono_wasm_load_config("./mono-config.json"); // sets Module.config implicitly }, onRuntimeInitialized: function () { From 59e7fc4c23a401ccde82e7707a4b110a0301885c Mon Sep 17 00:00:00 2001 From: Daniel-Genkin Date: Thu, 24 Jun 2021 08:56:57 -0400 Subject: [PATCH 2/2] Updated Hot Reload test --- .../FunctionalTests/WebAssembly/Browser/HotReload/runtime.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/FunctionalTests/WebAssembly/Browser/HotReload/runtime.js b/src/tests/FunctionalTests/WebAssembly/Browser/HotReload/runtime.js index 4859991a626f4..94f1a36a41073 100644 --- a/src/tests/FunctionalTests/WebAssembly/Browser/HotReload/runtime.js +++ b/src/tests/FunctionalTests/WebAssembly/Browser/HotReload/runtime.js @@ -6,7 +6,7 @@ var Module = { config: null, preInit: async function() { - Module.config = await MONO.mono_wasm_load_config("./mono-config.json"); + await MONO.mono_wasm_load_config("./mono-config.json"); // sets Module.config implicitly }, onRuntimeInitialized: function () {