[v10.x] Backport N-API 6 to v10.x #32488
Conversation
When instance data was backported, some of the tests ended up in a location where they do not get run. This moves the tests into test/addons-napi, merging them with existing tests therein, thereby ensuring that they do get run.
Mark all N-APIs that have been added since version 5 as stable. PR-URL: nodejs#32058 Fixes: nodejs/abi-stable-node#393 Co-Authored-By: legendecas <legendecas@gmail.com> Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
|
@gabrielschulhof did the commits apply cleanly? |
|
@mhdawson I have to move the tests out of test/node-api/test_instance_data into test/addons-napi/test_instance data and merge the code, because the former are not part of the v10.x source tree. We added test/node-api after splitting up js-native-api and node-api. In v10.x they are still together. Thus, I have an original commit that corrects this in addition to the mark-v6-as-stable commit that is backported from master. The commit should have been squashed into the commit backporting the instance data but I had forgotten to make the change at the time. |
|
@gabrielschulhof thanks. Not a big deal but I noted that the order of the functions in the NAPI-VERSION >= block is different in 10.x versus master. (napi_get_all_property_names is at the end in master but not in 10.x) |
|
Sorry got that backwards, it is at the end in 10.x but not in master. |
When instance data was backported, some of the tests ended up in a location where they do not get run. This moves the tests into test/addons-napi, merging them with existing tests therein, thereby ensuring that they do get run. PR-URL: #32488 Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Mark all N-APIs that have been added since version 5 as stable. PR-URL: #32058 Backport-PR-URL: #32488 Fixes: nodejs/abi-stable-node#393 Co-Authored-By: legendecas <legendecas@gmail.com> Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
|
@BethGriggs looks like these modifications somehow did not end up in the release tarball, although they are tagged correctly as v10.20.0. Please see #32755! |
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passes