diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2016-01-12 15:30:35 -0800 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2016-01-12 15:30:35 -0800 |
| commit | 937ef23acd2cb7554224b4f9cc33c436e54bddf1 (patch) | |
| tree | 51ec290ad03a2d02ec0c5336ab6f7ca44e36870f /ruby/travis-test.sh | |
| parent | da2eb68dd3ca18f152f8d7520e424b027ad729e5 (diff) | |
| parent | 7e74a02b17a5c2f6e67402455e9f32c360219ada (diff) | |
| download | protobuf-937ef23acd2cb7554224b4f9cc33c436e54bddf1.tar.gz protobuf-937ef23acd2cb7554224b4f9cc33c436e54bddf1.tar.bz2 protobuf-937ef23acd2cb7554224b4f9cc33c436e54bddf1.zip | |
Merge pull request #1080 from haberman/conformance-crashes
Allow conformance test runner to tolerate crashes, and re-enable conformance tests
Diffstat (limited to 'ruby/travis-test.sh')
| -rwxr-xr-x | ruby/travis-test.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ruby/travis-test.sh b/ruby/travis-test.sh index 1b53dd78..75db7d93 100755 --- a/ruby/travis-test.sh +++ b/ruby/travis-test.sh @@ -17,11 +17,8 @@ test_version() { "rvm install $version && rvm use $version && \ which ruby && \ gem install bundler && bundle && \ - rake test" - # TODO(xiaofeng): Conformance tests are disabled because the ruby testee - # program crashes on some inputs. - # cd ../conformance && \ - # make test_ruby + rake test && + cd ../conformance && make test_ruby" fi } |