Skip to content

Commit

Permalink
use eval_gemfile to load libxml-ruby
Browse files Browse the repository at this point in the history
instead of requiring manual intervention
  • Loading branch information
flavorjones committed Jun 6, 2016
1 parent 95ba49a commit 80e800b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
5 changes: 0 additions & 5 deletions build_all
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ else
echo "ERROR: An RVM installation was not found.\n"
fi

if grep libxml-ruby Gemfile ; then
echo "ERROR: please remove the libxml-ruby line from your Gemfile"
exit 1
fi

set -o errexit
set -x

Expand Down
13 changes: 6 additions & 7 deletions test_all
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,12 @@ RUBIES="\
TEST_LOG=test.log
VALGRIND_LOG=valgrind.log

if ! grep libxml-ruby Gemfile ; then
echo "ERROR: please add this line your Gemfile temporarily so we can run libxml-ruby tests:"
echo
echo "gem 'libxml-ruby', :platform => :mri"
echo
exit 1
fi
# make sure we can test with libxml-ruby installed
export BUNDLE_GEMFILE="$(pwd)/Gemfile_test_all"
cat > $BUNDLE_GEMFILE <<EOF
gem "libxml-ruby", :platform => :mri
eval_gemfile File.join(File.dirname(ENV['BUNDLE_GEMFILE']),"Gemfile")
EOF

# Load RVM into a shell session *as a function*
if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
Expand Down

0 comments on commit 80e800b

Please sign in to comment.