diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2015-12-30 16:03:49 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-01-11 16:15:46 -0800 |
| commit | e891c29f9bc6aec94db80d44ed8c24d4142f7c3f (patch) | |
| tree | cf2b27b5a8fda53820c724d5ab130247c4ff4ddc /python | |
| parent | c64146f195881f349bf470948d7b5e1e3704b077 (diff) | |
| download | protobuf-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 'python')
| -rwxr-xr-x | python/setup.py | 4 | ||||
| -rw-r--r-- | python/tox.ini | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/python/setup.py b/python/setup.py index 1223775c..6ea3bad7 100755 --- a/python/setup.py +++ b/python/setup.py @@ -149,6 +149,10 @@ class build_py(_build_py): class test_conformance(_build_py): target = 'test_python' def run(self): + if sys.version_info >= (2, 7): + # Python 2.6 dodges these extra failures. + os.environ["CONFORMANCE_PYTHON_EXTRA_FAILURES"] = ( + "--failure_list failure_list_python-post26.txt") cmd = 'cd ../conformance && make %s' % (test_conformance.target) status = subprocess.check_call(cmd, shell=True) diff --git a/python/tox.ini b/python/tox.ini index 301335bd..cf8d5401 100644 --- a/python/tox.ini +++ b/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 |