Fix tests (postmodern#435)

* Fix old Makefile references to test/opt/rubies
* Fail early if missing the ruby to test
* The expected PATH needs to be captured after chruby_reset
* Do not update all Homebrew packages just to install shunit2

Author: eregon

.travis.yml

@@ -17,7 +17,7 @@ addons:
       - zsh
 
 install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install shunit2 bash; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install shunit2 bash; fi
 
 before_script:
   - sudo rm -rf $HOME/.rvm $HOME/.rvmrc

Makefile

@@ -38,16 +38,16 @@ verify: $(PKG) $(SIG)
 	gpg --verify $(SIG) $(PKG)
 
 clean:
-	rm -rf test/opt/rubies
+	rm -rf test/fixtures/opt/rubies
 	rm -f $(PKG) $(SIG)
 
 check:
 	shellcheck share/$(NAME)/*.sh
 
-test/opt/rubies:
+test/fixtures/opt/rubies:
 	./test/setup
 
-test: test/opt/rubies
+test: test/fixtures/opt/rubies
 	SHELL=`command -v bash` ./test/runner
 	SHELL=`command -v zsh`  ./test/runner
 

test/helper.sh

@@ -13,13 +13,20 @@ test_ruby_version_x_y="${test_ruby_version%.*}"
 test_ruby_api="${TEST_RUBY_API:-${test_ruby_version%.*}.0}"
 test_ruby_root="$PWD/test/fixtures/opt/rubies/$test_ruby_engine-$test_ruby_version"
 
-test_path="$PATH"
+if [[ "$(basename "$0")" != "setup" && ! -d "$test_ruby_root" ]]; then
+	echo "$test_ruby_root needs to exist, use test/setup or build a Ruby there"
+	exit 2
+fi
+
 test_gem_home="$HOME/.gem/$test_ruby_engine/$test_ruby_version"
 test_gem_root="$test_ruby_root/lib/ruby/gems/$test_ruby_api"
 
 . ./share/chruby/chruby.sh
 chruby_reset
 
+# Capture the PATH after chruby_reset
+test_path="$PATH"
+
 setUp() { return; }
 tearDown() { return; }
 oneTimeTearDown() { return; }