Merge e87ec0c0132a74932f469816979137fe40fe3323 into 6b70c40f151ca051d403453bf019e1707b33bd5b

Fixes #3447

nvm.sh

@@ -196,6 +196,9 @@ nvm_install_latest_npm() {
   nvm_echo 'Attempting to upgrade to the latest working version of npm...'
   local NODE_VERSION
   NODE_VERSION="$(nvm_strip_iojs_prefix "$(nvm_ls_current)")"
+  local NPM_VERSION
+  NPM_VERSION="$(npm --version 2>/dev/null)"
+
   if [ "${NODE_VERSION}" = 'system' ]; then
     NODE_VERSION="$(node --version)"
   elif [ "${NODE_VERSION}" = 'none' ]; then
@@ -206,8 +209,6 @@ nvm_install_latest_npm() {
     nvm_err 'Unable to obtain node version.'
     return 1
   fi
-  local NPM_VERSION
-  NPM_VERSION="$(npm --version 2>/dev/null)"
   if [ -z "${NPM_VERSION}" ]; then
     nvm_err 'Unable to obtain npm version.'
     return 2

test/installation_node/install from source with thread parameter

@@ -25,8 +25,11 @@ nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION || "'nvm run $NVM_T
 # Remove the stuff we're clobbering.
 [ -e ../../$NVM_TEST_VERSION ] && rm -R ../../$NVM_TEST_VERSION
 
-# Install from source with 2 make jobs (and swapped arg order)
-nvm install -j 2 -s $NVM_TEST_VERSION || die "'nvm install -s $NVM_TEST_VERSION' failed"
+# Speed up test for non-CI environment which may have more CPU threads
+[ -z "${CI-}"] && nvm_get_make_jobs
+
+# Install from source with multiple make jobs (and swapped arg order)
+nvm install -j ${NVM_MAKE_JOBS-:2} -s $NVM_TEST_VERSION || die "'nvm install -s $NVM_TEST_VERSION' failed"
 
 # Check
 [ -d ../../$NVM_TEST_VERSION ]