archive-gh-me/node-opencv
1
0
Fork 0
mirror of https://github.com/peterbraden/node-opencv.git synced 2025-12-08 19:45:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #453 from jwagner/master

Browse Source 
Change the name of the DEBUG environment variable to NODE_OPENCV_DEBUG
This commit is contained in:
Dan Schultzer 2016-10-19 16:13:46 -07:00 committed by GitHub
commit d33b59b3c0
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -55,7 +55,7 @@ install:
- npm install - npm install
# build from source, run test and generate code coverage # build from source, run test and generate code coverage
- make cover - make cover
- DEBUG=true node lib/opencv.js - NODE_OPENCV_DEBUG=true node lib/opencv.js
- docker build -t peterbraden/node-opencv-ubuntu-12-04 -f test/Dockerfile-ubuntu-12-04 . - docker build -t peterbraden/node-opencv-ubuntu-12-04 -f test/Dockerfile-ubuntu-12-04 .
- docker build -t peterbraden/node-opencv-ubuntu-14-04 -f test/Dockerfile-ubuntu-14-04 . - docker build -t peterbraden/node-opencv-ubuntu-14-04 -f test/Dockerfile-ubuntu-14-04 .

2
Makefile
View File

@ -84,7 +84,7 @@ coverage/addon.info: coverage/lcov.info
lcov --capture --base-directory build/ --directory . --output-file coverage/addon.info lcov --capture --base-directory build/ --directory . --output-file coverage/addon.info
# This generates the JS lcov info as well as gcov `*.gcda` files: # This generates the JS lcov info as well as gcov `*.gcda` files:
coverage/lcov.info: $(test_deps) $(ISTANBUL) coverage/lcov.info: $(test_deps) $(ISTANBUL)
DEBUG=true $(NODE) --nouse_idle_notification --expose-gc \ NODE_OPENCV_DEBUG=true $(NODE) --nouse_idle_notification --expose-gc \
$(ISTANBUL) cover --report lcovonly -- test/unit.js $(ISTANBUL) cover --report lcovonly -- test/unit.js
$(NODE_PRE_GYP): $(NODE_PRE_GYP):

2
lib/bindings.js
View File

@ -1,6 +1,6 @@
var binary = require('node-pre-gyp'); var binary = require('node-pre-gyp');
var path = require('path'); var path = require('path');
var binding_path = binary.find(path.resolve(path.join(__dirname,'../package.json')), { debug: !!process.env.DEBUG }); var binding_path = binary.find(path.resolve(path.join(__dirname,'../package.json')), { debug: !!process.env.NODE_OPENCV_DEBUG });
var binding = require(binding_path); var binding = require(binding_path);
//module.exports = require('../build/Release/opencv.node'); //module.exports = require('../build/Release/opencv.node');

2
test/unit.js
View File

@ -335,7 +335,7 @@ test('LDA Wrap', function(assert) {
test('Native Matrix', function(assert) { test('Native Matrix', function(assert) {
var nativemat = require('../build/' + (!!process.env.DEBUG ? 'Debug' : 'Release') + '/test_nativemat.node'); var nativemat = require('../build/' + (!!process.env.NODE_OPENCV_DEBUG ? 'Debug' : 'Release') + '/test_nativemat.node');
var mat = new cv.Matrix(42, 8); var mat = new cv.Matrix(42, 8);
assert.deepEqual(mat.size(), nativemat.size(mat), 'nativemat'); assert.deepEqual(mat.size(), nativemat.size(mat), 'nativemat');