From a6238c36d5300ef9d260a4e1144f1dfa973bd72e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 9 Jan 2015 23:58:32 -0800 Subject: [PATCH] Fix script/test to be more cross-compatible with other platforms --- script/test | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/script/test b/script/test index 52dc4b92..a6ae0f4d 100755 --- a/script/test +++ b/script/test @@ -5,24 +5,11 @@ # script/test if [ -z "$1" ]; then - TEST_FILES="./test/test_*.rb" + TEST_FILES=$(ruby -e "puts Dir.glob('test/test_*.rb')") else TEST_FILES="$@" fi -# bundle exec gem env -GEM_DIR=$(bundle exec gem env | grep -C 1 "GEM PATHS" | tail -1 | cut -d '-' -f2 | cut -d' ' -f2) -RAKE_LIB_WITH_VERSION=$(bundle exec ruby -e "puts Gem::Specification.find_by_name('rake').gem_dir.split('/').last + '/lib'") -RAKE_LIB_DIR="${GEM_DIR}/gems/${RAKE_LIB_WITH_VERSION}" - -test -d "${RAKE_LIB_DIR}" || { - echo "No ${RAKE_LIB_DIR}. Installing Rake." - bundle show rake | cut -d'/' -f12 | cut -d'-' -f 2 | xargs bundle exec gem install rake -v -} - set -x -time bundle exec ruby -I"lib:test" \ - -I"${RAKE_LIB_DIR}" \ - "${RAKE_LIB_DIR}/rake/rake_test_loader.rb" \ - $TEST_FILES +time bundle exec ruby -I"lib:test" -rloader $TEST_FILES