273345896
/
nvm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #523 from creationix/run_slow_nvmrc_tests_too 

Actually run all tests; fix some bugs
master
Jordan Harband 2014-09-14 16:38:12 -07:00
parent f6fef75f36 3d3145f2e0
commit 7bb6e9c915
6 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nvm.sh
View File

@ -433,19 +433,20 @@ nvm() {
fi fi
provided_version=$1 provided_version=$1
if [ -z "$provided_version" ]; then if [ -z "$provided_version" ]; then
if [ $version_not_provided -ne 1 ]; then if [ $version_not_provided -ne 1 ]; then
nvm_rc_version nvm_rc_version
fi fi
provided_version="$NVM_RC_VERSION" provided_version="$NVM_RC_VERSION"
else
shift
fi fi
[ -d "$(nvm_version_path "$provided_version")" ] && echo "$provided_version is already installed." >&2 && return [ -d "$(nvm_version_path "$provided_version")" ] && echo "$provided_version is already installed." >&2 && return
VERSION=`nvm_remote_version $provided_version` VERSION=`nvm_remote_version $provided_version`
ADDITIONAL_PARAMETERS='' ADDITIONAL_PARAMETERS=''
shift
while [ $# -ne 0 ] while [ $# -ne 0 ]
do do
ADDITIONAL_PARAMETERS="$ADDITIONAL_PARAMETERS $1" ADDITIONAL_PARAMETERS="$ADDITIONAL_PARAMETERS $1"
@ -494,7 +495,9 @@ nvm() {
fi fi
fi fi
if [ -n "$ADDITIONAL_PARAMETERS" ]; then
echo "Additional options while compiling: $ADDITIONAL_PARAMETERS" echo "Additional options while compiling: $ADDITIONAL_PARAMETERS"
fi
tarball='' tarball=''
sum='' sum=''
@ -796,7 +799,7 @@ nvm() {
local PROVIDED_VERSION local PROVIDED_VERSION
PROVIDED_VERSION="$2" PROVIDED_VERSION="$2"
if [ "$PROVIDED_VERSION" = "$(nvm_ls_current)" ]; then if [ "$PROVIDED_VERSION" = "$(nvm_ls_current)" ] || [ "$(nvm_version $PROVIDED_VERSION)" = "$(nvm_ls_current)" ]; then
echo 'Can not copy packages from the current version of node.' >&2 echo 'Can not copy packages from the current version of node.' >&2
return 2 return 2
fi fi

0
test/fast/Listing versions/teardown 100644 → 100755
View File

2
test/fast/Running "nvm use x" should not create the "current" symlink if $NVM_SYMLINK_CURRENT is false
View File

@ -34,7 +34,7 @@ function cleanup() {
function runNvmUse() { function runNvmUse() {
mkdir ../../${TEST_NODE_VERSION} mkdir ../../${TEST_NODE_VERSION}
nvm use ${TEST_NODE_VERSION} &> /dev/null nvm use ${TEST_NODE_VERSION} > /dev/null 2>&1
rmdir ../../${TEST_NODE_VERSION} rmdir ../../${TEST_NODE_VERSION}
} }

14
test/slow/nvm copy-packages/Running "nvm copy-packages $(nvm ls current)" should error out 100644 → 100755
View File

@ -2,11 +2,15 @@
die () { echo $@ ; exit 1; } die () { echo $@ ; exit 1; }
. ../../nvm.sh . ../../../nvm.sh
local EXPECTED_MSG="Can not copy packages from the current version of node." nvm use 0.10.28 > /dev/null
[ "$(nvm use 0.10.28 && nvm copy-packages 0.10.28 2&>1)" = "$EXPECTED_MSG" ] || die '"nvm use 0.10.28 && nvm copy-packages 0.10.28" did not fail with the right message'
$(nvm use 0.10.28 && nvm copy-packages 0.10.28) EXPECTED_MSG="Can not copy packages from the current version of node."
[ $? = 2 ] || die '"nvm use 0.10.28 && nvm copy-packages 0.10.28" did not fail with the right error code' ACTUAL_MSG="$(nvm copy-packages 0.10.28 2>&1 > /dev/null)"
[ "~$ACTUAL_MSG" = "~$EXPECTED_MSG" ] || die "'nvm use 0.10.28 && nvm copy-packages 0.10.28' did not fail with the right message: '$ACTUAL_MESSAGE'"
EXPECTED_ERROR_CODE="2"
ACTUAL_ERROR_CODE="$(nvm copy-packages 0.10.28 > /dev/null 2>&1 ; echo $?)"
[ "~$ACTUAL_ERROR_CODE" = "~$EXPECTED_ERROR_CODE" ] || die "'nvm use 0.10.28 && nvm copy-packages 0.10.28' did not fail with the right error code: expected '$EXPECTED_ERROR_CODE', got '$ACTUAL_ERROR_CODE'"

2
test/slow/nvm install/install version specified in .nvmrc from binary 100644 → 100755
View File

@ -9,7 +9,7 @@ NVM_TEST_VERSION=v0.10.7
[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION [ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION
# Install from binary # Install from binary
cat "$NVM_TEST_VERSION" > .nvmrc echo "$NVM_TEST_VERSION" > .nvmrc
nvm install nvm install

2
test/slow/nvm install/install version specified in .nvmrc from source 100644 → 100755
View File

@ -9,7 +9,7 @@ NVM_TEST_VERSION=v0.10.7
[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION [ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION
# Install from binary # Install from binary
cat "$NVM_TEST_VERSION" > .nvmrc echo "$NVM_TEST_VERSION" > .nvmrc
nvm install -s nvm install -s