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 /travis.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 'travis.sh')
| -rwxr-xr-x | travis.sh | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -53,9 +53,7 @@ build_csharp() { (cd csharp/src; mono ../../nuget.exe restore) csharp/buildall.sh - # TODO(xiaofeng): The conformance tests are disable because the testee program - # crashes on some inputs. - # cd conformance && make test_csharp && cd .. + cd conformance && make test_csharp && cd .. } build_golang() { |