More Travis testing

toolset/setup/linux/languages/jruby-1.7.13.sh

@@ -9,9 +9,19 @@ RETCODE=$(fw_exists ${IROOT}/jruby-${JRUBY_VERSION}.installed)
   source $IROOT/jruby-$JRUBY_VERSION.installed
   return 0; }
 
-rvm install jruby-$JRUBY_VERSION
-# Bundler is SOMETIMES missing... not sure why.
-rvm jruby-$JRUBY_VERSION do gem install bundler
+# We assume single-user installation as 
+# done in our rvm.sh script and 
+# in Travis-CI
+if [ "$TRAVIS" = "true" ]
+then
+  rvmsudo rvm install jruby-$JRUBY_VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  rvmsudo rvm jruby-$JRUBY_VERSION do gem install bundler
+else
+  rvm install jruby-$JRUBY_VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  rvm jruby-$JRUBY_VERSION do gem install bundler
+fi
 
 echo "" > $IROOT/jruby-$JRUBY_VERSION.installed
 

toolset/setup/linux/languages/jruby-1.7.8.sh

@@ -9,9 +9,19 @@ RETCODE=$(fw_exists ${IROOT}/jruby-${JRUBY_VERSION}.installed)
   source $IROOT/jruby-$JRUBY_VERSION.installed
   return 0; }
 
-rvm install jruby-$JRUBY_VERSION
-# Bundler is SOMETIMES missing... not sure why.
-rvm jruby-$JRUBY_VERSION do gem install bundler
+# We assume single-user installation as 
+# done in our rvm.sh script and 
+# in Travis-CI
+if [ "$TRAVIS" = "true" ]
+then
+  rvmsudo rvm install jruby-$JRUBY_VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  rvmsudo rvm jruby-$JRUBY_VERSION do gem install bundler
+else
+  rvm install jruby-$JRUBY_VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  rvm jruby-$JRUBY_VERSION do gem install bundler
+fi
 
 echo "" > $IROOT/jruby-$JRUBY_VERSION.installed
 

toolset/setup/linux/languages/jruby-9k.sh

@@ -12,9 +12,19 @@ RETCODE=$(fw_exists ${IROOT}/jruby-${JRUBY_VERSION}.installed)
   source $IROOT/jruby-$JRUBY_VERSION.installed
   return 0; }
 
-rvm install jruby-$JRUBY_VERSION
-# Bundler is SOMETIMES missing... not sure why.
-rvm jruby-$JRUBY_VERSION do gem install bundler
+# We assume single-user installation as
+# done in our rvm.sh script and
+# in Travis-CI
+if [ "$TRAVIS" = "true" ]
+then
+  rvmsudo rvm install jruby-$JRUBY_VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  rvmsudo rvm jruby-$JRUBY_VERSION do gem install bundler
+else
+  rvm install jruby-$JRUBY_VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  rvm jruby-$JRUBY_VERSION do gem install bundler
+fi
 
 echo "" > $IROOT/jruby-$JRUBY_VERSION.installed
 

toolset/setup/linux/languages/rbx-2.2.10.sh

@@ -10,9 +10,21 @@ RETCODE=$(fw_exists ${IROOT}/rbx.installed)
 
 VERSION=2.2.10
 
-SHELL="/bin/bash" rvm install rbx-$VERSION
-# Bundler is SOMETIMES missing... not sure why.
-SHELL="/bin/bash" rvm rbx-$VERSION do gem install bundler
+# We assume single-user installation as 
+# done in our rvm.sh script and 
+# in Travis-CI
+if [ "$TRAVIS" = "true" ]
+then
+  # Rubinus cannot find libc during configure unless
+  # you specify bash as the shell.
+  SHELL="/bin/bash" rvmsudo rvm install rbx-$VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  SHELL="/bin/bash" rvmsudo rvm rbx-$VERSION do gem install bundler
+else
+  SHELL="/bin/bash" rvm install rbx-$VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  SHELL="/bin/bash" rvm rbx-$VERSION do gem install bundler
+fi
 
 echo "export LC_ALL=en_US.UTF-8" > $IROOT/rbx.installed
 echo "export LANG=en_US.UTF-8" >> $IROOT/rbx.installed

toolset/setup/linux/languages/ruby-2.0.0.sh

@@ -9,9 +9,19 @@ RETCODE=$(fw_exists ${IROOT}/ruby-${VERSION}.installed)
   source $IROOT/ruby-$VERSION.installed
   return 0; }
 
-rvm install $VERSION
-# Bundler is SOMETIMES missing... not sure why.
-rvm $VERSION do gem install bundler
+# We assume single-user installation as 
+# done in our rvm.sh script and 
+# in Travis-CI
+if [ "$TRAVIS" = "true" ]
+then
+  rvmsudo rvm install $VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  rvmsudo rvm $VERSION do gem install bundler
+else
+  rvm install $VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  rvm $VERSION do gem install bundler
+fi
 
 echo "" > $IROOT/ruby-$VERSION.installed
 

toolset/setup/linux/languages/ruby-2.1.2.sh

@@ -9,9 +9,19 @@ RETCODE=$(fw_exists ${IROOT}/ruby-${VERSION}.installed)
   source $IROOT/ruby-$VERSION.installed
   return 0; }
 
-rvm install $VERSION
-# Bundler is SOMETIMES missing... not sure why.
-rvm $VERSION do gem install bundler
+# We assume single-user installation as 
+# done in our rvm.sh script and 
+# in Travis-CI
+if [ "$TRAVIS" = "true" ]
+then
+  rvmsudo rvm install $VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  rvmsudo rvm $VERSION do gem install bundler
+else
+  rvm install $VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  rvm $VERSION do gem install bundler
+fi
 
 echo "" > $IROOT/ruby-$VERSION.installed
 

toolset/setup/linux/languages/ruby-2.2.sh

@@ -12,9 +12,19 @@ RETCODE=$(fw_exists ${IROOT}/ruby-${MRI_VERSION}.installed)
   source $IROOT/ruby-$MRI_VERSION.installed
   return 0; }
 
-rvm install $MRI_VERSION
-# Bundler is SOMETIMES missing... not sure why.
-rvm $MRI_VERSION do gem install bundler
+# We assume single-user installation as
+# done in our rvm.sh script and
+# in Travis-CI
+if [ "$TRAVIS" = "true" ]
+then
+  rvmsudo rvm install $MRI_VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  rvmsudo rvm $MRI_VERSION do gem install bundler
+else
+  rvm install $MRI_VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  rvm $MRI_VERSION do gem install bundler
+fi
 
 echo "" > $IROOT/ruby-$MRI_VERSION.installed
 

toolset/setup/linux/languages/rvm.sh

@@ -7,11 +7,18 @@ RETCODE=$(fw_exists rvm.installed)
   return 0;
 }
 
-  # Run single-user installation and source rvm
-export SHELL=/bin/bash
-gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3
-\curl -sSL https://get.rvm.io | bash -s stable
-
-echo "source ~/.rvm/scripts/rvm" > $IROOT/rvm.installed
+# Never run installation inside of TRAVIS, 
+# just rely on their default RVM installaton
+if [ "$TRAVIS" = "true" ]
+then
+  #echo "source /home/travis/.rvm/scripts/rvm" > $IROOT/rvm.installed
+  echo "" > $IROOT/rvm.installed
+  which rvm
+else
+  export SHELL=/bin/bash
+  gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3
+  \curl -sSL https://get.rvm.io | bash -s stable
+  echo "source ~/.rvm/scripts/rvm" > $IROOT/rvm.installed
+fi
 
 source $IROOT/rvm.installed