aboutsummaryrefslogtreecommitdiff
path: root/travis.sh
diff options
context:
space:
mode:
authorJosh Haberman <jhaberman@gmail.com>2015-12-30 16:03:49 -0800
committerJosh Haberman <jhaberman@gmail.com>2016-01-11 16:15:46 -0800
commite891c29f9bc6aec94db80d44ed8c24d4142f7c3f (patch)
treecf2b27b5a8fda53820c724d5ab130247c4ff4ddc /travis.sh
parentc64146f195881f349bf470948d7b5e1e3704b077 (diff)
downloadprotobuf-e891c29f9bc6aec94db80d44ed8c24d4142f7c3f.tar.gz
protobuf-e891c29f9bc6aec94db80d44ed8c24d4142f7c3f.tar.bz2
protobuf-e891c29f9bc6aec94db80d44ed8c24d4142f7c3f.zip
Allow conformance test runner to tolerate crashes, and re-enable conformance tests.
Diffstat (limited to 'travis.sh')
-rwxr-xr-xtravis.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/travis.sh b/travis.sh
index 97a769d7..5a77a2a8 100755
--- a/travis.sh
+++ b/travis.sh
@@ -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() {