Skip to content

[browser] fix emscripten out/err overrides #100630

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
pavelsavara merged 6 commits into from
Apr 9, 2024
Merged

[browser] fix emscripten out/err overrides #100630

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0121f33
fix emscripten out/err overrides
pavelsavara Apr 4, 2024
23fd1e2
test
pavelsavara Apr 5, 2024
0b6043f
fix?
pavelsavara Apr 5, 2024
ea0b85c
fix
pavelsavara Apr 8, 2024
2a9b34f
fix
pavelsavara Apr 8, 2024
1b25468
fix
pavelsavara Apr 9, 2024
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
Prev Previous commit
Next Next commit
fix
  • Loading branch information
@pavelsavara
pavelsavara authored Apr 8, 2024
commit 2a9b34f2ba13bcaa1ea0d7f13deb6d718db0b3a0
4 changes: 2 additions & 2 deletions src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/ModuleConfigTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public async Task DownloadProgressFinishes(bool failAssemblyDownload)

var result = await RunSdkStyleAppForPublish(new(
Configuration: "Debug",
TestScenario: "ModuleConfigTests",
TestScenario: "DownloadResourceProgressTest",
BrowserQueryString: new Dictionary<string, string> { ["failAssemblyDownload"] = failAssemblyDownload.ToString().ToLowerInvariant() }
));
Assert.True(
Expand Down Expand Up @@ -63,7 +63,7 @@ public async Task OutErrOverrideWorks()

var result = await RunSdkStyleAppForPublish(new(
Configuration: "Debug",
TestScenario: "ModuleConfigTests"
TestScenario: "OutErrOverrideWorks"
));
Assert.True(
result.TestOutput.Any(m => m.Contains("Emscripten out override works.")),
Expand Down
23 changes: 15 additions & 8 deletions src/mono/wasm/testassets/WasmBasicTestApp/App/wwwroot/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ switch (testCase) {
case "AppSettingsTest":
dotnet.withApplicationEnvironment(params.get("applicationEnvironment"));
break;
case "ModuleConfigTests":
case "DownloadResourceProgressTest":
if (params.get("failAssemblyDownload") === "true") {
let assemblyCounter = 0;
let failAtAssemblyNumbers = [
Expand Down Expand Up @@ -63,14 +63,18 @@ switch (testCase) {
if (loaded === total && loaded !== 0) {
testOutput("DownloadResourceProgress: Finished");
}
},
out: () => {
}
});
break;
case "OutErrOverrideWorks":
dotnet.withModuleConfig({
out: (message) => {
console.log("Emscripten out override works!");
console.log(console)
console.log(message)
},
err: () => {
console.log("Emscripten err override works!");
console.error(console)
err: (message) => {
console.error("Emscripten err override works!");
console.error(message)
},
});
break;
Expand Down Expand Up @@ -102,9 +106,12 @@ try {
exports.AppSettingsTest.Run();
exit(0);
break;
case "ModuleConfigTests":
case "DownloadResourceProgressTest":
exit(0);
break;
case "OutErrOverrideWorks":
dotnet.run();
break;
case "DebugLevelTest":
testOutput("WasmDebugLevel: " + config.debugLevel);
exit(0);
Expand Down