Skip to content

Commit

Permalink
[test] Use JS string templates in test/browser_reporting.js. NFC (#22599
Browse files Browse the repository at this point in the history
)
  • Loading branch information
sbc100 authored Sep 20, 2024
1 parent 8996d44 commit cac4688
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions test/browser_reporting.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ function reportResultToServer(result, port) {
port = port || 8888;
if (reportResultToServer.reported) {
// Only report one result per test, even if the test misbehaves and tries to report more.
reportErrorToServer("excessive reported results, sending " + result + ", test will fail");
reportErrorToServer(`excessive reported results, sending ${result}, test will fail`);
}
reportResultToServer.reported = true;
if ((typeof ENVIRONMENT_IS_NODE !== 'undefined' && ENVIRONMENT_IS_NODE) || (typeof ENVIRONMENT_IS_AUDIO_WORKLET !== 'undefined' && ENVIRONMENT_IS_AUDIO_WORKLET)) {
out('RESULT: ' + result);
out(`RESULT: ${result}`);
} else {
let doFetch = typeof origFetch != 'undefined' ? origFetch : fetch;
doFetch('http://localhost:' + port + '/report_result?' + result).then(() => {
doFetch(`http://localhost:${port}/report_result?${result}`).then(() => {
if (typeof window === 'object' && window && hasModule && !Module['pageThrewException']) {
/* for easy debugging, don't close window on failure */
window.close();
Expand All @@ -35,15 +35,15 @@ function reportErrorToServer(message) {
if (typeof ENVIRONMENT_IS_NODE !== 'undefined' && ENVIRONMENT_IS_NODE) {
err(message);
} else {
fetch(encodeURI('http://localhost:8888?stderr=' + message));
fetch(encodeURI(`http://localhost:8888?stderr=${message}`));
}
}

function report_error(e) {
// MINIMAL_RUNTIME doesn't handle exit or call the below onExit handler
// so we detect the exit by parsing the uncaught exception message.
var message = e.message || e;
console.error("got top level error: " + message);
console.error(`got top level error: ${message}`);
if (window.disableErrorReporting) return;
if (message.includes('unwind')) return;
var offset = message.indexOf('exit(');
Expand All @@ -52,10 +52,10 @@ function report_error(e) {
offset = status.indexOf(')')
status = status.substr(0, offset)
console.error(status);
var result = 'exit:' + status;
var result = `exit:${status}`;
} else {
if (hasModule) Module['pageThrewException'] = true;
result = 'exception:' + message + ' / ' + e.stack;
result = `exception:${message} / ${e.stack}`;
}
// FIXME: Ideally we would just reportResultToServer rather than the `maybe`
// form but some browser tests currently report exceptions after exit.
Expand All @@ -75,7 +75,7 @@ if (hasModule) {
// If Module['REPORT_EXIT'] is set to false, do not report the result of
// onExit.
if (Module['REPORT_EXIT'] !== false) {
maybeReportResultToServer('exit:' + status);
maybeReportResultToServer(`exit:${status}`);
}
}
// Force these handlers to be proxied back to the main thread.
Expand All @@ -87,7 +87,7 @@ if (hasModule) {

if (!Module['onAbort']) {
Module['onAbort'] = function(reason) {
maybeReportResultToServer('abort:' + reason);
maybeReportResultToServer(`abort:${reason}`);
}
Module['onAbort'].proxy = true;
}
Expand Down

0 comments on commit cac4688

Please sign in to comment.