Skip to content
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions doc/api/addons.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@ Once built, the binary Addon can be used from within Node.js by pointing

```js
// hello.js
const addon = require('./build/Release/addon');
const buildType = process.config.target_defaults.default_configuration;
const addon = require(`./build/${buildType}/addon`);

console.log(addon.hello()); // 'world'
```
Expand Down Expand Up @@ -316,7 +317,8 @@ Once compiled, the example Addon can be required and used from within Node.js:

```js
// test.js
const addon = require('./build/Release/addon');
const buildType = process.config.target_defaults.default_configuration;
const addon = require(`./build/${buildType}/addon`);

console.log('This should be eight:', addon.add(3, 5));
```
Expand Down Expand Up @@ -369,7 +371,8 @@ To test it, run the following JavaScript:

```js
// test.js
const addon = require('./build/Release/addon');
const buildType = process.config.target_defaults.default_configuration;
const addon = require(`./build/${buildType}/addon`);

addon((msg) => {
console.log(msg); // 'hello world'
Expand Down Expand Up @@ -419,7 +422,8 @@ To test it in JavaScript:

```js
// test.js
const addon = require('./build/Release/addon');
const buildType = process.config.target_defaults.default_configuration;
const addon = require(`./build/${buildType}/addon`);

var obj1 = addon('hello');
var obj2 = addon('world');
Expand Down Expand Up @@ -477,7 +481,8 @@ To test:

```js
// test.js
const addon = require('./build/Release/addon');
const buildType = process.config.target_defaults.default_configuration;
const addon = require(`./build/${buildType}/addon`);

var fn = addon();
console.log(fn()); // 'hello world'
Expand Down Expand Up @@ -639,7 +644,8 @@ Test it with:

```js
// test.js
const addon = require('./build/Release/addon');
const buildType = process.config.target_defaults.default_configuration;
const addon = require(`./build/${buildType}/addon`);

var obj = new addon.MyObject(10);
console.log(obj.plusOne()); // 11
Expand Down Expand Up @@ -831,7 +837,8 @@ Test it with:

```js
// test.js
const createObject = require('./build/Release/addon');
const buildType = process.config.target_defaults.default_configuration;
const createObject = require(`./build/${buildType}/addon`);

var obj = createObject(10);
console.log(obj.plusOne()); // 11
Expand Down Expand Up @@ -1007,7 +1014,8 @@ Test it with:

```js
// test.js
const addon = require('./build/Release/addon');
const buildType = process.config.target_defaults.default_configuration;
const addon = require(`./build/${buildType}/addon`);

var obj1 = addon.createObject(10);
var obj2 = addon.createObject(20);
Expand Down Expand Up @@ -1091,7 +1099,8 @@ Test in JavaScript by running:

```js
// test.js
const addon = require('./build/Release/addon');
const buildType = process.config.target_defaults.default_configuration;
const addon = require(`./build/${buildType}/addon`);
```

[bindings]: https://github.com/TooTallNate/node-bindings
Expand Down
2 changes: 1 addition & 1 deletion test/addons/async-hello-world/test.js
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
4 changes: 2 additions & 2 deletions test/addons/at-exit/test.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
'use strict';
require('../../common');
require('./build/Release/binding');
const common = require('../../common');
require(`./build/${common.buildType}/binding`);
4 changes: 2 additions & 2 deletions test/addons/buffer-free-callback/test.js
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
4 changes: 2 additions & 2 deletions test/addons/heap-profiler/test.js
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
4 changes: 2 additions & 2 deletions test/addons/hello-world-function-export/test.js
Original file line number Diff line number Diff line change
@@ -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());
4 changes: 2 additions & 2 deletions test/addons/hello-world/test.js
Original file line number Diff line number Diff line change
@@ -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());
5 changes: 4 additions & 1 deletion test/addons/load-long-path/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/addons/make-callback-recurse/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion test/addons/make-callback/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions test/addons/null-buffer-neuter/test.js
Original file line number Diff line number Diff line change
@@ -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();
4 changes: 2 additions & 2 deletions test/addons/openssl-binding/test.js
Original file line number Diff line number Diff line change
@@ -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);
4 changes: 2 additions & 2 deletions test/addons/parse-encoding/test.js
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion test/addons/symlinked-module/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions test/addons/zlib-binding/test.js
Original file line number Diff line number Diff line change
@@ -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!');

Expand Down
1 change: 1 addition & 0 deletions test/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down