Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "build,test: add duplicate symbol test" #1828

Merged
merged 1 commit into from
Jul 16, 2019
Merged

Revert "build,test: add duplicate symbol test" #1828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions addon.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,10 @@

'conditions': [
[ 'OS=="mac"', {
'cflags': [
'-fvisibility=hidden'
],
'defines': [
'_DARWIN_USE_64_BIT_INODE=1'
],
'xcode_settings': {
'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
'DYLIB_INSTALL_NAME_BASE': '@rpath'
},
}],
Expand Down
10 changes: 0 additions & 10 deletions test/node_modules/duplicate_symbols/binding.cc
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions test/node_modules/duplicate_symbols/binding.gyp
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions test/node_modules/duplicate_symbols/common.h
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions test/node_modules/duplicate_symbols/extra.cc
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions test/node_modules/duplicate_symbols/index.js
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions test/node_modules/duplicate_symbols/package.json
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions test/test-addon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,6 @@ function runHello (hostProcess) {
return execFileSync(hostProcess, [ '-e', testCode ], { cwd: __dirname }).toString()
}

function runDuplicateBindings () {
const hostProcess = process.execPath
var testCode =
'console.log((function(bindings) {' +
'return bindings.pointerCheck1(bindings.pointerCheck2());' +
"})(require('duplicate_symbols')))"
return execFileSync(hostProcess, [ '-e', testCode ], { cwd: __dirname }).toString()
}

function getEncoding () {
var code = 'import locale;print(locale.getdefaultlocale()[1])'
return execFileSync('python', [ '-c', code ]).toString().trim()
Expand Down Expand Up @@ -60,21 +51,6 @@ test('build simple addon', function (t) {
proc.stderr.setEncoding('utf-8')
})

test('make sure addon symbols do not overlap', function (t) {
t.plan(3)

var addonPath = path.resolve(__dirname, 'node_modules', 'duplicate_symbols')
// Set the loglevel otherwise the output disappears when run via 'npm test'
var cmd = [nodeGyp, 'rebuild', '-C', addonPath, '--loglevel=verbose']
execFile(process.execPath, cmd, function (err, stdout, stderr) {
var logLines = stderr.trim().split(/\r?\n/)
var lastLine = logLines[logLines.length - 1]
t.strictEqual(err, null)
t.strictEqual(lastLine, 'gyp info ok', 'should end in ok')
t.strictEqual(runDuplicateBindings().trim(), 'not equal')
})
})

test('build simple addon in path with non-ascii characters', function (t) {
t.plan(1)

Expand Down