Skip to content

Commit 80e800b

Browse files
committed
use eval_gemfile to load libxml-ruby
instead of requiring manual intervention
1 parent 95ba49a commit 80e800b

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

build_all

-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ else
1515
echo "ERROR: An RVM installation was not found.\n"
1616
fi
1717

18-
if grep libxml-ruby Gemfile ; then
19-
echo "ERROR: please remove the libxml-ruby line from your Gemfile"
20-
exit 1
21-
fi
22-
2318
set -o errexit
2419
set -x
2520

test_all

+6-7
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@ RUBIES="\
2525
TEST_LOG=test.log
2626
VALGRIND_LOG=valgrind.log
2727

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

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

0 commit comments

Comments
 (0)