multi-tape 1.5.0 → 1.7.0

package/Changelog.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.7.0] 2022-06-20
+
+-   Add a --controller argument
+
+## [1.6.1] 2021-01-29
+
+-   Add MT_DEBUG_INTERVAL setting
+-   Send SIGKILL if SIGTERM does not cause test to exit
+
+## [1.6.0] 2021-01-06
+
+-   Timeout for test execution
+
 ## [1.5.0] 2020-12-14
 
 -   Build with github actions

package/README.md

@@ -46,6 +46,10 @@ with output sent to stdout and print a summary at the end
     a junit xml-file. The output filename will be the name
     of the test-file with '.xml' appended.
 
+-   -t 10000 Timeout in ms for how long each test-file is allowed to run. Default is no timeout.
+
+- --controller="command with parameters" Run a command before starting the tests. Wait for the command to print something on stdout before starting the tests. Kill the command when all tests are done.
+
 ## Exit code
 
 multi-tape exits with code 1 if any test failed as shown by the tap-results or
@@ -55,7 +59,7 @@ if any test-script exited with a non-zero code.
 
 MIT License
 
-Copyright (c) 2018-2020, Mattias Holmlund, <mattias@holmlund.se>
+Copyright (c) 2018-2021, Mattias Holmlund, <mattias@holmlund.se>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/build/index.js

@@ -10,12 +10,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const child_process_1 = require("child_process");
 const glob_1 = require("./lib/glob");
 const run_test_1 = require("./lib/run-test");
 const argv = require('minimist')(process.argv.slice(2), {
     boolean: ['o', 'j'],
     default: {
         p: 1,
+        t: 0,
     },
 });
 const results = new Map();
@@ -41,7 +43,7 @@ function thread() {
         let file;
         while ((file = files.shift())) {
             inProgress.add(file);
-            const result = yield run_test_1.runTest(file, nodeArgs, argv.p === 1, argv.o, argv.j);
+            const result = yield run_test_1.runTest(file, nodeArgs, argv.p === 1, argv.o, argv.j, argv.t);
             inProgress.delete(file);
             results.set(file, result);
         }
@@ -49,8 +51,41 @@ function thread() {
 }
 function run() {
     return __awaiter(this, void 0, void 0, function* () {
+        let controller;
+        let controllerRunning = false;
+        if (argv.controller) {
+            yield new Promise((resolve, reject) => {
+                var _a, _b;
+                controller = child_process_1.spawn(argv.controller, [], {
+                    shell: true,
+                    stdio: ['ignore', 'pipe', 'pipe'],
+                });
+                (_a = controller.stdout) === null || _a === void 0 ? void 0 : _a.on('data', data => {
+                    console.log(`controller: ${data}`);
+                    controllerRunning = true;
+                    resolve();
+                });
+                (_b = controller.stderr) === null || _b === void 0 ? void 0 : _b.on('data', data => {
+                    console.error(`controller: ${data}`);
+                });
+                controller.on('error', code => {
+                    reject();
+                    console.log(`controller error ${code}`);
+                });
+                controller.on('close', () => {
+                    controllerRunning = false;
+                });
+            });
+        }
         yield Promise.all(new Array(argv.p).fill(0).map(() => thread()));
-        printSummary();
+        if (controller && controllerRunning) {
+            console.log('controller: stopping');
+            controller.once('close', () => printSummary());
+            controller.kill();
+        }
+        else {
+            printSummary();
+        }
     });
 }
 function printSummary() {
@@ -64,7 +99,7 @@ function printSummary() {
         }
         else if (!r.ok) {
             success = false;
-            console.log(`FAIL ${file} (${timeStr}) ${r.pass}/${r.count}`);
+            console.log(`FAIL ${file} (${timeStr}) ${r.pass || 0}/${r.count || 0}`);
         }
         else {
             success = false;
@@ -82,5 +117,11 @@ function printSummary() {
 }
 process.on('SIGTERM', printInProgress);
 process.on('SIGINT', printInProgress);
+if (process.env.MT_DEBUG_INTERVAL) {
+    setInterval(() => {
+        console.log(`## Queued: ${files.length}`);
+        console.log(`## Running: ${[...inProgress.keys()]}`);
+    }, parseInt(process.env.MT_DEBUG_INTERVAL)).unref();
+}
 void run();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFFQSxxQ0FBcUM7QUFDckMsNkNBQWdEO0FBRWhELE1BQU0sSUFBSSxHQU1OLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRTtJQUMzQyxPQUFPLEVBQUUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDO0lBQ25CLE9BQU8sRUFBRTtRQUNMLENBQUMsRUFBRSxDQUFDO0tBQ1A7Q0FDSixDQUFDLENBQUE7QUFFRixNQUFNLE9BQU8sR0FBRyxJQUFJLEdBQUcsRUFBa0IsQ0FBQTtBQUV6QyxNQUFNLFFBQVEsR0FBRyxJQUFJLEtBQUssRUFBVSxDQUFBO0FBRXBDLElBQUksSUFBSSxDQUFDLFVBQVUsQ0FBQyxFQUFFO0lBQ2xCLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsRUFBRTtRQUNqQyxRQUFRLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUE7S0FDckM7U0FBTTtRQUNILFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUE7S0FDbEM7Q0FDSjtBQUVELE1BQU0sS0FBSyxHQUFHLGVBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUE7QUFDckMsTUFBTSxVQUFVLEdBQUcsSUFBSSxHQUFHLEVBQVUsQ0FBQTtBQUVwQyxJQUFJLE9BQU8sR0FBRyxJQUFJLEdBQUcsRUFBVSxDQUFBO0FBRS9CLFNBQVMsZUFBZTtJQUNwQixVQUFVLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFO1FBQ3RCLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDckIsQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDO0FBRUQsU0FBZSxNQUFNOztRQUNqQixJQUFJLElBQXdCLENBQUE7UUFFNUIsT0FBTyxDQUFDLElBQUksR0FBRyxLQUFLLENBQUMsS0FBSyxFQUFFLENBQUMsRUFBRTtZQUMzQixVQUFVLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFBO1lBQ3BCLE1BQU0sTUFBTSxHQUFHLE1BQU0sa0JBQU8sQ0FDeEIsSUFBSSxFQUNKLFFBQVEsRUFDUixJQUFJLENBQUMsQ0FBQyxLQUFLLENBQUMsRUFDWixJQUFJLENBQUMsQ0FBQyxFQUNOLElBQUksQ0FBQyxDQUFDLENBQ1QsQ0FBQTtZQUNELFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUE7WUFDdkIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUE7U0FDNUI7SUFDTCxDQUFDO0NBQUE7QUFFRCxTQUFlLEdBQUc7O1FBQ2QsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUNoRSxZQUFZLEVBQUUsQ0FBQTtJQUNsQixDQUFDO0NBQUE7QUFFRCxTQUFTLFlBQVk7SUFDakIsSUFBSSxPQUFPLEdBQUcsSUFBSSxDQUFBO0lBQ2xCLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUE7SUFDZixLQUFLLElBQUksQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FDL0MsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsYUFBYSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxhQUFhLENBQ3BELEVBQUU7UUFDQyxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxDQUFDLEVBQUUsYUFBYSxFQUFFLEdBQUcsR0FBRyxDQUFBO1FBRWxELE1BQU0sT0FBTyxHQUFHLEdBQUcsQ0FBQyxhQUFhLEdBQUcsSUFBSSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUE7UUFDdkQsSUFBSSxRQUFRLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLEVBQUU7WUFDeEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLElBQUksS0FBSyxPQUFPLEtBQUssQ0FBQyxDQUFDLElBQUksSUFBSSxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQTtTQUNoRTthQUFNLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1lBQ2QsT0FBTyxHQUFHLEtBQUssQ0FBQTtZQUNmLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxJQUFJLEtBQUssT0FBTyxLQUFLLENBQUMsQ0FBQyxJQUFJLElBQUksQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUE7U0FDaEU7YUFBTTtZQUNILE9BQU8sR0FBRyxLQUFLLENBQUE7WUFDZixPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsSUFBSSxzQkFBc0IsUUFBUSxFQUFFLENBQUMsQ0FBQTtTQUM1RDtLQUNKO0lBRUQsSUFBSSxPQUFPLENBQUMsSUFBSSxHQUFHLENBQUMsRUFBRTtRQUNsQixPQUFPLENBQUMsR0FBRyxDQUFDLDJDQUEyQyxDQUFDLENBQUE7UUFDeEQsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDakQsT0FBTyxHQUFHLEtBQUssQ0FBQTtLQUNsQjtJQUVELElBQUksQ0FBQyxPQUFPLEVBQUU7UUFDVixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0tBQ2xCO0FBQ0wsQ0FBQztBQUVELE9BQU8sQ0FBQyxFQUFFLENBQUMsU0FBUyxFQUFFLGVBQWUsQ0FBQyxDQUFBO0FBQ3RDLE9BQU8sQ0FBQyxFQUFFLENBQUMsUUFBUSxFQUFFLGVBQWUsQ0FBQyxDQUFBO0FBRXJDLEtBQUssR0FBRyxFQUFFLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFFQSxpREFBcUM7QUFDckMscUNBQXFDO0FBQ3JDLDZDQUFnRDtBQUVoRCxNQUFNLElBQUksR0FRTixPQUFPLENBQUMsVUFBVSxDQUFDLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUU7SUFDM0MsT0FBTyxFQUFFLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQztJQUNuQixPQUFPLEVBQUU7UUFDTCxDQUFDLEVBQUUsQ0FBQztRQUNKLENBQUMsRUFBRSxDQUFDO0tBQ1A7Q0FDSixDQUFDLENBQUE7QUFFRixNQUFNLE9BQU8sR0FBRyxJQUFJLEdBQUcsRUFBa0IsQ0FBQTtBQUV6QyxNQUFNLFFBQVEsR0FBRyxJQUFJLEtBQUssRUFBVSxDQUFBO0FBRXBDLElBQUksSUFBSSxDQUFDLFVBQVUsQ0FBQyxFQUFFO0lBQ2xCLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsRUFBRTtRQUNqQyxRQUFRLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUE7S0FDckM7U0FBTTtRQUNILFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUE7S0FDbEM7Q0FDSjtBQUVELE1BQU0sS0FBSyxHQUFHLGVBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUE7QUFDckMsTUFBTSxVQUFVLEdBQUcsSUFBSSxHQUFHLEVBQVUsQ0FBQTtBQUVwQyxJQUFJLE9BQU8sR0FBRyxJQUFJLEdBQUcsRUFBVSxDQUFBO0FBRS9CLFNBQVMsZUFBZTtJQUNwQixVQUFVLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFO1FBQ3RCLE9BQU8sQ0FBQyxHQUFH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

package/build/lib/run-test.d.ts

@@ -3,4 +3,4 @@ export interface Result {
     executionTime: number;
     result: any;
 }
-export declare function runTest(filename: string, nodeArgs: string[], logConsole: boolean, outputToFile: boolean, junitOutput: boolean): Promise<Result>;
+export declare function runTest(filename: string, nodeArgs: string[], logConsole: boolean, outputToFile: boolean, junitOutput: boolean, timeout: number): Promise<Result>;

package/build/lib/run-test.js

@@ -16,7 +16,7 @@ const streams = require("stream-buffers");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
-function runTest(filename, nodeArgs, logConsole, outputToFile, junitOutput) {
+function runTest(filename, nodeArgs, logConsole, outputToFile, junitOutput, timeout) {
     return __awaiter(this, void 0, void 0, function* () {
         const extraEnv = {};
         if (junitOutput) {
@@ -27,8 +27,23 @@ function runTest(filename, nodeArgs, logConsole, outputToFile, junitOutput) {
         let proc = child_process_1.spawn('node', nodeArgs.concat(filename), {
             env: Object.assign(Object.assign({}, process.env), extraEnv),
         });
-        let exited = new Promise(resolve => {
+        let aborted = false;
+        const exited = new Promise(resolve => {
+            let timer = timeout > 0
+                ? setTimeout(() => {
+                    console.log(`## multi-tape: Timeout for ${path_1.basename(filename)}. Sending SIGTERM`);
+                    proc.kill('SIGTERM');
+                    aborted = true;
+                    timer = setTimeout(() => {
+                        console.log(`## multi-tape: Second timeout for ${path_1.basename(filename)}. Sending SIGKILL`);
+                        proc.kill('SIGKILL');
+                    }, 10000);
+                }, timeout)
+                : undefined;
             proc.on('exit', (exitCode, signal) => {
+                if (timer) {
+                    clearTimeout(timer);
+                }
                 resolve({ exitCode, signal });
             });
         });
@@ -48,9 +63,13 @@ function runTest(filename, nodeArgs, logConsole, outputToFile, junitOutput) {
             }
             proc.stderr.pipe(output);
         });
-        const { exitCode, signal } = yield exited;
+        let { exitCode, signal } = yield exited;
         const endTime = Date.now();
-        const result = yield parsed;
+        let result = yield parsed;
+        if (aborted) {
+            result += `\n\n# Test aborted after ${timeout}ms`;
+            exitCode = exitCode || 1;
+        }
         if (!logConsole) {
             const lines = output.getContentsAsString('utf8');
             if (lines) {
@@ -70,4 +89,4 @@ function runTest(filename, nodeArgs, logConsole, outputToFile, junitOutput) {
     });
 }
 exports.runTest = runTest;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVuLXRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcnVuLXRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFBO0FBQ3BDLE1BQU0sR0FBRyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtBQUMxQiwwQ0FBeUM7QUFDekMsaURBQXFDO0FBQ3JDLDJCQUFzQztBQUN0QywrQkFBK0I7QUFXL0IsU0FBc0IsT0FBTyxDQUN6QixRQUFnQixFQUNoQixRQUFrQixFQUNsQixVQUFtQixFQUNuQixZQUFxQixFQUNyQixXQUFvQjs7UUFFcEIsTUFBTSxRQUFRLEdBQUcsRUFBUyxDQUFBO1FBQzFCLElBQUksV0FBVyxFQUFFO1lBQ2IsUUFBUSxDQUFDLGFBQWEsR0FBRyxRQUFRLEdBQUcsTUFBTSxDQUFBO1lBQzFDLFFBQVEsQ0FBQyxhQUFhLEdBQUcsZUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFBO1NBQzlDO1FBRUQsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFBO1FBQzVCLElBQUksSUFBSSxHQUFHLHFCQUFLLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEVBQUU7WUFDaEQsR0FBRyxrQ0FDSSxPQUFPLENBQUMsR0FBRyxHQUNYLFFBQVEsQ0FDZDtTQUNKLENBQUMsQ0FBQTtRQUNGLElBQUksTUFBTSxHQUFHLElBQUksT0FBTyxDQUF1QyxPQUFPLENBQUMsRUFBRTtZQUNyRSxJQUFJLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQWdCLEVBQUUsTUFBYyxFQUFFLEVBQUU7Z0JBQ2pELE9BQU8sQ0FBQyxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFBO1lBQ2pDLENBQUMsQ0FBQyxDQUFBO1FBQ04sQ0FBQyxDQUFDLENBQUE7UUFFRixNQUFNLE1BQU0sR0FBYSxVQUFVO1lBQy9CLENBQUMsQ0FBQyxPQUFPLENBQUMsTUFBTTtZQUNoQixDQUFDLENBQUMsSUFBSSxPQUFPLENBQUMsb0JBQW9CLEVBQUUsQ0FBQTtRQUV4QyxNQUFNLENBQUMsS0FBSyxDQUFDLFVBQVUsUUFBUSxPQUFPLENBQUMsQ0FBQTtRQUV2QyxJQUFJLE1BQU0sR0FBRyxJQUFJLE9BQU8sQ0FBTSxPQUFPLENBQUMsRUFBRTtZQUNwQyxJQUFJLENBQUMsR0FBRyxJQUFJLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQTtZQUUzQixJQUFJLFlBQVksRUFBRTtnQkFDZCxJQUFJLENBQUMsTUFBTTtxQkFDTixJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxzQkFBaUIsQ0FBQyxRQUFRLEdBQUcsTUFBTSxDQUFDLENBQUMsQ0FBQztxQkFDbEQsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFBO2FBQ3BCO2lCQUFNO2dCQUNILElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQTthQUN4QztZQUNELElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFBO1FBQzVCLENBQUMsQ0FBQyxDQUFBO1FBRUYsTUFBTSxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsR0FBRyxNQUFNLE1BQU0sQ0FBQTtRQUN6QyxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUE7UUFDMUIsTUFBTSxNQUFNLEdBQUcsTUFBTSxNQUFNLENBQUE7UUFFM0IsSUFBSSxDQUFDLFVBQVUsRUFBRTtZQUNiLE1BQU0sS0FBSyxHQUFJLE1BQXVDLENBQUMsbUJBQW1CLENBQ3RFLE1BQU0sQ0FDVCxDQUFBO1lBQ0QsSUFBSSxLQUFLLEVBQUU7Z0JBQ1AsS0FBSyxNQUFNLElBQUksSUFBSSxLQUFLLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxFQUFFO29CQUNsQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFBO2lCQUNwQjthQUNKO1NBQ0o7UUFFRCxJQUFJLE1BQU0sRUFBRTtZQUNSLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxRQUFRLHVCQUF1QixNQUFNLEVBQUUsQ0FBQyxDQUFBO1NBQzFEO1FBQ0QsT0FBTztZQUNILFFBQVE7WUFDUixhQUFhLEVBQUUsT0FBTyxHQUFHLFNBQVM7WUFDbEMsTUFBTTtTQUNULENBQUE7SUFDTCxDQUFDO0NBQUE7QUFwRUQsMEJBb0VDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVuLXRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcnVuLXRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFBO0FBQ3BDLE1BQU0sR0FBRyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtBQUMxQiwwQ0FBeUM7QUFDekMsaURBQXFDO0FBQ3JDLDJCQUFzQztBQUN0QywrQkFBK0I7QUFXL0IsU0FBc0IsT0FBTyxDQUN6QixRQUFnQixFQUNoQixRQUFrQixFQUNsQixVQUFtQixFQUNuQixZQUFxQixFQUNyQixXQUFvQixFQUNwQixPQUFlOztRQUVmLE1BQU0sUUFBUSxHQUFHLEVBQVMsQ0FBQTtRQUMxQixJQUFJLFdBQVcsRUFBRTtZQUNiLFFBQVEsQ0FBQyxhQUFhLEdBQUcsUUFBUSxHQUFHLE1BQU0sQ0FBQTtZQUMxQyxRQUFRLENBQUMsYUFBYSxHQUFHLGVBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQTtTQUM5QztRQUVELE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQTtRQUU1QixJQUFJLElBQUksR0FBRyxxQkFBSyxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxFQUFFO1lBQ2hELEdBQUcsa0NBQ0ksT0FBTyxDQUFDLEdBQUcsR0FDWCxRQUFRLENBQ2Q7U0FDSixDQUFDLENBQUE7UUFFRixJQUFJLE9BQU8sR0FBRyxLQUFLLENBQUE7UUFDbkIsTUFBTSxNQUFNLEdBQUcsSUFBSSxPQUFPLENBQ3RCLE9BQU8sQ0FBQyxFQUFFO1lBQ04sSUFBSSxLQUFLLEdBQ0wsT0FBTyxHQUFHLENBQUM7Z0JBQ1AsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUU7b0JBQ1osT0FBTyxDQUFDLEdBQUcsQ0FDUCw4QkFBOEIsZUFBUSxDQUNsQyxRQUFRLENBQ1gsbUJB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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "multi-tape",
-    "version": "1.5.0",
+    "version": "1.7.0",
     "description": "Runner for tape-tests",
     "bin": {
         "multi-tape": "build/index.js"