| Index: third_party/protobuf/python/tox.ini
|
| diff --git a/third_party/protobuf/python/tox.ini b/third_party/protobuf/python/tox.ini
|
| index 301335bd41e9a3697d6a3d2185f0d956c66ad149..cf8d5401685110b5652e42ed6eee73e772855adf 100644
|
| --- a/third_party/protobuf/python/tox.ini
|
| +++ b/third_party/protobuf/python/tox.ini
|
| @@ -15,10 +15,8 @@ commands =
|
| cpp: python setup.py -q build --cpp_implementation --warnings_as_errors
|
| python: python setup.py -q test -q
|
| cpp: python setup.py -q test -q --cpp_implementation
|
| -# TODO(xiaofeng): Disabled because the Python testee program crashes on
|
| -# some conformance test inputs.
|
| -# python: python setup.py -q test_conformance
|
| -# cpp: python setup.py -q test_conformance --cpp_implementation
|
| + python: python setup.py -q test_conformance
|
| + cpp: python setup.py -q test_conformance --cpp_implementation
|
| deps =
|
| # Keep this list of dependencies in sync with setup.py.
|
| six>=1.9
|
|
|