diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2016-01-12 15:30:35 -0800 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2016-01-12 15:30:35 -0800 |
| commit | 937ef23acd2cb7554224b4f9cc33c436e54bddf1 (patch) | |
| tree | 51ec290ad03a2d02ec0c5336ab6f7ca44e36870f /python/setup.py | |
| parent | da2eb68dd3ca18f152f8d7520e424b027ad729e5 (diff) | |
| parent | 7e74a02b17a5c2f6e67402455e9f32c360219ada (diff) | |
| download | protobuf-937ef23acd2cb7554224b4f9cc33c436e54bddf1.tar.gz protobuf-937ef23acd2cb7554224b4f9cc33c436e54bddf1.tar.bz2 protobuf-937ef23acd2cb7554224b4f9cc33c436e54bddf1.zip | |
Merge pull request #1080 from haberman/conformance-crashes
Allow conformance test runner to tolerate crashes, and re-enable conformance tests
Diffstat (limited to 'python/setup.py')
| -rwxr-xr-x | python/setup.py | 4 |
1 files changed, 4 insertions, 0 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) |