Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Commit 23184b2

Browse files
committed
EXPERIMENT: do not disable rubygems
1 parent 202f253 commit 23184b2

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

script/functions.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ export JRUBY_OPTS=${JRUBY_OPTS:-"--server -Xcompile.invokedynamic=false"}
88
SPECS_HAVE_RUN_FILE=specs.out
99
MAINTENANCE_BRANCH=`cat maintenance-branch`
1010

11-
# Don't allow rubygems to pollute what's loaded. Also, things boot faster
12-
# without the extra load time of rubygems. Only works on MRI.
13-
if is_mri; then
14-
export RUBYOPT="--disable=gem"
15-
fi
16-
1711
function clone_repo {
1812
if [ ! -d $1 ]; then # don't clone if the dir is already there
1913
if [ -z "$2" ]; then
@@ -58,7 +52,7 @@ function run_cukes {
5852
else
5953
# Prepare RUBYOPT for scenarios that are shelling out to ruby,
6054
# and PATH for those that are using `rspec` or `rake`.
61-
RUBYOPT="${RUBYOPT} -I${PWD}/../bundle -rbundler/setup" \
55+
RUBYOPT="--disable=gem -I${PWD}/../bundle -rbundler/setup" \
6256
PATH="${PWD}/bin:$PATH" \
6357
bin/cucumber --strict
6458
fi
@@ -82,9 +76,6 @@ function run_spec_suite_for {
8276
unset BUNDLE_GEMFILE
8377
bundle_install_flags="--binstubs --standalone --without documentation --path ../bundle"
8478
travis_retry eval "(unset RUBYOPT; exec bundle install $bundle_install_flags)"
85-
if [ $1 == rspec-rails ]; then
86-
unset RUBYOPT
87-
fi;
8879
run_specs_and_record_done
8980
popd
9081
else

0 commit comments

Comments
 (0)