fixup! esm: print required top-level await locations without evaluating

Author: joyeecheung

test/common/index.js

@@ -957,7 +957,7 @@ function expectRequiredTLAError(err) {
 // Extract the entries of the rendered "Require stack:" list (each shown as
 // "- <path>") from an error message or a process output string.
 function parseRequireStack(output) {
-  const lines = output.split('\n');
+  const lines = output.replace(/\r/g, '').split('\n');
   const start = lines.indexOf('Require stack:');
   if (start === -1) {
     return [];

test/es-module/test-require-module-tla-print-arrow.js

@@ -16,11 +16,12 @@ const fixtures = require('../common/fixtures');
     signal: null,
     status: 1,
     stderr(output) {
+      output = output.replace(/\r/g, '');
       common.expectRequiredTLAError(output);
       // Indented await: the caret is aligned under the await.
-      assert.ok(output.includes('  await Promise.resolve(ready);\n  ^'), output);
+      assert(output.includes('  await Promise.resolve(ready);\n  ^'), output);
       // for-await-of: the caret points at the for keyword.
-      assert.ok(output.includes('for await (const x of [Promise.resolve(1)]) {\n^'), output);
+      assert(output.includes('for await (const x of [Promise.resolve(1)]) {\n^'), output);
       return true;
     },
     stdout: '',

test/es-module/test-require-module-tla-print-execution.js

@@ -17,11 +17,12 @@ const fixtures = require('../common/fixtures');
     signal: null,
     status: 1,
     stderr(output) {
+      output = output.replace(/\r/g, '');
       assert.doesNotMatch(output, /I am executed/);
       common.expectRequiredTLAError(output);
       // The location of the top-level await is shown with a caret.
-      assert.match(output, /tla\/execution\.mjs:3/);
-      assert.ok(output.includes("await Promise.resolve('hi');\n^"), output);
+      assert(output.includes(`${fixtures.path('es-modules/tla/execution.mjs')}:3`), output);
+      assert(output.includes("await Promise.resolve('hi');\n^"), output);
       // The require() chain is shown as a require stack.
       assert.match(output, /Require stack:/);
       assert.match(output, /require-execution\.js/);

test/es-module/test-require-module-tla-print-nested.js

@@ -17,10 +17,11 @@ const fixtures = require('../common/fixtures');
     signal: null,
     status: 1,
     stderr(output) {
+      output = output.replace(/\r/g, '');
       common.expectRequiredTLAError(output);
       // The top-level await lives in a transitive dependency (a.mjs).
-      assert.match(output, /tla\/a\.mjs:3/);
-      assert.ok(output.includes('await new Promise((resolve) => {\n^'), output);
+      assert(output.includes(`${fixtures.path('es-modules/tla/a.mjs')}:3`), output);
+      assert(output.includes('await new Promise((resolve) => {\n^'), output);
       assert.match(output, /Require stack:/);
       assert.match(output, /require-nested\.js/);
       return true;

test/es-module/test-require-module-tla-print-preload.js

@@ -18,12 +18,13 @@ const fixtures = require('../common/fixtures');
     signal: null,
     status: 1,
     stderr(output) {
+      output = output.replace(/\r/g, '');
       // The main script should not run because preloading fails first.
       assert.doesNotMatch(output, /main ran/);
       assert.doesNotMatch(output, /I am executed/);
       common.expectRequiredTLAError(output);
-      assert.match(output, /tla\/execution\.mjs:3/);
-      assert.ok(output.includes("await Promise.resolve('hi');\n^"), output);
+      assert(output.includes(`${fixtures.path('es-modules/tla/execution.mjs')}:3`), output);
+      assert(output.includes("await Promise.resolve('hi');\n^"), output);
       return true;
     },
     stdout: '',