From eb6031cb58f03d6e2629cdc1456185b1fb21bea8 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Sat, 19 Apr 2014 16:48:14 -0700 Subject: [PATCH] Clean up after existing `nvm install` tests. --- test/slow/nvm install/install from binary | 13 +++++++------ test/slow/nvm install/install from source | 13 +++++++------ .../install two versions and use the latest one | 10 +++++----- test/slow/nvm install/setup_dir | 6 ++++++ test/slow/nvm install/teardown_dir | 13 +++++++++++++ 5 files changed, 38 insertions(+), 17 deletions(-) create mode 100755 test/slow/nvm install/setup_dir create mode 100755 test/slow/nvm install/teardown_dir diff --git a/test/slow/nvm install/install from binary b/test/slow/nvm install/install from binary index c24d98e..82124e0 100755 --- a/test/slow/nvm install/install from binary +++ b/test/slow/nvm install/install from binary @@ -1,16 +1,17 @@ #!/bin/sh set -e -. ../../nvm.sh +. ../../../nvm.sh -VERSION=v0.10.7 +NVM_TEST_VERSION=v0.10.7 # Remove the stuff we're clobbering. -[ -e ../../$VERSION ] && rm -R ../../$VERSION +[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION # Install from binary -nvm install $VERSION +nvm install $NVM_TEST_VERSION # Check -[ -d ../../$VERSION ] -nvm run $VERSION --version | grep $VERSION +[ -d ../../../$NVM_TEST_VERSION ] +nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION + diff --git a/test/slow/nvm install/install from source b/test/slow/nvm install/install from source index b8b2abf..fdb5c0e 100755 --- a/test/slow/nvm install/install from source +++ b/test/slow/nvm install/install from source @@ -1,16 +1,17 @@ #!/bin/sh set -e -. ../../nvm.sh +. ../../../nvm.sh -VERSION=v0.10.7 +NVM_TEST_VERSION=v0.10.7 # Remove the stuff we're clobbering. -[ -e ../../$VERSION ] && rm -R ../../$VERSION +[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION # Install from source -nvm install -s $VERSION +nvm install -s $NVM_TEST_VERSION # Check -[ -d ../../$VERSION ] -nvm run $VERSION --version | grep $VERSION +[ -d ../../../$NVM_TEST_VERSION ] +nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION + diff --git a/test/slow/nvm install/install two versions and use the latest one b/test/slow/nvm install/install two versions and use the latest one index 5b1f7e4..08c7085 100755 --- a/test/slow/nvm install/install two versions and use the latest one +++ b/test/slow/nvm install/install two versions and use the latest one @@ -1,19 +1,19 @@ #!/bin/sh set -e -. ../../nvm.sh +. ../../../nvm.sh # Remove the stuff we're clobbering. -[ -e ../../v0.10.7 ] && rm -R ../../v0.10.7 -[ -e ../../v0.10.8 ] && rm -R ../../v0.10.8 +[ -e ../../../v0.10.7 ] && rm -R ../../../v0.10.7 +[ -e ../../../v0.10.8 ] && rm -R ../../../v0.10.8 # Install from binary nvm install 0.10.7 nvm install 0.10.8 # Check -[ -d ../../v0.10.7 ] -[ -d ../../v0.10.8 ] +[ -d ../../../v0.10.7 ] +[ -d ../../../v0.10.8 ] # Use the first one nvm use 0.10.7 diff --git a/test/slow/nvm install/setup_dir b/test/slow/nvm install/setup_dir new file mode 100755 index 0000000..50dc4e4 --- /dev/null +++ b/test/slow/nvm install/setup_dir @@ -0,0 +1,6 @@ +#!/bin/sh + +if [ -f ".nvmrc" ]; then + mv .nvmrc .nvmrc.bak +fi + diff --git a/test/slow/nvm install/teardown_dir b/test/slow/nvm install/teardown_dir new file mode 100755 index 0000000..3f107c9 --- /dev/null +++ b/test/slow/nvm install/teardown_dir @@ -0,0 +1,13 @@ +#!/bin/sh + +. ../../../nvm.sh +nvm uninstall v0.10.7 + +if [ -f ".nvmrc" ]; then + rm .nvmrc +fi + +if [ -f ".nvmrc.bak" ]; then + mv .nvmrc.bak .nvmrc +fi +