Skip to content

Commit

Permalink
build: add version-specific library path for AIX
Browse files Browse the repository at this point in the history
Add the version-specific directory containing the C/C++ runtime
libraries to `-blibpath` on AIX. This will help link `node` against
the correct libraries at run-time when compiled with a different
version of the GNU C/C++ compiler without having to manually set
a `LIBPATH` environment variable.

PR-URL: nodejs#53585
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Beth Griggs <[email protected]>

doc: fix doc for correct usage with plan & TextContext

Fixed section in the doc that describes a test that uses the ⁠plan
feature in the test-runner.
However, the test in this example fails.
The fix use  (Textcontext) and reduce the plan number
to 1 since we have 1 assertion.
  • Loading branch information
richardlau authored and Emiltayeb committed Jun 27, 2024
1 parent 3036066 commit 57b04c0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,9 @@
'-Wl,-brtl',
],
}, { # else it's `AIX`
'variables': {
'gcc_major': '<!(<(python) -c "import os; import subprocess; CXX=os.environ.get(\'CXX\', \'g++\'); subprocess.run([CXX, \'-dumpversion\'])")'
},
# Disable the following compiler warning:
#
# warning: visibility attribute not supported in this
Expand All @@ -589,7 +592,7 @@
# out more relevant warnings.
'cflags': [ '-Wno-attributes' ],
'ldflags': [
'-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread/ppc64',
'-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/gcc/powerpc-ibm-aix7.3.0.0/>(gcc_major)/pthread/ppc64:/opt/freeware/lib/gcc/powerpc-ibm-aix7.2.0.0/>(gcc_major)/pthread/ppc64:/opt/freeware/lib/pthread/ppc64',
],
}],
],
Expand Down
4 changes: 2 additions & 2 deletions doc/api/test.md
Original file line number Diff line number Diff line change
Expand Up @@ -3423,9 +3423,9 @@ behaves in the same fashion as the top level [`test()`][] function.
test('top level test', async (t) => {
await t.test(
'This is a subtest',
{ only: false, skip: false, concurrency: 1, todo: false, plan: 4 },
{ only: false, skip: false, concurrency: 1, todo: false, plan: 1 },
(t) => {
assert.ok('some relevant assertion here');
t.assert.ok('some relevant assertion here');
},
);
});
Expand Down

0 comments on commit 57b04c0

Please sign in to comment.