Merge e87ec0c0132a74932f469816979137fe40fe3323 into 4beab63631764fc381a0e56273faf8d43b8f9509

Fixes #3402

nvm.sh

@@ -503,9 +503,9 @@ $(nvm_wrap_with_color_code 'y' "${warn_text}")"
 }
 
 nvm_process_nvmrc() {
-  local NVMRC_PATH="$1"
+  local NVMRC_PATH
+  NVMRC_PATH="$1"
   local lines
-  local unpaired_line
 
   lines=$(command sed 's/#.*//' "$NVMRC_PATH" | command sed 's/^[[:space:]]*//;s/[[:space:]]*$//' | nvm_grep -v '^$')
 
@@ -515,8 +515,12 @@ nvm_process_nvmrc() {
   fi
 
   # Initialize key-value storage
-  local keys=''
-  local values=''
+  local keys
+  keys=''
+  local values
+  values=''
+  local unpaired_line
+  unpaired_line=''
 
   while IFS= read -r line; do
     if [ -z "${line}" ]; then

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 ]