[Pkg-javascript-commits] [node-bluebird] 03/16: Tidy debian/rules after all the testing/debugging

[Ross Gammon]

This is an automated email from the git hooks/post-receive script.

ross-guest pushed a commit to branch master
in repository node-bluebird.

commit ad991cd03c87fc3dabfbc3dca7d1d2190f06104f
Author: Ross Gammon <rosco2 at ubuntu.com>
Date:   Sun Oct 15 09:40:15 2017 +0200

    Tidy debian/rules after all the testing/debugging
---
 debian/rules | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/debian/rules b/debian/rules
index 5f4338f..949b1d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,20 +16,18 @@ override_dh_auto_build:
 	# Debian.
 	cp -r $(CURDIR)/debian/node-modules/ $(CURDIR)/node_modules/
 	nodejs tools/build.js --release --no-minify
-	rm -r $(CURDIR)/debian/node-modules/ $(CURDIR)/node_modules/
-	ls -R
+	rm -r $(CURDIR)/node_modules/
 
 override_dh_auto_test:
-	# Use build release of bluebird for tests
+	# Use the Debian built release of bluebird for tests
 	mkdir -p $(CURDIR)/node_modules/bluebird/js/release
 	cp $(CURDIR)/js/release/* $(CURDIR)/node_modules/bluebird/js/release/
 	cp $(CURDIR)/package.json $(CURDIR)/node_modules/bluebird/
-	ls -R
-	# Some tests are failing/flaky. Therefore the following cannot be run
-	# for now:
+	# Some tests are failing/flaky. Therefore the following command
+	# cannot be run for now:
 	#nodejs tools/test --no-js-hint
 	# Here are the failing tests (should try globbing them out to avoid
-	# testing each separately):
+	# testing each of the others separately):
 	#nodejs tools/test --run=tapCatch.js
 	#nodejs tools/test --run=generator.js
 	#nodejs tools/test --run=getNewLibraryCopy.js
@@ -107,8 +105,9 @@ override_dh_auto_test:
 	nodejs tools/test --run=spread.js --no-js-hint
 	nodejs tools/test --run=error.js --no-js-hint
 	nodejs tools/test --run=synchronous_inspection.js --no-js-hint
-
-override_dh_install:
-	ls -R
-	dh_install
-	ls -R
+	# tools/test.js builds a debug version of bluebird (ovewriting the
+	# release version in dh_auto_build. A quick fix is to build the
+	# release version of bluebird again for dh_install to use.
+	cp -r $(CURDIR)/debian/node-modules/ $(CURDIR)/node_modules/
+	nodejs tools/build.js --release --no-minify
+	rm -r $(CURDIR)/node_modules/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-bluebird.git