Skip to content

Commit

Permalink
test: skip some binding tests on IBMi PASE
Browse files Browse the repository at this point in the history
IBMi PASE Node.js always links to shared openssl
and zlib libraries. So skip the static binding tests.

PR-URL: #31967
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
  • Loading branch information
dmabupt authored and addaleax committed Mar 30, 2020
1 parent 30d55a3 commit 72983d2
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
4 changes: 4 additions & 0 deletions test/addons/addon.status
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ prefix addons
[$arch==arm]
# https://github.com/nodejs/node/issues/30786
openssl-binding/test: PASS,FLAKY

[$system==ibmi]
openssl-binding/test: SKIP
zlib-binding/test: SKIP
7 changes: 6 additions & 1 deletion test/addons/openssl-binding/binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@
{
'target_name': 'binding',
'includes': ['../common.gypi'],
'variables': {
# Skip this building on IBM i.
'aix_variant_name': '<!(uname -s)',
},
'conditions': [
['node_use_openssl=="true"', {
['node_use_openssl=="true" and '
'"<(aix_variant_name)"!="OS400"', {
'sources': ['binding.cc'],
'include_dirs': ['../../../deps/openssl/openssl/include'],
}],
Expand Down
12 changes: 10 additions & 2 deletions test/addons/zlib-binding/binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,16 @@
'targets': [
{
'target_name': 'binding',
'sources': ['binding.cc'],
'include_dirs': ['../../../deps/zlib'],
'variables': {
# Skip this building on IBM i.
'aix_variant_name': '<!(uname -s)',
},
'conditions': [
[ '"<(aix_variant_name)"!="OS400"', {
'sources': ['binding.cc'],
'include_dirs': ['../../../deps/zlib'],
}],
],
'includes': ['../common.gypi'],
},
]
Expand Down

0 comments on commit 72983d2

Please sign in to comment.