assert that opencv version matches version passed to build script + fixed default include dir

Author: justadudewhohacks

ci/test/test.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 image=opencv4nodejs-ci:$1-node$2
 docker build -t $image -f ./Dockerfile --build-arg TAG=$1 --build-arg NODE_MAJOR_VERSION=$2 ../../
-docker run -e TEST_MODULE_LIST=$TEST_MODULE_LIST $image
+docker run -e OPENCV_VERSION=$OPENCV_VERSION -e TEST_MODULE_LIST=$TEST_MODULE_LIST $image

install/install.js

@@ -14,7 +14,7 @@ function getDefaultIncludeDirs() {
   if (opencvBuild.isWin()) {
     throw new Error('OPENCV_INCLUDE_DIR has to be defined on windows when auto build is disabled')
   }
-  return [defaultLibDir, defaultIncludeDirOpenCV4]
+  return [defaultIncludeDir, defaultIncludeDirOpenCV4]
 }
 
 function getDefaultLibDir() {
@@ -68,10 +68,10 @@ log.info('install', 'setting the following defines:')
 defines.forEach(def => log.info('defines', def))
 console.log()
 log.info('install', 'setting the following includes:')
-includes.forEach(def => log.info('includes', def))
+includes.forEach(inc => log.info('includes', inc))
 console.log()
 log.info('install', 'setting the following libs:')
-libs.forEach(def => log.info('libs', def))
+libs.forEach(lib => log.info('libs', lib))
 
 process.env['OPENCV4NODEJS_DEFINES'] = defines.join('\n')
 process.env['OPENCV4NODEJS_INCLUDES'] = includes.join('\n')

test/tests/index.test.js

@@ -64,9 +64,21 @@ describe('cv', () => {
     builtModules = builtModules.filter(m => m !== 'dnn')
   }
 
+  const opencvVersionString = `${cv.version.major}.${cv.version.minor}.${cv.version.revision}`
+
+  console.log('envs are:')
+  console.log('OPENCV_VERSION:', process.env.OPENCV_VERSION)
+  console.log('TEST_MODULE_LIST:', process.env.TEST_MODULE_LIST)
+  console.log('APPVEYOR_BUILD:', process.env.APPVEYOR_BUILD)
+  console.log()
+  console.log('OpenCV version is:', opencvVersionString)
   console.log('compiled with the following modules:', cv.modules)
   console.log('expected modules to be built:', builtModules)
 
+  it('OpenCV version should match', () => {
+    expect(process.env.OPENCV_VERSION).to.equal(opencvVersionString)
+  })
+
   it('all modules should be built', () => {
     builtModules.forEach(m => expect(cv.modules).to.have.property(m));
   })