Test: Convert "_sourcemap" and "preconfig-flat" fixtures to tap.txt

Add support for setting env. This is motivated by the next patch
(Make PerfReporter compatible with Node.js) which will use this
for another CLI test case.

Author: Krinkle

test/cli/cli-main.js

@@ -20,62 +20,6 @@ QUnit.module('CLI Main', () => {
     }
   );
 
-  QUnit.test('preconfig-flat', async assert => {
-    const command = ['qunit', 'preconfig-flat.js'];
-    const execution = await execute(command, {
-      env: {
-        qunit_config_filter: '!foobar',
-        qunit_config_seed: 'dummyfirstyes',
-        qunit_config_testtimeout: '7',
-
-        qunit_config_altertitle: 'true',
-        qunit_config_noglobals: '1',
-        qunit_config_notrycatch: 'false'
-      }
-    });
-    assert.equal(execution.snapshot, `Running tests with seed: dummyfirstyes
-TAP version 13
-ok 1 dummy
-not ok 2 slow
-  ---
-  message: Test took longer than 7ms; test timed out.
-  severity: failed
-  ...
-ok 3 config
-1..3
-# pass 2
-# skip 0
-# todo 0
-# fail 1
-
-# exit code: 1`);
-  });
-
-  // TODO: Move to /test/cli/fixtures/
-  QUnit.test('normal trace with native source map', async assert => {
-    const command = ['qunit', 'sourcemap/source.js'];
-    const execution = await execute(command);
-
-    assert.equal(execution.snapshot, `TAP version 13
-ok 1 Example > good
-not ok 2 Example > bad
-  ---
-  message: failed
-  severity: failed
-  actual  : false
-  expected: true
-  stack: |
-        at /qunit/test/cli/fixtures/sourcemap/source.js:7:16
-  ...
-1..2
-# pass 1
-# skip 0
-# todo 0
-# fail 1
-
-# exit code: 1`);
-  });
-
   // Skip in code coverage mode, conflicting maps-on-maps change result
   QUnit.test.if('trace with native source map', !process.env.NYC_PROCESS_ID, async function (assert) {
     const command = ['qunit', 'sourcemap/source.min.js'];

test/cli/fixtures/_sourcemap.tap.txt

@@ -0,0 +1,21 @@
+# name: normal trace with native source map applied
+# command: ["qunit","sourcemap/source.js"]
+
+TAP version 13
+ok 1 Example > good
+not ok 2 Example > bad
+  ---
+  message: failed
+  severity: failed
+  actual  : false
+  expected: true
+  stack: |
+        at /qunit/test/cli/fixtures/sourcemap/source.js:7:16
+  ...
+1..2
+# pass 1
+# skip 0
+# todo 0
+# fail 1
+
+# exit code: 1

test/cli/fixtures/preconfig-flat.tap.txt

@@ -0,0 +1,19 @@
+# command: ["qunit", "preconfig-flat.js"]
+# env: { "qunit_config_filter": "!foobar", "qunit_config_seed": "dummyfirstyes", "qunit_config_testtimeout": 7, "qunit_config_altertitle": "true", "qunit_config_noglobals": 1, "qunit_config_notrycatch": "false" }
+
+Running tests with seed: dummyfirstyes
+TAP version 13
+ok 1 dummy
+not ok 2 slow
+  ---
+  message: Test took longer than 7ms; test timed out.
+  severity: failed
+  ...
+ok 3 config
+1..3
+# pass 2
+# skip 0
+# todo 0
+# fail 1
+
+# exit code: 1

test/cli/helpers/fixtures.js

@@ -7,6 +7,7 @@ const { execute } = require('./execute.js');
 
 const NAME_DIRECTIVE = '# name: ';
 const CMD_DIRECTIVE = '# command: ';
+const ENV_DIRECTIVE = '# env: ';
 
 async function parseFixture (file) {
   const contents = await fsPromises.readFile(file, 'utf8');
@@ -17,12 +18,16 @@ async function parseFixture (file) {
   if (!lines[0].startsWith(CMD_DIRECTIVE)) {
     throw new Error(`Missing command declaration in ${path.basename(file)}`);
   }
-  const command = JSON.parse(lines[0].slice(CMD_DIRECTIVE.length));
+  const command = JSON.parse(lines.shift().slice(CMD_DIRECTIVE.length));
+  const env = (lines[0].startsWith(ENV_DIRECTIVE))
+    ? JSON.parse(lines.shift().slice(ENV_DIRECTIVE.length))
+    : undefined;
 
   return {
     name,
     command,
-    expected: lines.slice(1).join('\n').trim()
+    env,
+    expected: lines.join('\n').trim()
   };
 }
 
@@ -32,7 +37,7 @@ function readFixtures (dir) {
   for (const file of glob('*.tap.txt', { cwd: dir, absolute: true })) {
     fixtures[path.basename(file, '.tap.txt')] = async function runFixture () {
       const fixture = await parseFixture(file);
-      const result = await execute(fixture.command);
+      const result = await execute(fixture.command, { env: fixture.env });
       return {
         name: fixture.name,
         expected: fixture.expected,