From e891c29f9bc6aec94db80d44ed8c24d4142f7c3f Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Wed, 30 Dec 2015 16:03:49 -0800
Subject: Allow conformance test runner to tolerate crashes, and re-enable
 conformance tests.

---
 python/tox.ini | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'python/tox.ini')

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
-- 
cgit v1.2.3