diff options
| author | Jie Luo <anandolee@gmail.com> | 2015-05-13 15:24:42 -0700 |
|---|---|---|
| committer | Jie Luo <anandolee@gmail.com> | 2015-05-13 15:24:42 -0700 |
| commit | 2d9b1c592ff7319ee9d6520c9df4838087522e05 (patch) | |
| tree | 6eec7e633840b5b60cc85e20f6365df0702e6911 /.travis.yml | |
| parent | 8a888922a9ac181a3fb47d00d497cde85ec4987a (diff) | |
| parent | 38da6583b1416a7c1594bffec3cdbb8856a72353 (diff) | |
| download | protobuf-2d9b1c592ff7319ee9d6520c9df4838087522e05.tar.gz protobuf-2d9b1c592ff7319ee9d6520c9df4838087522e05.tar.bz2 protobuf-2d9b1c592ff7319ee9d6520c9df4838087522e05.zip | |
Merge pull request #382 from jtattermusch/integrate_from_master
Integrate changes from latest master branch into csharp branch.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index cbddac58..354be896 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ script: - cd python && python setup.py build && python setup.py test && cd .. - export LD_LIBRARY_PATH=../src/.libs - cd python && python setup.py build --cpp_implementation && python setup.py test --cpp_implementation && cd .. + - cd conformance && make test_java && cd .. - make distcheck -j2 notifications: email: false |