Merge 6375e4ed79dc584a8174e5816d68a1c31b6d9b27 into 179d45050be0a71fd57591b0ed8aedf9b177ba10

.github/workflows/tests.yml

@@ -58,11 +58,12 @@ jobs:
       - run: sudo ${{ matrix.shell }} --version 2> /dev/null || dpkg -s ${{ matrix.shell }} 2> /dev/null || which ${{ matrix.shell }}
       - run: curl --version
       - run: wget --version
-      - uses: ljharb/actions/node/install@main
+      - uses: ljharb/actions/node/run@main
         name: 'npm install && version checks'
         with:
           node-version: 'lts/*'
           skip-ls-check: true
+          shell-command: echo installed
       - run: npm ls urchin
       - run: npx which urchin
       - run: env

test/fast/Unit tests/nvm_get_arch

@@ -2,11 +2,11 @@
 
 # Save the PATH as it was when the test started to restore it when it
 # finishes
-ORIG_PATH="${PATH}"
+ORIG_PATH=$PATH
 
 cleanup() {
   # Restore the PATH as it was when the test started
-  export PATH="${ORIG_PATH}"
+  export PATH=ORIG_PATH
 }
 
 die () { cleanup; echo "$@" ; exit 1; }
@@ -15,23 +15,20 @@ die () { cleanup; echo "$@" ; exit 1; }
 
 # Directory where mocked binaries used by nvm_get_arch for each OS/arch are
 # located
-MOCKS_DIR="$(pwd)/../../mocks"
+MOCKS_DIR=`pwd`/../../mocks
 # Sets the PATH for these tests to include the symlinks to the mocked
 # binaries
-export PATH=".:${PATH}"
+export PATH=.:${PATH}
 
 # Setups mock binaries for a given OS and arch that mimic
 # the output of the real binaries used by nvm_get_arch to guess
 # the architecture of a given system.
 setup_mock_arch() {
-  local OS
+  local OS=$1
-  OS=$1
+  local ARCH=$2
-  local ARCH
+  local OPT=$3
-  ARCH=$2
-  local OPT
-  OPT=$3
 
-  if [ "_${OS}" = '_solaris' ] || [ "_${OS}" = '_smartos' ]; then
+  if [ "_$OS" = "_solaris" ] || [ "_$OS" = "_smartos" ]; then
     ln -sf "${MOCKS_DIR}/isainfo_${ARCH}" ./isainfo
     if [ "_$OPT" != "_no_pkg_info" ]; then
       ln -sf "${MOCKS_DIR}/pkg_info_${ARCH}" ./pkg_info
@@ -45,12 +42,10 @@ setup_mock_arch() {
 
 # Cleans up the setup done by setup_mock_arch.
 cleanup_mock_arch() {
-  local OS
+  local OS=$1
-  OS=$1
+  local ARCH=$2
-  local ARCH
-  ARCH=$2
 
-  if [ "_${OS}" = '_solaris' ] || [ "_${OS}" = '_smartos' ]; then
+  if [ "_$OS" = "_solaris" ] || [ "_$OS" = "_smartos" ]; then
     rm -f ./isainfo
     rm -f ./pkg_info
   fi
@@ -62,22 +57,17 @@ cleanup_mock_arch() {
 # expected output $EXPECTED_OUTPUT with the actual output. Does nothing
 # and exits cleanly if they match, dies otherwise.
 run_test() {
-  local ARCH
+  local ARCH=$1
-  ARCH=$1
+  local OS=$2
-  local OS
+  local EXPECTED_OUTPUT=$3
-  OS=$2
+  local OPT=$4
-  local EXPECTED_OUTPUT
-  EXPECTED_OUTPUT=$3
-  local OPT
-  OPT=$4
 
-  setup_mock_arch "${OS}" "${ARCH}" "${OPT}"
+  setup_mock_arch $OS $ARCH $OPT
-  local OUTPUT
+  local OUTPUT="$(nvm_get_arch)"
-  OUTPUT="$(nvm_get_arch)"
+  cleanup_mock_arch $OS $ARCH
-  cleanup_mock_arch "${OS}" "${ARCH}"
+  [ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] ||
-  [ "_${OUTPUT}" = "_${EXPECTED_OUTPUT}" ] ||
+    die "nvm_get_arch for OS \"$OS\" and arch \"$ARCH\" with OPT \"$OPT\" did
-    die "nvm_get_arch for OS \"${OS}\" and arch \"${ARCH}\" with OPT \"${OPT}\" did
+    not return \"$EXPECTED_OUTPUT\"; got \"$OUTPUT\""
-    not return \"${EXPECTED_OUTPUT}\"; got \"${OUTPUT}\""
 }
 
 run_test x86 smartos x86