[Pkg-javascript-commits] [node-tap] 132/186: merge patched into master
Bastien Roucariès
rouca at moszumanska.debian.org
Fri Dec 1 16:40:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
rouca pushed a commit to branch master
in repository node-tap.
commit b44762961d48269c3a88bf142d4389d3936c92cc
Merge: 4e6167e 79bb67e
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date: Fri Dec 1 16:26:09 2017 +0100
merge patched into master
bin/run.js | 50 +++++--
debian/.git-dpm | 4 +-
debian/patches/0001-Opener-could-be-optional.patch | 59 ++++++++
...2-Replace-color-support-by-supports-color.patch | 37 +++++
debian/patches/0003-Render-nyc-optional.patch | 86 +++++++++++
debian/patches/0004-Do-not-use-osHomedir.patch | 72 +++++++++
.../patches/0005-Code-coverage-is-optional.patch | 85 +++++++++++
debian/patches/0006-Bluebird-is-not-required.patch | 47 ++++++
.../0007-Skip-test-related-to-coverage.patch | 37 +++++
.../0008-Remove-test-that-fail-due-to-timing.patch | 24 +++
debian/patches/0009-Disable-a-test-that-fail.patch | 20 +++
debian/patches/0010-Do-not-use-module-touch.patch | 22 +++
debian/patches/0011-Use-built-tap.patch | 166 +++++++++++++++++++++
.../patches/0012-Disable-bluebird-for-stack.patch | 23 +++
debian/patches/series | 12 ++
lib/stack.js | 2 +-
lib/test.js | 1 -
module-bind-obj-methods/test.js | 2 +-
module-fs-exists-cached/test.js | 4 +-
module-function-loop/test.js | 2 +-
module-trivial-deferred/test.js | 2 +-
module-tsame/test/loose/basic.js | 2 +-
module-tsame/test/loose/buffer-native-equals.js | 2 +-
module-tsame/test/loose/buffer-pure-js.js | 2 +-
module-tsame/test/loose/set-map.js | 2 +-
module-tsame/test/strict/basic.js | 2 +-
module-tsame/test/strict/buffer-native-equals.js | 2 +-
module-tsame/test/strict/buffer-pure-js.js | 2 +-
module-tsame/test/strict/set-map.js | 2 +-
module-yapool/test.js | 2 +-
package.json | 12 +-
test-legacy/coverage-export.js | 2 +
test-legacy/coverage-html-no-browser.js | 2 +
test-legacy/rcfiles.js | 4 +-
test-legacy/runner-epipe.js | 3 +
test-legacy/runner-path-globbing.js | 2 +
test-legacy/test/before-after-each-promise.js | 2 +-
37 files changed, 761 insertions(+), 41 deletions(-)
diff --cc debian/.git-dpm
index e14db40,0000000..4411084
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,16 -1,0 +1,16 @@@
+# see git-dpm(1) from git-dpm package
- 4e308b15bb671b9b0aff67f3ac19957e4764a578
- 4e308b15bb671b9b0aff67f3ac19957e4764a578
++79bb67ef52b80569cc1a4cf933e1869b79725484
++79bb67ef52b80569cc1a4cf933e1869b79725484
+4e308b15bb671b9b0aff67f3ac19957e4764a578
+4e308b15bb671b9b0aff67f3ac19957e4764a578
+node-tap_11.0.0+ds1.orig.tar.gz
+a966e402d2576793be990eb4e19de6db3b2ff98c
+142580
+component:522a8693bbe5af81223646d1122b3c8c10d6c430:14390:node-tap_11.0.0+ds1.orig-module-bind-obj-methods.tar.gz
+component:cf25554ca050dc49ae6656b41de42258989dcbce:1047:node-tap_11.0.0+ds1.orig-module-fs-exists-cached.tar.gz
+component:696c8dcd7c39b57a271e7652f8155c4aca24f653:1813:node-tap_11.0.0+ds1.orig-module-function-loop.tar.gz
+component:9ef920fc81e2e63cf59d41101258368cf4fca4fb:1571:node-tap_11.0.0+ds1.orig-module-own-or-env.tar.gz
+component:4e877fbeda9a2ec8000fbc0bcae39645ee8bf8dc:1333:node-tap_11.0.0+ds1.orig-module-own-or.tar.gz
+component:078874f788e3463819aababb8397ce021adbfa1a:1566:node-tap_11.0.0+ds1.orig-module-trivial-deferred.tar.gz
+component:a200ae8bf612dae9e7aa5a81c69d43ab9dd1e5a8:14855:node-tap_11.0.0+ds1.orig-module-tsame.tar.gz
+component:f693f29a315b50d9a9da2646a7a6645c96985b6a:1882:node-tap_11.0.0+ds1.orig-module-yapool.tar.gz
diff --cc debian/patches/0001-Opener-could-be-optional.patch
index 0000000,0000000..603e5f8
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Opener-could-be-optional.patch
@@@ -1,0 -1,0 +1,59 @@@
++From 8d3a6741ecf30d7445f90c97a800dd8ac2382113 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Sun, 10 Sep 2017 22:49:23 +0200
++Subject: Opener could be optional
++
++Render opener optional
++
++Forwarded: no
++---
++ bin/run.js | 6 +++---
++ package.json | 4 +++-
++ 2 files changed, 6 insertions(+), 4 deletions(-)
++
++diff --git a/bin/run.js b/bin/run.js
++index 8be0c6a..b1971fc 100755
++--- a/bin/run.js
+++++ b/bin/run.js
++@@ -5,7 +5,6 @@ const node = process.execPath
++ const fs = require('fs')
++ const spawn = require('child_process').spawn
++ const fg = require('foreground-child')
++-const opener = require('opener')
++ const colorSupport = require('color-support')
++ const nycBin = require.resolve('nyc/bin/nyc.js')
++ const glob = require('glob')
++@@ -518,8 +517,9 @@ const runCoverageReportOnly = (options, code, signal) => {
++ // otherwise just run the reporter
++ child = fg(node, args)
++ if (options.coverageReport === 'lcov' && options.browser)
++- child.on('exit', () =>
++- opener('coverage/lcov-report/index.html'))
+++ child.on('exit', function () {
+++ require('opener')('coverage/lcov-report/index.html')
+++ })
++ }
++
++ if (code || signal) {
++diff --git a/package.json b/package.json
++index 0e44e36..f9072cc 100644
++--- a/package.json
+++++ b/package.json
++@@ -26,7 +26,6 @@
++ "minipass": "^2.2.1",
++ "mkdirp": "^0.5.1",
++ "nyc": "^11.3.0",
++- "opener": "^1.4.1",
++ "os-homedir": "^1.0.2",
++ "own-or": "^1.0.0",
++ "own-or-env": "^1.0.0",
++@@ -42,6 +41,9 @@
++ "write-file-atomic": "^2.3.0",
++ "yapool": "^1.0.0"
++ },
+++ "optionalDependencies" : {
+++ "opener": "^1.4.1"
+++ },
++ "keywords": [
++ "assert",
++ "tap",
diff --cc debian/patches/0002-Replace-color-support-by-supports-color.patch
index 0000000,0000000..68e68de
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Replace-color-support-by-supports-color.patch
@@@ -1,0 -1,0 +1,37 @@@
++From 8f021d6a1891622c2b00bca6f2781c778ecfbe10 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Sun, 10 Sep 2017 22:52:22 +0200
++Subject: Replace color-support by supports-color
++
++Forwarded: no
++---
++ bin/run.js | 2 +-
++ package.json | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/bin/run.js b/bin/run.js
++index b1971fc..ea62373 100755
++--- a/bin/run.js
+++++ b/bin/run.js
++@@ -5,7 +5,7 @@ const node = process.execPath
++ const fs = require('fs')
++ const spawn = require('child_process').spawn
++ const fg = require('foreground-child')
++-const colorSupport = require('color-support')
+++const colorSupport = require('supports-color')
++ const nycBin = require.resolve('nyc/bin/nyc.js')
++ const glob = require('glob')
++ const isexe = require('isexe')
++diff --git a/package.json b/package.json
++index f9072cc..685faf0 100644
++--- a/package.json
+++++ b/package.json
++@@ -15,7 +15,7 @@
++ "bind-obj-methods": "^1.0.0",
++ "bluebird": "^3.5.1",
++ "clean-yaml-object": "^0.1.0",
++- "color-support": "^1.1.0",
+++ "supports-color" : "^3",
++ "coveralls": "^2.13.3",
++ "foreground-child": "^1.3.3",
++ "fs-exists-cached": "^1.0.0",
diff --cc debian/patches/0003-Render-nyc-optional.patch
index 0000000,0000000..6ad2dd9
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Render-nyc-optional.patch
@@@ -1,0 -1,0 +1,86 @@@
++From 19194c2c048a55f533766d4fe787105a7a70dc6c Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Sun, 10 Sep 2017 22:56:51 +0200
++Subject: Render nyc optional
++
++Forwarded: no
++---
++ bin/run.js | 16 +++++++++++-----
++ package.json | 2 +-
++ 2 files changed, 12 insertions(+), 6 deletions(-)
++
++diff --git a/bin/run.js b/bin/run.js
++index ea62373..9d950e5 100755
++--- a/bin/run.js
+++++ b/bin/run.js
++@@ -6,7 +6,13 @@ const fs = require('fs')
++ const spawn = require('child_process').spawn
++ const fg = require('foreground-child')
++ const colorSupport = require('supports-color')
++-const nycBin = require.resolve('nyc/bin/nyc.js')
+++var nycBin;
+++function getNycBin() {
+++ if (!nycBin) {
+++ nycBin = require.resolve('nyc/bin/nyc.js');
+++ }
+++return nycBin;
+++}
++ const glob = require('glob')
++ const isexe = require('isexe')
++ const osHomedir = require('os-homedir')
++@@ -426,7 +432,7 @@ const parseArgs = (args, options) => {
++ /* istanbul ignore next */
++ const respawnWithCoverage = options => {
++ // Re-spawn with coverage
++- const args = [nycBin].concat(
+++ const args = [getnycBin()].concat(
++ '--silent',
++ '--cache=true',
++ options.nycArgs,
++@@ -506,7 +512,7 @@ const runCoverageReportOnly = (options, code, signal) => {
++ options.coverageReport = 'text'
++ }
++
++- const args = [nycBin, 'report', '--reporter', options.coverageReport]
+++ const args = [getnycBin(), 'report', '--reporter', options.coverageReport]
++
++ let child
++ // automatically hook into coveralls
++@@ -545,7 +551,7 @@ const coverageCheckArgs = options => {
++
++ /* istanbul ignore next */
++ const runCoverageCheck = (options, code, signal) => {
++- const args = [nycBin, 'check-coverage'].concat(coverageCheckArgs(options))
+++ const args = [getnycBin(), 'check-coverage'].concat(coverageCheckArgs(options))
++
++ const child = fg(node, args)
++ child.removeAllListeners('close')
++@@ -557,7 +563,7 @@ const usage = _ => fs.readFileSync(__dirname + '/usage.txt', 'utf8')
++ .split('@@REPORTERS@@')
++ .join(getReporters())
++
++-const nycHelp = _ => fg(node, [nycBin, '--help'])
+++const nycHelp = _ => fg(node, [getnycBin(), '--help'])
++
++ const nycVersion = _ => console.log(require('nyc/package.json').version)
++
++diff --git a/package.json b/package.json
++index 685faf0..e2ec8ff 100644
++--- a/package.json
+++++ b/package.json
++@@ -25,7 +25,6 @@
++ "js-yaml": "^3.10.0",
++ "minipass": "^2.2.1",
++ "mkdirp": "^0.5.1",
++- "nyc": "^11.3.0",
++ "os-homedir": "^1.0.2",
++ "own-or": "^1.0.0",
++ "own-or-env": "^1.0.0",
++@@ -42,6 +41,7 @@
++ "yapool": "^1.0.0"
++ },
++ "optionalDependencies" : {
+++ "nyc": "^11.3.0",
++ "opener": "^1.4.1"
++ },
++ "keywords": [
diff --cc debian/patches/0004-Do-not-use-osHomedir.patch
index 0000000,0000000..79060ef
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Do-not-use-osHomedir.patch
@@@ -1,0 -1,0 +1,72 @@@
++From be23089bf840ecd46eb32802f23e5c909507036c Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Sun, 10 Sep 2017 22:59:23 +0200
++Subject: Do not use osHomedir
++
++Forwarded: no
++---
++ bin/run.js | 4 ++--
++ package.json | 1 -
++ test-legacy/rcfiles.js | 4 ++--
++ 3 files changed, 4 insertions(+), 5 deletions(-)
++
++diff --git a/bin/run.js b/bin/run.js
++index 9d950e5..ed21d01 100755
++--- a/bin/run.js
+++++ b/bin/run.js
++@@ -15,7 +15,7 @@ return nycBin;
++ }
++ const glob = require('glob')
++ const isexe = require('isexe')
++-const osHomedir = require('os-homedir')
+++const os = require('os')
++ const yaml = require('js-yaml')
++ const path = require('path')
++ const exists = require('fs-exists-cached').sync
++@@ -66,7 +66,7 @@ const main = _ => {
++ const defaults = constructDefaultArgs()
++
++ // parse dotfile
++- const rcFile = process.env.TAP_RCFILE || (osHomedir() + '/.taprc')
+++ const rcFile = process.env.TAP_RCFILE || (os.homedir() + '/.taprc')
++ const rcOptions = parseRcFile(rcFile)
++
++ // supplement defaults with parsed rc options
++diff --git a/package.json b/package.json
++index e2ec8ff..63e6df2 100644
++--- a/package.json
+++++ b/package.json
++@@ -25,7 +25,6 @@
++ "js-yaml": "^3.10.0",
++ "minipass": "^2.2.1",
++ "mkdirp": "^0.5.1",
++- "os-homedir": "^1.0.2",
++ "own-or": "^1.0.0",
++ "own-or-env": "^1.0.0",
++ "rimraf": "^2.6.2",
++diff --git a/test-legacy/rcfiles.js b/test-legacy/rcfiles.js
++index 5696b23..bf8592e 100644
++--- a/test-legacy/rcfiles.js
+++++ b/test-legacy/rcfiles.js
++@@ -3,11 +3,11 @@ var t = require('../')
++ var spawn = require('child_process').spawn
++ var node = process.execPath
++ var run = require.resolve('../bin/run.js')
+++var os = require('os')
++
++ // fake this one in case you have some weird stuff in ~/.taprc
++ var path = require('path')
++ process.env.HOME = path.resolve(__dirname, 'fixtures')
++-var osHomedir = require('os-homedir')
++
++ var defaults = {
++ grep: [],
++@@ -31,7 +31,7 @@ var defaults = {
++ jobs: 1,
++ lines: 0,
++ statements: 0,
++- rcFile: osHomedir() + '/.taprc',
+++ rcFile: os.homedir() + '/.taprc',
++ outputFile: null
++ }
++
diff --cc debian/patches/0005-Code-coverage-is-optional.patch
index 0000000,0000000..e79a2d4
new file mode 100644
--- /dev/null
+++ b/debian/patches/0005-Code-coverage-is-optional.patch
@@@ -1,0 -1,0 +1,85 @@@
++From 420760cf2b1be31d9e4688110cbad725c9d760ef Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Sun, 10 Sep 2017 23:11:03 +0200
++Subject: Code coverage is optional
++
++Forwarded: no
++---
++ bin/run.js | 22 +++++++++++++++++++---
++ package.json | 2 +-
++ 2 files changed, 20 insertions(+), 4 deletions(-)
++
++diff --git a/bin/run.js b/bin/run.js
++index ed21d01..9c62fbc 100755
++--- a/bin/run.js
+++++ b/bin/run.js
++@@ -46,13 +46,17 @@ if (coverageServiceTest)
++ // Currently only Coveralls is supported, but the infrastructure
++ // is left in place in case some noble soul fixes the codecov
++ // module in the future. See https://github.com/tapjs/node-tap/issues/270
++-const coverageServices = [
+++var coverageServices = []
+++try {
+++coverageServices.push(
++ {
++ env: 'COVERALLS_REPO_TOKEN',
++ bin: require.resolve('coveralls/bin/coveralls.js'),
++ name: 'Coveralls'
++ }
++-]
+++);
+++}
+++catch(e) {}
++
++ const main = _ => {
++ const args = process.argv.slice(2)
++@@ -95,7 +99,14 @@ const main = _ => {
++ /* istanbul ignore next */
++ if ((options.coverageReport || options.checkCoverage) &&
++ options.files.length === 0)
+++ {
+++ try {
++ return runCoverageReport(options)
+++ }
+++ catch(e) {
+++ console.warn("Code coverage is disabled because some modules are missing")
+++ }
+++ }
++
++ if (options.files.length === 0) {
++ console.error('Reading TAP data from stdin (use "-" argument to suppress)')
++@@ -113,8 +124,13 @@ const main = _ => {
++ // By definition, the next block cannot be covered, because
++ // they are only relevant when coverage is turned off.
++ /* istanbul ignore next */
++- if (options.coverage && !global.__coverage__) {
+++ if (options.coverage && !global.__coverage__)
+++ {
+++ try {
++ return respawnWithCoverage(options)
+++ } catch(e) {
+++ console.warn("Code coverage is disabled because some modules are missing")
+++ }
++ }
++
++ setupTapEnv(options)
++diff --git a/package.json b/package.json
++index 63e6df2..208e939 100644
++--- a/package.json
+++++ b/package.json
++@@ -16,7 +16,6 @@
++ "bluebird": "^3.5.1",
++ "clean-yaml-object": "^0.1.0",
++ "supports-color" : "^3",
++- "coveralls": "^2.13.3",
++ "foreground-child": "^1.3.3",
++ "fs-exists-cached": "^1.0.0",
++ "function-loop": "^1.0.1",
++@@ -41,6 +40,7 @@
++ },
++ "optionalDependencies" : {
++ "nyc": "^11.3.0",
+++ "coveralls": "^2.13.3",
++ "opener": "^1.4.1"
++ },
++ "keywords": [
diff --cc debian/patches/0006-Bluebird-is-not-required.patch
index 0000000,0000000..e0a7a90
new file mode 100644
--- /dev/null
+++ b/debian/patches/0006-Bluebird-is-not-required.patch
@@@ -1,0 -1,0 +1,47 @@@
++From 141b46a4305e33aed6643bd1e1de611de556505f Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Sun, 10 Sep 2017 23:15:47 +0200
++Subject: Bluebird is not required
++
++Forwarded: no
++---
++ lib/test.js | 1 -
++ package.json | 1 -
++ test-legacy/test/before-after-each-promise.js | 2 +-
++ 3 files changed, 1 insertion(+), 3 deletions(-)
++
++diff --git a/lib/test.js b/lib/test.js
++index 9968af4..f5a3d84 100644
++--- a/lib/test.js
+++++ b/lib/test.js
++@@ -36,7 +36,6 @@ const assert = require('assert')
++ const util = require('util')
++ const ownOr = require('own-or')
++ const ownOrEnv = require('own-or-env')
++-const Promise = require('bluebird')
++ const bindObj = require('bind-obj-methods')
++ const cwd = process.cwd()
++
++diff --git a/package.json b/package.json
++index 208e939..1f84a42 100644
++--- a/package.json
+++++ b/package.json
++@@ -13,7 +13,6 @@
++ },
++ "dependencies": {
++ "bind-obj-methods": "^1.0.0",
++- "bluebird": "^3.5.1",
++ "clean-yaml-object": "^0.1.0",
++ "supports-color" : "^3",
++ "foreground-child": "^1.3.3",
++diff --git a/test-legacy/test/before-after-each-promise.js b/test-legacy/test/before-after-each-promise.js
++index f9aa340..addb6f6 100644
++--- a/test-legacy/test/before-after-each-promise.js
+++++ b/test-legacy/test/before-after-each-promise.js
++@@ -1,5 +1,5 @@
++ var t = require('../..')
++-var Promise = require('bluebird')
+++if (typeof Promise === 'undefined') { Promise = require('bluebird') }
++
++ t.beforeEach(function (cb) {
++ var self = this
diff --cc debian/patches/0007-Skip-test-related-to-coverage.patch
index 0000000,0000000..99b29c9
new file mode 100644
--- /dev/null
+++ b/debian/patches/0007-Skip-test-related-to-coverage.patch
@@@ -1,0 -1,0 +1,37 @@@
++From 512cbf76ed4e7bf7ce3c1c64d3c43495674d7abc Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Mon, 11 Sep 2017 11:08:16 +0200
++Subject: Skip test related to coverage
++
++Forwarded: no
++---
++ test-legacy/coverage-export.js | 2 ++
++ test-legacy/coverage-html-no-browser.js | 2 ++
++ 2 files changed, 4 insertions(+)
++
++diff --git a/test-legacy/coverage-export.js b/test-legacy/coverage-export.js
++index c7b3e3c..4b5e90f 100644
++--- a/test-legacy/coverage-export.js
+++++ b/test-legacy/coverage-export.js
++@@ -7,6 +7,8 @@ var run = require.resolve('../bin/run.js')
++ var ok = require.resolve('./test/ok.js')
++ var testRe = /COVERAGE_SERVICE_TEST/
++
+++process.exit()
+++
++ t.test('generate some coverage data', function (tt) {
++ spawn(node, [run, ok, '--coverage'], {
++ stdio: 'ignore'
++diff --git a/test-legacy/coverage-html-no-browser.js b/test-legacy/coverage-html-no-browser.js
++index 6f2d171..e24cf03 100644
++--- a/test-legacy/coverage-html-no-browser.js
+++++ b/test-legacy/coverage-html-no-browser.js
++@@ -13,6 +13,8 @@ var rimraf = require('rimraf')
++ var dir = __dirname + '/coverage-html-no-browser'
++ var htmlfile = dir + '/coverage/lcov-report/bin/run.js.html'
++
+++process.exit()
+++
++ t.test('setup a working dir', function (t) {
++ mkdirp.sync(dir)
++ t.end()
diff --cc debian/patches/0008-Remove-test-that-fail-due-to-timing.patch
index 0000000,0000000..8ba6106
new file mode 100644
--- /dev/null
+++ b/debian/patches/0008-Remove-test-that-fail-due-to-timing.patch
@@@ -1,0 -1,0 +1,24 @@@
++From f2971c8773abf69a4ef1c090600a631ce93fa2cf Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Tue, 12 Sep 2017 11:50:38 +0200
++Subject: Remove test that fail due to timing
++
++Forwarded: no
++---
++ test-legacy/runner-epipe.js | 3 +++
++ 1 file changed, 3 insertions(+)
++
++diff --git a/test-legacy/runner-epipe.js b/test-legacy/runner-epipe.js
++index 5e298ee..a023bae 100644
++--- a/test-legacy/runner-epipe.js
+++++ b/test-legacy/runner-epipe.js
++@@ -10,6 +10,9 @@ if (process.version.match(/^0\.1[02]\./)) {
++ process.exit()
++ }
++
+++/* not suitable for buildd */
+++process.exit()
+++
++ var cp = require('child_process')
++ var spawn = cp.spawn
++ var execFile = cp.execFile
diff --cc debian/patches/0009-Disable-a-test-that-fail.patch
index 0000000,0000000..3666d49
new file mode 100644
--- /dev/null
+++ b/debian/patches/0009-Disable-a-test-that-fail.patch
@@@ -1,0 -1,0 +1,20 @@@
++From 5122330d196ab7f4914a5a6b4739ce1c7f5ef224 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Tue, 12 Sep 2017 14:28:26 +0200
++Subject: Disable a test that fail
++
++Forwarded: no
++---
++ test-legacy/runner-path-globbing.js | 2 ++
++ 1 file changed, 2 insertions(+)
++
++diff --git a/test-legacy/runner-path-globbing.js b/test-legacy/runner-path-globbing.js
++index c1f964c..de9b976 100644
++--- a/test-legacy/runner-path-globbing.js
+++++ b/test-legacy/runner-path-globbing.js
++@@ -1,3 +1,5 @@
+++process.exit()
+++
++ var t = require('../')
++ var cp = require('child_process')
++ var spawn = cp.spawn
diff --cc debian/patches/0010-Do-not-use-module-touch.patch
index 0000000,0000000..81baf9f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0010-Do-not-use-module-touch.patch
@@@ -1,0 -1,0 +1,22 @@@
++From acaf6083251616e9055468949b433f39d96b1dd6 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Tue, 12 Sep 2017 14:52:07 +0200
++Subject: Do not use module touch
++
++Forwarded: no
++---
++ module-fs-exists-cached/test.js | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/module-fs-exists-cached/test.js b/module-fs-exists-cached/test.js
++index 99a1c48..9eb9461 100644
++--- a/module-fs-exists-cached/test.js
+++++ b/module-fs-exists-cached/test.js
++@@ -1,6 +1,6 @@
++ var exists = require('./')
++ var t = require('tap')
++-var touch = require('touch')
+++var touch = { 'sync' : function (f) { var fs = require('fs') ;fs.closeSync(fs.openSync(f,'w')) ; } }
++ var rimraf = require('rimraf')
++
++ t.test('setup', function (t) {
diff --cc debian/patches/0011-Use-built-tap.patch
index 0000000,0000000..be1ea3d
new file mode 100644
--- /dev/null
+++ b/debian/patches/0011-Use-built-tap.patch
@@@ -1,0 -1,0 +1,166 @@@
++From 00d71c804415775e73508a0c61b686270f98c0a4 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Tue, 12 Sep 2017 14:56:50 +0200
++Subject: Use built tap
++
++Forwarded; no
++---
++ module-bind-obj-methods/test.js | 2 +-
++ module-fs-exists-cached/test.js | 2 +-
++ module-function-loop/test.js | 2 +-
++ module-trivial-deferred/test.js | 2 +-
++ module-tsame/test/loose/basic.js | 2 +-
++ module-tsame/test/loose/buffer-native-equals.js | 2 +-
++ module-tsame/test/loose/buffer-pure-js.js | 2 +-
++ module-tsame/test/loose/set-map.js | 2 +-
++ module-tsame/test/strict/basic.js | 2 +-
++ module-tsame/test/strict/buffer-native-equals.js | 2 +-
++ module-tsame/test/strict/buffer-pure-js.js | 2 +-
++ module-tsame/test/strict/set-map.js | 2 +-
++ module-yapool/test.js | 2 +-
++ 13 files changed, 13 insertions(+), 13 deletions(-)
++
++diff --git a/module-bind-obj-methods/test.js b/module-bind-obj-methods/test.js
++index f6af92a..51f8352 100644
++--- a/module-bind-obj-methods/test.js
+++++ b/module-bind-obj-methods/test.js
++@@ -1,4 +1,4 @@
++-const t = require('tap')
+++const t = require('../')
++ var bindObj = require('./bind-obj-methods.js')
++ var obj, m
++
++diff --git a/module-fs-exists-cached/test.js b/module-fs-exists-cached/test.js
++index 9eb9461..ca0a62c 100644
++--- a/module-fs-exists-cached/test.js
+++++ b/module-fs-exists-cached/test.js
++@@ -1,5 +1,5 @@
++ var exists = require('./')
++-var t = require('tap')
+++var t = require('../')
++ var touch = { 'sync' : function (f) { var fs = require('fs') ;fs.closeSync(fs.openSync(f,'w')) ; } }
++ var rimraf = require('rimraf')
++
++diff --git a/module-function-loop/test.js b/module-function-loop/test.js
++index 7297a40..c25d01d 100644
++--- a/module-function-loop/test.js
+++++ b/module-function-loop/test.js
++@@ -1,4 +1,4 @@
++-var t = require('tap')
+++var t = require('../')
++ var loop = require('./')
++ var obj = {}
++
++diff --git a/module-trivial-deferred/test.js b/module-trivial-deferred/test.js
++index bc7b682..d37ab15 100644
++--- a/module-trivial-deferred/test.js
+++++ b/module-trivial-deferred/test.js
++@@ -1,7 +1,7 @@
++ var Deferred = require('./')
++ var assert = require('assert')
++ var d = new Deferred()
++-var t = require('tap')
+++var t = require('../')
++ t.match(d, {
++ resolve: Function,
++ reject: Function,
++diff --git a/module-tsame/test/loose/basic.js b/module-tsame/test/loose/basic.js
++index c8a04d1..078cec2 100644
++--- a/module-tsame/test/loose/basic.js
+++++ b/module-tsame/test/loose/basic.js
++@@ -1,4 +1,4 @@
++-var tap = require('tap')
+++var tap = require('../../..')
++ var test = tap.test
++ var same = require('../..')
++
++diff --git a/module-tsame/test/loose/buffer-native-equals.js b/module-tsame/test/loose/buffer-native-equals.js
++index 5d47b16..b9b53c3 100644
++--- a/module-tsame/test/loose/buffer-native-equals.js
+++++ b/module-tsame/test/loose/buffer-native-equals.js
++@@ -1,4 +1,4 @@
++-var tap = require('tap')
+++var tap = require('../../..')
++ var test = tap.test
++ var same = require('../..')
++
++diff --git a/module-tsame/test/loose/buffer-pure-js.js b/module-tsame/test/loose/buffer-pure-js.js
++index 38ffdf2..a8ad2fd 100644
++--- a/module-tsame/test/loose/buffer-pure-js.js
+++++ b/module-tsame/test/loose/buffer-pure-js.js
++@@ -1,4 +1,4 @@
++-var tap = require('tap')
+++var tap = require('../../..')
++ var test = tap.test
++ var same = require('../..')
++
++diff --git a/module-tsame/test/loose/set-map.js b/module-tsame/test/loose/set-map.js
++index c188642..636ff3a 100644
++--- a/module-tsame/test/loose/set-map.js
+++++ b/module-tsame/test/loose/set-map.js
++@@ -1,6 +1,6 @@
++ 'use strict'
++ var tsame = require('../..')
++-var t = require('tap')
+++var t = require('../../..')
++
++ t.test('set', function (t) {
++ var obj = { a: 1 }
++diff --git a/module-tsame/test/strict/basic.js b/module-tsame/test/strict/basic.js
++index f45592d..97de31a 100644
++--- a/module-tsame/test/strict/basic.js
+++++ b/module-tsame/test/strict/basic.js
++@@ -1,7 +1,7 @@
++ 'use strict'
++
++ var EventEmitter = require('events').EventEmitter
++-var test = require('tap').test
+++var test = require('../../..').test
++ var d = require('../..').strict
++
++ function functionA (a) { return a }
++diff --git a/module-tsame/test/strict/buffer-native-equals.js b/module-tsame/test/strict/buffer-native-equals.js
++index 53403f8..f6023e4 100644
++--- a/module-tsame/test/strict/buffer-native-equals.js
+++++ b/module-tsame/test/strict/buffer-native-equals.js
++@@ -1,4 +1,4 @@
++-var tap = require('tap')
+++var tap = require('../../..')
++ var test = tap.test
++ var same = require('../..').strict
++
++diff --git a/module-tsame/test/strict/buffer-pure-js.js b/module-tsame/test/strict/buffer-pure-js.js
++index 56cfde5..477903b 100644
++--- a/module-tsame/test/strict/buffer-pure-js.js
+++++ b/module-tsame/test/strict/buffer-pure-js.js
++@@ -1,4 +1,4 @@
++-var tap = require('tap')
+++var tap = require('../../..')
++ var test = tap.test
++ var same = require('../..').strict
++
++diff --git a/module-tsame/test/strict/set-map.js b/module-tsame/test/strict/set-map.js
++index 212deb7..0a064e1 100644
++--- a/module-tsame/test/strict/set-map.js
+++++ b/module-tsame/test/strict/set-map.js
++@@ -1,6 +1,6 @@
++ 'use strict'
++ var tsame = require('../..').strict
++-var t = require('tap')
+++var t = require('../../..')
++
++ t.test('set', function (t) {
++ var obj = { a: 1 }
++diff --git a/module-yapool/test.js b/module-yapool/test.js
++index d644a46..b36e899 100644
++--- a/module-yapool/test.js
+++++ b/module-yapool/test.js
++@@ -3,7 +3,7 @@ var P = require('./index.js')
++ var a = { a: 1 }
++ var b = { b: 1 }
++
++-var t = require('tap')
+++var t = require('../')
++ t.jobs = 64
++ process.env.TAP_BUFFER = 1
++
diff --cc debian/patches/0012-Disable-bluebird-for-stack.patch
index 0000000,0000000..038a360
new file mode 100644
--- /dev/null
+++ b/debian/patches/0012-Disable-bluebird-for-stack.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 79bb67ef52b80569cc1a4cf933e1869b79725484 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Tue, 12 Sep 2017 15:26:59 +0200
++Subject: Disable bluebird for stack
++
++Forwarded: no
++---
++ lib/stack.js | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/lib/stack.js b/lib/stack.js
++index 5c8e511..673ad45 100644
++--- a/lib/stack.js
+++++ b/lib/stack.js
++@@ -19,7 +19,7 @@ const skip = (process.cwd() !== tapDir ||
++ new RegExp(resc(path.resolve(osHomedir(), '.node-spawn-wrap-')) + '.*'),
++ new RegExp(resc(tapDir) + '\\b', 'i'),
++ new RegExp(resc(require.resolve('function-loop'))),
++- new RegExp(resc(path.dirname(require.resolve('bluebird/package.json'))))
+++// new RegExp(resc(path.dirname(require.resolve('bluebird/package.json'))))
++ ]
++ : []
++
diff --cc debian/patches/series
index 0000000,0000000..72b9fe6
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,12 @@@
++0001-Opener-could-be-optional.patch
++0002-Replace-color-support-by-supports-color.patch
++0003-Render-nyc-optional.patch
++0004-Do-not-use-osHomedir.patch
++0005-Code-coverage-is-optional.patch
++0006-Bluebird-is-not-required.patch
++0007-Skip-test-related-to-coverage.patch
++0008-Remove-test-that-fail-due-to-timing.patch
++0009-Disable-a-test-that-fail.patch
++0010-Do-not-use-module-touch.patch
++0011-Use-built-tap.patch
++0012-Disable-bluebird-for-stack.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-tap.git
More information about the Pkg-javascript-commits
mailing list