| OLD | NEW |
| 1 #!/usr/bin/env bash | 1 #!/usr/bin/env bash |
| 2 | 2 |
| 3 # Exit on any error. | 3 # Exit on any error. |
| 4 set -e | 4 set -e |
| 5 | 5 |
| 6 test_version() { | 6 test_version() { |
| 7 version=$1 | 7 version=$1 |
| 8 if [ "$version" == "jruby" ] ; then | 8 if [ "$version" == "jruby-1.7" ] ; then |
| 9 # No conformance tests yet -- JRuby is too broken to run them. | 9 # No conformance tests yet -- JRuby is too broken to run them. |
| 10 bash --login -c \ | 10 bash --login -c \ |
| 11 "rvm install $version && rvm use $version && \ | 11 "rvm install $version && rvm use $version && rvm get head && \ |
| 12 which ruby && \ | 12 which ruby && \ |
| 13 git clean -f && \ |
| 13 gem install bundler && bundle && \ | 14 gem install bundler && bundle && \ |
| 14 rake test" | 15 rake test" |
| 15 else | 16 else |
| 16 bash --login -c \ | 17 bash --login -c \ |
| 17 "rvm install $version && rvm use $version && \ | 18 "rvm install $version && rvm use $version && \ |
| 18 which ruby && \ | 19 which ruby && \ |
| 20 git clean -f && \ |
| 19 gem install bundler && bundle && \ | 21 gem install bundler && bundle && \ |
| 20 rake test && | 22 rake test && |
| 21 cd ../conformance && make test_ruby" | 23 cd ../conformance && make test_ruby" |
| 22 fi | 24 fi |
| 23 } | 25 } |
| 24 | 26 |
| 25 test_version $1 | 27 test_version $1 |
| OLD | NEW |