v11.8.0 proposal

BUILDING.md

@@ -281,7 +281,8 @@ the first command `./configure --coverage`).
 _Generating a test coverage report can take several minutes._
 
 To collect coverage for a subset of tests you can set the `CI_JS_SUITES` and
-`CI_NATIVE_SUITES` variables:
+`CI_NATIVE_SUITES` variables (to run specific suites, e.g., `child-process`, in
+isolation, unset the opposing `_SUITES` variable):
 
 ```text
 $ CI_JS_SUITES=child-process CI_NATIVE_SUITES= make coverage
@@ -290,9 +291,15 @@ $ CI_JS_SUITES=child-process CI_NATIVE_SUITES= make coverage
 The above command executes tests for the `child-process` subsystem and
 outputs the resulting coverage report.
 
-The `make coverage` command downloads some tools to the project root directory
-and overwrites the `lib/` directory. To clean up after generating the coverage
-reports:
+Alternatively, you can run `make coverage-run-js`, to execute JavaScript tests
+independently of the C++ test suite:
+
+```text
+$ CI_JS_SUITES=fs CI_NATIVE_SUITES= make coverage-run-js
+```
+
+The `make coverage` command downloads some tools to the project root directory.
+To clean up after generating the coverage reports:
 
 ```console
 $ make coverage-clean

CHANGELOG.md

@@ -28,7 +28,8 @@ release.
 </tr>
 <tr>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V11.md#11.7.0">11.7.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V11.md#11.8.0">11.8.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V11.md#11.7.0">11.7.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V11.md#11.6.0">11.6.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V11.md#11.5.0">11.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V11.md#11.4.0">11.4.0</a><br/>

Makefile

@@ -11,6 +11,7 @@ STAGINGSERVER ?= node-www
 LOGLEVEL ?= silent
 OSTYPE := $(shell uname -s | tr '[A-Z]' '[a-z]')
 COVTESTS ?= test-cov
+COV_SKIP_TESTS ?= core_line_numbers.js,testFinalizer.js,test_function/test.js
 GTEST_FILTER ?= "*"
 GNUMAKEFLAGS += --no-print-directory
 GCOV ?= gcov
@@ -181,7 +182,6 @@ coverage-clean:
 	$(RM) -r node_modules
 	$(RM) -r gcovr build
 	$(RM) -r out/$(BUILDTYPE)/.coverage
-	$(RM) -r .cov_tmp
 	$(RM) out/$(BUILDTYPE)/obj.target/node/gen/*.gcda
 	$(RM) out/$(BUILDTYPE)/obj.target/node/src/*.gcda
 	$(RM) out/$(BUILDTYPE)/obj.target/node/src/tracing/*.gcda
@@ -201,55 +201,51 @@ coverage: coverage-test ## Run the tests and generate a coverage report.
 
 .PHONY: coverage-build
 coverage-build: all
-	mkdir -p node_modules
-	if [ ! -d node_modules/nyc ]; then \
-		$(NODE) ./deps/npm install nyc@13 --no-save --no-package-lock; fi
+	-$(MAKE) coverage-build-js
 	if [ ! -d gcovr ]; then git clone -b 3.4 --depth=1 \
 		--single-branch https://github.com/gcovr/gcovr.git; fi
 	if [ ! -d build ]; then git clone --depth=1 \
 		--single-branch https://github.com/nodejs/build.git; fi
 	if [ ! -f gcovr/scripts/gcovr.orig ]; then \
 		(cd gcovr && patch -N -p1 < \
 		"$(CURDIR)/build/jenkins/scripts/coverage/gcovr-patches-3.4.diff"); fi
-	if [ -d lib_ ]; then $(RM) -r lib; mv lib_ lib; fi
-	mv lib lib_
-	NODE_DEBUG=nyc $(NODE) ./node_modules/.bin/nyc instrument --extension .js \
-		--extension .mjs --exit-on-error lib_/ lib/
 	$(MAKE)
 
+.PHONY: coverage-build-js
+coverage-build-js:
+	mkdir -p node_modules
+	if [ ! -d node_modules/c8 ]; then \
+		$(NODE) ./deps/npm install c8@next --no-save --no-package-lock;\
+	fi
+
 .PHONY: coverage-test
 coverage-test: coverage-build
-	$(RM) -r out/$(BUILDTYPE)/.coverage
-	$(RM) -r .cov_tmp
 	$(RM) out/$(BUILDTYPE)/obj.target/node/gen/*.gcda
 	$(RM) out/$(BUILDTYPE)/obj.target/node/src/*.gcda
 	$(RM) out/$(BUILDTYPE)/obj.target/node/src/tracing/*.gcda
 	$(RM) out/$(BUILDTYPE)/obj.target/node_lib/gen/*.gcda
 	$(RM) out/$(BUILDTYPE)/obj.target/node_lib/src/*.gcda
 	$(RM) out/$(BUILDTYPE)/obj.target/node_lib/src/tracing/*.gcda
-	-$(MAKE) $(COVTESTS)
-	mv lib lib__
-	mv lib_ lib
-	mkdir -p coverage .cov_tmp
-	$(NODE) ./node_modules/.bin/nyc merge 'out/Release/.coverage' \
-		.cov_tmp/libcov.json
-	(cd lib && .$(NODE) ../node_modules/.bin/nyc report \
-		--temp-dir "$(CURDIR)/.cov_tmp" \
-		--report-dir "$(CURDIR)/coverage" \
-		--reporter html)
+	-NODE_V8_COVERAGE=out/$(BUILDTYPE)/.coverage $(MAKE) $(COVTESTS)
+	$(MAKE) coverage-report-js
 	-(cd out && "../gcovr/scripts/gcovr" --gcov-exclude='.*deps' \
 		--gcov-exclude='.*usr' -v -r Release/obj.target \
 		--html --html-detail -o ../coverage/cxxcoverage.html \
 		--gcov-executable="$(GCOV)")
-	mv lib lib_
-	mv lib__ lib
 	@echo -n "Javascript coverage %: "
 	@grep -B1 Lines coverage/index.html | head -n1 \
 		| sed 's/<[^>]*>//g'| sed 's/ //g'
 	@echo -n "C++ coverage %: "
 	@grep -A3 Lines coverage/cxxcoverage.html | grep style  \
 		| sed 's/<[^>]*>//g'| sed 's/ //g'
 
+.PHONY: coverage-report-js
+coverage-report-js:
+	$(NODE) ./node_modules/.bin/c8 report --reporter=html \
+		--temp-directory=out/$(BUILDTYPE)/.coverage --omit-relative=false \
+		--resolve=./lib --exclude="deps/" --exclude="test/" --exclude="tools/" \
+		--wrapper-length=0
+
 .PHONY: cctest
 # Runs the C++ tests using the built `cctest` executable.
 cctest: all
@@ -276,6 +272,14 @@ jstest: build-addons build-js-native-api-tests build-node-api-tests ## Runs addo
 		$(CI_JS_SUITES) \
 		$(CI_NATIVE_SUITES)
 
+.PHONY: coverage-run-js
+coverage-run-js:
+	$(RM) -r out/$(BUILDTYPE)/.coverage
+	$(MAKE) coverage-build-js
+	-NODE_V8_COVERAGE=out/$(BUILDTYPE)/.coverage CI_SKIP_TESTS=$(COV_SKIP_TESTS) \
+	  $(MAKE) jstest
+	$(MAKE) coverage-report-js
+
 .PHONY: test
 # This does not run tests of third-party libraries inside deps.
 test: all ## Runs default tests, linters, and builds docs.
@@ -300,7 +304,7 @@ test-cov: all
 	$(MAKE) build-js-native-api-tests
 	$(MAKE) build-node-api-tests
 	# $(MAKE) cctest
-	CI_SKIP_TESTS=core_line_numbers.js $(MAKE) jstest
+	CI_SKIP_TESTS=$(COV_SKIP_TESTS) $(MAKE) jstest
 
 test-parallel: all
 	$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) parallel
@@ -1290,7 +1294,7 @@ ifneq ("","$(wildcard tools/pip/site-packages)")
 lint-py:
 	PYTHONPATH=tools/pip $(PYTHON) -m flake8 . \
 		--count --show-source --statistics --select=E901,E999,F821,F822,F823 \
-		--exclude=.git,deps,lib,src,tools/*_macros.py,tools/gyp,tools/inspector_protocol,tools/jinja2,tools/markupsafe,tools/pip
+		--exclude=.git,deps,lib,src,test/fixtures,tools/*_macros.py,tools/gyp,tools/inspector_protocol,tools/jinja2,tools/markupsafe,tools/pip
 else
 lint-py:
 	@echo "Python linting with flake8 is not avalible"

README.md

@@ -202,6 +202,8 @@ For information about the governance of the Node.js project, see
 **Michaël Zasso** <targos@protonmail.com> (he/him)
 * [thefourtheye](https://github.com/thefourtheye) -
 **Sakthipriyan Vairamani** <thechargingvolcano@gmail.com> (he/him)
+* [Trott](https://github.com/Trott) -
+**Rich Trott** <rtrott@gmail.com> (he/him)
 
 ### TSC Emeriti
 
@@ -233,8 +235,6 @@ For information about the governance of the Node.js project, see
 **Tiancheng "Timothy" Gu** <timothygu99@gmail.com> (he/him)
 * [trevnorris](https://github.com/trevnorris) -
 **Trevor Norris** <trev.norris@gmail.com>
-* [Trott](https://github.com/Trott) -
-**Rich Trott** <rtrott@gmail.com> (he/him)
 
 ### Collaborators
 

common.gypi

@@ -116,28 +116,8 @@
             'msvs_configuration_platform': 'x64',
           }],
           ['OS=="aix"', {
-            'variables': {'real_os_name': '<!(uname -s)',},
             'cflags': [ '-gxcoff' ],
             'ldflags': [ '-Wl,-bbigtoc' ],
-            'conditions': [
-              ['target_arch=="ppc64"', {
-                'ldflags': [
-                  '-Wl,-blibpath:/usr/lib:/lib:'
-                    '/opt/freeware/lib/pthread/ppc64'
-                ],
-              }],
-              ['target_arch=="ppc"', {
-                'ldflags': [
-                  '-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread'
-                ],
-              }],
-              ['"<(real_os_name)"=="OS400"', {
-                'ldflags': [
-                  '-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib',
-                  '-Wl,-brtl',
-                ],
-              }],
-            ],
           }],
           ['OS == "android"', {
             'cflags': [ '-fPIE' ],
@@ -414,9 +394,9 @@
             'ldflags': [ '-m32' ],
           }],
           [ 'target_arch=="ppc64" and OS!="aix"', {
-	    'cflags': [ '-m64', '-mminimal-toc' ],
-	    'ldflags': [ '-m64' ],
-	   }],
+            'cflags': [ '-m64', '-mminimal-toc' ],
+            'ldflags': [ '-m64' ],
+          }],
           [ 'target_arch=="s390"', {
             'cflags': [ '-m31', '-march=z196' ],
             'ldflags': [ '-m31', '-march=z196' ],
@@ -431,38 +411,35 @@
             'cflags!': [ '-pthread' ],
             'ldflags!': [ '-pthread' ],
           }],
-          [ 'OS=="aix"', {
-            'variables': {'real_os_name': '<!(uname -s)',},
-            'conditions': [
-              [ 'target_arch=="ppc"', {
-                'ldflags': [
-                  '-Wl,-bmaxdata:0x60000000/dsa',
-                  '-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread',
-                 ],
-              }],
-              [ 'target_arch=="ppc64"', {
-                'cflags': [ '-maix64' ],
-                'ldflags': [
-                  '-maix64',
-                  '-Wl,-blibpath:/usr/lib:/lib:'
-                    '/opt/freeware/lib/pthread/ppc64',
-                ],
-              }],
-              ['"<(real_os_name)"=="OS400"', {
-                'ldflags': [
-                  '-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib',
-                  '-Wl,-brtl',
-                ],
-              }],
-            ],
-            'ldflags': [ '-Wl,-bbigtoc' ],
-            'ldflags!': [ '-rdynamic' ],
-          }],
           [ 'node_shared=="true"', {
             'cflags': [ '-fPIC' ],
           }],
         ],
       }],
+      [ 'OS=="aix"', {
+        'variables': {
+          # Used to differentiate `AIX` and `OS400`(IBM i).
+          'aix_variant_name': '<!(uname -s)',
+        },
+        'cflags': [ '-maix64', ],
+        'ldflags!': [ '-rdynamic', ],
+        'ldflags': [
+          '-Wl,-bbigtoc',
+          '-maix64',
+        ],
+        'conditions': [
+          [ '"<(aix_variant_name)"=="OS400"', {            # a.k.a. `IBM i`
+            'ldflags': [
+              '-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib',
+              '-Wl,-brtl',
+            ],
+          }, {                                             # else it's `AIX`
+            'ldflags': [
+              '-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread/ppc64',
+            ],
+          }],
+        ],
+      }],
       ['OS=="android"', {
         'target_conditions': [
           ['_toolset=="target"', {

configure.py

@@ -173,6 +173,11 @@
     dest='openssl_fips',
     help='Build OpenSSL using FIPS canister .o file in supplied folder')
 
+parser.add_option('--openssl-is-fips',
+    action='store_true',
+    dest='openssl_is_fips',
+    help='specifies that the OpenSSL library is FIPS compatible')
+
 parser.add_option('--openssl-use-def-ca-store',
     action='store_true',
     dest='use_openssl_ca_store',
@@ -488,6 +493,11 @@
     dest='without_npm',
     help='do not install the bundled npm (package manager)')
 
+parser.add_option('--without-report',
+    action='store_true',
+    dest='without_report',
+    help='build without report')
+
 # Dummy option for backwards compatibility
 parser.add_option('--with-snapshot',
     action='store_true',
@@ -933,6 +943,7 @@ def configure_node(o):
     o['variables']['OS'] = 'android'
   o['variables']['node_prefix'] = options.prefix
   o['variables']['node_install_npm'] = b(not options.without_npm)
+  o['variables']['node_report'] = b(not options.without_report)
   o['default_configuration'] = 'Debug' if options.debug else 'Release'
 
   host_arch = host_arch_win() if os.name == 'nt' else host_arch_cc()
@@ -1190,6 +1201,7 @@ def configure_openssl(o):
   variables = o['variables']
   variables['node_use_openssl'] = b(not options.without_ssl)
   variables['node_shared_openssl'] = b(options.shared_openssl)
+  variables['openssl_is_fips'] = b(options.openssl_is_fips)
   variables['openssl_fips'] = ''
 
   if options.openssl_no_asm:

deps/uv/.mailmap

@@ -45,3 +45,4 @@ Yazhong Liu <yorkiefixer@gmail.com>
 Yuki Okumura <mjt@cltn.org>
 jBarz <jBarz@users.noreply.github.com> <jbarboza@ca.ibm.com>
 jBarz <jBarz@users.noreply.github.com> <jbarz@users.noreply.github.com>
+ptlomholt <pt@lomholt.com>

deps/uv/AUTHORS

@@ -362,3 +362,7 @@ Ashe Connor <ashe@kivikakk.ee>
 Rick <lcw0622@163.com>
 Ivan Krylov <krylov.r00t@gmail.com>
 Michael Meier <michael.meier@leica-geosystems.com>
+ptlomholt <pt@lomholt.com>
+Victor Costan <pwnall@chromium.org>
+sid <sidyhe@hotmail.com>
+Kevin Adler <kadler@us.ibm.com>

deps/uv/CMakeLists.txt

@@ -167,6 +167,7 @@ set(uv_test_sources
     test/test-udp-send-immediate.c
     test/test-udp-send-unreachable.c
     test/test-udp-try-send.c
+    test/test-uname.c
     test/test-walk-handles.c
     test/test-watcher-cross-stop.c)
 
@@ -211,7 +212,7 @@ if(WIN32)
 else()
   list(APPEND uv_defines _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE)
   if(NOT CMAKE_SYSTEM_NAME STREQUAL "Android")
-    # Android has pthread as part of its c library, not as a separate 
+    # Android has pthread as part of its c library, not as a separate
     # libpthread.so.
     list(APPEND uv_libraries pthread)
   endif()