Skip to content

Commit 2f9a3cb

Browse files
committed
build: use npm scripts instead of make
1 parent c30243f commit 2f9a3cb

File tree

3 files changed

+8
-41
lines changed

3 files changed

+8
-41
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ before_install:
88
- "test $TRAVIS_NODE_VERSION != '0.8' || npm rm --save-dev istanbul"
99
script:
1010
# Run test script, depending on istanbul install
11-
- "test ! -z $(npm -ps ls istanbul) || make test"
12-
- "test -z $(npm -ps ls istanbul) || make test-ci"
11+
- "test ! -z $(npm -ps ls istanbul) || npm test"
12+
- "test -z $(npm -ps ls istanbul) || npm run-script test-ci"
1313
after_script:
1414
- "test -e ./coverage/lcov.info && npm install coveralls@2 && cat ./coverage/lcov.info | coveralls"

Makefile

Lines changed: 0 additions & 35 deletions
This file was deleted.

package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
"description": "SQL escape and format from mysql/lib/protocol/SqlString.js",
55
"repository": "mysqljs/sqlstring",
66
"main": "index.js",
7-
"scripts": {
8-
"test": "make test-all"
9-
},
107
"dependencies": {
118

129
},
@@ -25,5 +22,10 @@
2522
"node": ">= 0.8.0"
2623
},
2724
"author": "fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)",
28-
"license": "MIT"
25+
"license": "MIT",
26+
"scripts": {
27+
"test": "mocha --reporter spec --bail --check-leaks test/",
28+
"test-ci": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/",
29+
"test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/"
30+
}
2931
}

0 commit comments

Comments
 (0)