Skip to content

Commit

Permalink
Merge branch 'v11'
Browse files Browse the repository at this point in the history
  • Loading branch information
isaacs committed Nov 25, 2017
2 parents 104728e + e4ed45b commit 5cde128
Show file tree
Hide file tree
Showing 575 changed files with 10,068 additions and 3,602 deletions.
5 changes: 0 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,5 @@ sudo: false
node_js:
- 8
- 6
- 4
notifications:
email: false
cache:
directories:
- $HOME/.npm
- node_modules
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
environment:
matrix:
- nodejs_version: '8'
- nodejs_version: '6'
- nodejs_version: '4'
install:
Expand Down
11 changes: 6 additions & 5 deletions bin/mochatap.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
#!/usr/bin/env node
var tap = require('../lib/tap.js')
var args = process.argv.slice(2)
'use strict'
const tap = require('../lib/tap.js')
const args = process.argv.slice(2)

if (args.length === 1) {
var path = require('path')
var file = path.resolve(args[0])
const path = require('path')
const file = path.resolve(args[0])
tap.mochaGlobals()
require(file)
} else {
for (var i = 0; i < args.length; i++) {
for (let i = 0; i < args.length; i++) {
tap.spawn(process.execPath, [__filename, args[i]])
}
}
Loading

0 comments on commit 5cde128

Please sign in to comment.