[Pkg-javascript-commits] [node-mocha] 11/12: udpate Makefile patch
Leo Iannacone
l3on-guest at moszumanska.debian.org
Wed Oct 15 18:03:15 UTC 2014
This is an automated email from the git hooks/post-receive script.
l3on-guest pushed a commit to branch master
in repository node-mocha.
commit f832800331f09bba1b15afa0d06ed1206d03293a
Author: Leo Iannacone <l3on at ubuntu.com>
Date: Wed Oct 15 20:00:43 2014 +0200
udpate Makefile patch
---
debian/patches/0001_makefile.patch | 37 +++++++++++++++++++++++++++++--------
1 file changed, 29 insertions(+), 8 deletions(-)
diff --git a/debian/patches/0001_makefile.patch b/debian/patches/0001_makefile.patch
index 6b90fa4..6d2e8af 100644
--- a/debian/patches/0001_makefile.patch
+++ b/debian/patches/0001_makefile.patch
@@ -1,24 +1,32 @@
Description: Fix Makefile issues:
+ * Fix: "No rule to make target":
+ - node_modules/diff/diff.js
+ - node_modules/escape-string-regexp/index.js
+ - test/regression/issue1327/case.js
* Do not copy diff.js from local module installation,
use to node-diff module file instead
* Fix node binary call to nodejs
+ * Disable colors (pass option -C)
Author: Leo Iannacone <l3on at ubuntu.com>
Forwarded: not-needed
---
- Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ Makefile | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
--- a/Makefile
+++ b/Makefile
-@@ -7,13 +7,13 @@
+@@ -6,14 +6,14 @@
+
all: mocha.js
- lib/browser/diff.js: node_modules/diff/diff.js
+-lib/browser/diff.js: node_modules/diff/diff.js
- cp node_modules/diff/diff.js lib/browser/diff.js
-+ cp $(shell nodejs -e "console.log(require.resolve('diff'))") lib/browser/diff.js lib/browser/diff.js
++lib/browser/diff.js:
++ cp $(shell nodejs -e "console.log(require.resolve('diff'))") lib/browser/diff.js
- lib/browser/escape-string-regexp.js: node_modules/escape-string-regexp/index.js
+-lib/browser/escape-string-regexp.js: node_modules/escape-string-regexp/index.js
++lib/browser/escape-string-regexp.js:
cp node_modules/escape-string-regexp/index.js lib/browser/escape-string-regexp.js
mocha.js: $(SRC) $(SUPPORT) lib/browser/diff.js lib/browser/escape-string-regexp.js
@@ -27,7 +35,7 @@ Forwarded: not-needed
@cat \
support/head.js \
_mocha.js \
-@@ -39,7 +39,7 @@
+@@ -39,10 +39,10 @@
test-all: test-bdd test-tdd test-qunit test-exports test-unit test-grep test-jsapi test-compilers test-sort test-glob test-requires test-reporters test-only test-failing test-regression
test-jsapi:
@@ -35,4 +43,17 @@ Forwarded: not-needed
+ @nodejs test/jsapi
test-unit:
- @./bin/mocha \
+- @./bin/mocha \
++ @./bin/mocha -C \
+ --reporter $(REPORTER) \
+ test/acceptance/*.js \
+ --growl \
+@@ -53,7 +53,7 @@
+ --reporter $(REPORTER) \
+ test/regression/issue*/control.js
+
+-test-outputs/issue1327/case-out.json: test/regression/issue1327/case.js
++test-outputs/issue1327/case-out.json:
+ @mkdir -p $(dir $@) || true
+ @./bin/mocha --reporter json $< > $@ || true
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-mocha.git
More information about the Pkg-javascript-commits
mailing list