fix test script on 1.8

lostisland · Mar 25, 2013 · 4586edf · 4586edf
1 parent 1e1863e
commit 4586edf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
-bundler_args: --without development
+bundler_args: --standalone --without development
+script: RUBYLIB=./bundle script/test
 
 env:
   - SSL=no
@@ -25,5 +26,3 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-
-script: script/test
diff --git a/script/test b/script/test
@@ -16,8 +16,8 @@
 #   $ SSL=yes script/test net_http -- -n /ssl/
 set -e
 
-if ! grep bundler/setup <<<"$RUBYOPT" >/dev/null; then
-  export RUBYOPT="$RUBYOPT -rubygems -rbundler/setup"
+if [[ "$RUBYOPT" != *"bundler/setup"* ]]; then
+  export RUBYOPT="-rbundler/setup $RUBYOPT"
 fi
 
 port=3999