Commit 80e800b 1 parent 95ba49a commit 80e800b Copy full SHA for 80e800b
File tree 2 files changed +6
-12
lines changed
2 files changed +6
-12
lines changed Original file line number Diff line number Diff line change 15
15
echo " ERROR: An RVM installation was not found.\n"
16
16
fi
17
17
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
-
23
18
set -o errexit
24
19
set -x
25
20
Original file line number Diff line number Diff line change @@ -25,13 +25,12 @@ RUBIES="\
25
25
TEST_LOG=test.log
26
26
VALGRIND_LOG=valgrind.log
27
27
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
35
34
36
35
# Load RVM into a shell session *as a function*
37
36
if [[ -s " $HOME /.rvm/scripts/rvm" ]] ; then
You can’t perform that action at this time.
0 commit comments