Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1340)

Unified Diff: third_party/protobuf/python/tox.ini

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: owners Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/protobuf/python/setup.py ('k') | third_party/protobuf/ruby/Gemfile.lock » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « third_party/protobuf/python/setup.py ('k') | third_party/protobuf/ruby/Gemfile.lock » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698