diff --git a/smoke.sh b/smoke.sh index b477e0f..47839c1 100755 --- a/smoke.sh +++ b/smoke.sh @@ -1,6 +1,6 @@ #!/bin/bash node-waf configure && node-waf build && echo '-- Compiled OK -- -' && node test/smoke.js && echo '-- Tests Done, running smoke -- +' && node smoketest.js && echo '-- Smoke Done, running tests -- -' && node smoketest.js +' && node test/smoke.js diff --git a/src/Image.cc b/src/Image.cc index 37cd8db..fbedaed 100644 --- a/src/Image.cc +++ b/src/Image.cc @@ -56,7 +56,7 @@ Image::Image(int width, int height): ObjectWrap() { Image::Image(v8::Value* fileName): ObjectWrap() { filename = std::string(*v8::String::AsciiValue(fileName->ToString())); - //image = cv::imread(filename, -1); + image = cv::imread(filename, -1); }; diff --git a/test/smoke.js b/test/smoke.js index 630ee4f..cc2ee82 100644 --- a/test/smoke.js +++ b/test/smoke.js @@ -51,8 +51,7 @@ vows.describe('Smoke Tests OpenCV').addBatch({ , p2 = new cv.Point(5, 7) assert.ok(p1.dot); - assert.ok(p1.dot(p2)); - + assert.equal(p1.dot(p2), 57); } diff --git a/wscript b/wscript index 26b1eb6..e7b6b64 100644 --- a/wscript +++ b/wscript @@ -7,7 +7,8 @@ def configure(conf): conf.check_tool('node_addon') #conf.check(lib='opencv', libpath=[ # '/lib', '/usr/lib', '/usr/local/lib','/usr/local/include'], uselib_store='OPENCV', mandatory=True) - conf.check_cfg(package='opencv', args='--cflags --libs', uselib_store='OPENCV') + conf.check_cfg(package='opencv', libpath=[ + '/lib', '/usr/lib', '/usr/local/lib','/usr/local/include'], args='--cflags --libs', uselib_store='OPENCV') def build(bld):