test: enable addons test to pass with debug build

Currently when running configure with the --debug option in combination with the tests (./configure --debug && make -j8 test) there are a few addon tests that fail with error messages similar to this: === release test === Path: addons/load-long-path/test fs.js:558 return binding.open(pathModule._makeLong(path), stringToFlags(flags), mode); ^ Error: ENOENT: no such file or directory, open '/nodejs/node/test/addons/load-long-path/build/Release/binding.node' at Object.fs.openSync (fs.js:558:18) at Object.fs.readFileSync (fs.js:468:33) at Object.<anonymous> (/nodejs/node/test/addons/load-long-path/test.js:28:19) at Module._compile (module.js:560:32) at Object.Module._extensions..js (module.js:569:10) at Module.load (module.js:477:32) at tryModuleLoad (module.js:436:12) at Function.Module._load (module.js:428:3) at Module.runMain (module.js:594:10) at run (bootstrap_node.js:382:7) Command: out/Release/node /nodejs/node/test/addons/load-long-path/test.js This commit allows for the tests to pass even if the configured build type is of type debug. PR-URL: #8836 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Ilkka Myller <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
nodejs · Oct 6, 2016 · 74fa505 · 74fa505
1 parent aa5664f
commit 74fa505
Show file tree

Hide file tree

Showing 24 changed files with 37 additions and 33 deletions.
diff --git a/test/addons/async-hello-world/test.js b/test/addons/async-hello-world/test.js
@@ -1,7 +1,7 @@
 'use strict';
 const common = require('../../common');
 var assert = require('assert');
-var binding = require('./build/Release/binding');
+const binding = require(`./build/${common.buildType}/binding`);
 
 binding(5, common.mustCall(function(err, val) {
   assert.equal(null, err);

diff --git a/test/addons/at-exit/test.js b/test/addons/at-exit/test.js
@@ -1,3 +1,3 @@
 'use strict';
-require('../../common');
-require('./build/Release/binding');
+const common = require('../../common');
+require(`./build/${common.buildType}/binding`);
diff --git a/test/addons/buffer-free-callback/test.js b/test/addons/buffer-free-callback/test.js
@@ -1,8 +1,8 @@
 'use strict';
 // Flags: --expose-gc
 
-require('../../common');
-var binding = require('./build/Release/binding');
+const common = require('../../common');
+const binding = require(`./build/${common.buildType}/binding`);
 
 function check(size, alignment, offset) {
   var buf = binding.alloc(size, alignment, offset);

diff --git a/test/addons/heap-profiler/test.js b/test/addons/heap-profiler/test.js
@@ -1,8 +1,8 @@
 'use strict';
 
-require('../../common');
+const common = require('../../common');
 
-const binding = require('./build/Release/binding');
+const binding = require(`./build/${common.buildType}/binding`);
 
 // Create an AsyncWrap object.
 const timer = setTimeout(function() {}, 1);

diff --git a/test/addons/hello-world-function-export/test.js b/test/addons/hello-world-function-export/test.js
@@ -1,6 +1,6 @@
 'use strict';
-require('../../common');
+const common = require('../../common');
 var assert = require('assert');
-var binding = require('./build/Release/binding');
+const binding = require(`./build/${common.buildType}/binding`);
 assert.equal('world', binding());
 console.log('binding.hello() =', binding());
diff --git a/test/addons/hello-world/test.js b/test/addons/hello-world/test.js
@@ -1,6 +1,6 @@
 'use strict';
-require('../../common');
+const common = require('../../common');
 var assert = require('assert');
-var binding = require('./build/Release/binding');
+const binding = require(`./build/${common.buildType}/binding`);
 assert.equal('world', binding.hello());
 console.log('binding.hello() =', binding.hello());
diff --git a/test/addons/load-long-path/test.js b/test/addons/load-long-path/test.js
@@ -21,7 +21,10 @@ for (var i = 0; i < 10; i++) {
   fs.mkdirSync(addonDestinationDir);
 }
 
-const addonPath = path.join(__dirname, 'build', 'Release', 'binding.node');
+const addonPath = path.join(__dirname,
+                            'build',
+                            common.buildType,
+                            'binding.node');
 const addonDestinationPath = path.join(addonDestinationDir, 'binding.node');
 
 // Copy binary to long path destination

diff --git a/test/addons/make-callback-recurse/test.js b/test/addons/make-callback-recurse/test.js
@@ -3,7 +3,7 @@
 const common = require('../../common');
 const assert = require('assert');
 const domain = require('domain');
-const binding = require('./build/Release/binding');
+const binding = require(`./build/${common.buildType}/binding`);
 const makeCallback = binding.makeCallback;
 
 // Make sure this is run in the future.

diff --git a/test/addons/make-callback/test.js b/test/addons/make-callback/test.js
@@ -3,7 +3,7 @@
 const common = require('../../common');
 const assert = require('assert');
 const vm = require('vm');
-const binding = require('./build/Release/binding');
+const binding = require(`./build/${common.buildType}/binding`);
 const makeCallback = binding.makeCallback;
 
 assert.strictEqual(42, makeCallback(process, common.mustCall(function() {

diff --git a/test/addons/null-buffer-neuter/test.js b/test/addons/null-buffer-neuter/test.js
@@ -1,7 +1,7 @@
 'use strict';
 // Flags: --expose-gc
 
-require('../../common');
-var binding = require('./build/Release/binding');
+const common = require('../../common');
+const binding = require(`./build/${common.buildType}/binding`);
 
 binding.run();
diff --git a/test/addons/openssl-binding/test.js b/test/addons/openssl-binding/test.js
@@ -1,8 +1,8 @@
 'use strict';
 
-require('../../common');
+const common = require('../../common');
 const assert = require('assert');
-const binding = require('./build/Release/binding');
+const binding = require(`./build/${common.buildType}/binding`);
 const bytes = new Uint8Array(1024);
 assert(binding.randomBytes(bytes));
 assert(bytes.reduce((v, a) => v + a) > 0);
diff --git a/test/addons/parse-encoding/test.js b/test/addons/parse-encoding/test.js
@@ -1,8 +1,8 @@
 'use strict';
 
-require('../../common');
+const common = require('../../common');
 const assert = require('assert');
-const { parseEncoding } = require('./build/Release/binding');
+const { parseEncoding } = require(`./build/${common.buildType}/binding`);
 
 assert.strictEqual(parseEncoding(''), 'UNKNOWN');
 

diff --git a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-at-max.js b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-at-max.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-const binding = require('./build/Release/binding');
+const binding = require(`./build/${common.buildType}/binding`);
 const assert = require('assert');
 
 // v8 fails silently if string length > v8::String::kMaxLength

diff --git a/...addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-ascii.js b/...addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-ascii.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-const binding = require('./build/Release/binding');
+const binding = require(`./build/${common.buildType}/binding`);
 const assert = require('assert');
 
 const skipMessage = 'intensive toString tests due to memory confinements';

diff --git a/...ddons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-base64.js b/...ddons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-base64.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-const binding = require('./build/Release/binding');
+const binding = require(`./build/${common.buildType}/binding`);
 const assert = require('assert');
 
 const skipMessage = 'intensive toString tests due to memory confinements';

diff --git a/...ddons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-binary.js b/...ddons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-binary.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-const binding = require('./build/Release/binding');
+const binding = require(`./build/${common.buildType}/binding`);
 const assert = require('assert');
 
 const skipMessage = 'intensive toString tests due to memory confinements';

diff --git a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-hex.js b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-hex.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-const binding = require('./build/Release/binding');
+const binding = require(`./build/${common.buildType}/binding`);
 const assert = require('assert');
 
 const skipMessage = 'intensive toString tests due to memory confinements';

diff --git a/.../addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-utf8.js b/.../addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-utf8.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-const binding = require('./build/Release/binding');
+const binding = require(`./build/${common.buildType}/binding`);
 const assert = require('assert');
 
 const skipMessage = 'intensive toString tests due to memory confinements';

diff --git a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-2.js b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-2.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-const binding = require('./build/Release/binding');
+const binding = require(`./build/${common.buildType}/binding`);
 const assert = require('assert');
 
 const skipMessage = 'intensive toString tests due to memory confinements';

diff --git a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max.js b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-const binding = require('./build/Release/binding');
+const binding = require(`./build/${common.buildType}/binding`);
 const assert = require('assert');
 
 const skipMessage = 'intensive toString tests due to memory confinements';

diff --git a/test/addons/symlinked-module/test.js b/test/addons/symlinked-module/test.js
@@ -14,7 +14,7 @@ const assert = require('assert');
 
 common.refreshTmpDir();
 
-const addonPath = path.join(__dirname, 'build', 'Release');
+const addonPath = path.join(__dirname, 'build', common.buildType);
 const addonLink = path.join(common.tmpDir, 'addon');
 
 try {

diff --git a/test/addons/zlib-binding/test.js b/test/addons/zlib-binding/test.js
@@ -1,9 +1,9 @@
 'use strict';
 
-require('../../common');
+const common = require('../../common');
 const assert = require('assert');
 const zlib = require('zlib');
-const binding = require('./build/Release/binding');
+const binding = require(`./build/${common.buildType}/binding`);
 
 const input = Buffer.from('Hello, World!');
 

diff --git a/test/common.js b/test/common.js
@@ -36,6 +36,7 @@ const cpus = os.cpus();
 exports.enoughTestCpu = cpus.length > 1 || cpus[0].speed > 999;
 
 exports.rootDir = exports.isWindows ? 'c:\\' : '/';
+exports.buildType = process.config.target_defaults.default_configuration;
 
 function rimrafSync(p) {
   try {

diff --git a/tools/doc/addon-verify.js b/tools/doc/addon-verify.js
@@ -65,8 +65,8 @@ function verifyFiles(files, blockName, onprogress, ondone) {
   files = Object.keys(files).map(function(name) {
     if (name === 'test.js') {
       files[name] = `'use strict';
-require('../../common');
-${files[name]}
+const common = require('../../common');
+${files[name].replace('Release', "' + common.buildType + '")}
 `;
     }
     return {