Author: hwright
Date: Fri Aug 5 01:08:09 2011
New Revision: 1154060
URL: http://svn.apache.org/viewvc?rev=1154060&view=rev
Log:
Catch a python exception to running tests to ensure we don't kill the entire
testing process. (This particular exception crops up if we have trouble
initializing the given test suite.)
* build/run_tests.py
(_run_py_test): Catch a thrown SVNProcessTerminatedBySignal exception when
running the tests, and mark that suite as failed.
Modified:
subversion/trunk/build/run_tests.py
Modified: subversion/trunk/build/run_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?rev=1154060&r1=1154059&r2=1154060&view=diff
==============================================================================
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Fri Aug 5 01:08:09 2011
@@ -453,11 +453,16 @@ class TestHarness:
else:
test_selection = []
- failed = svntest.main.execute_tests(prog_mod.test_list,
- serial_only=serial_only,
- test_name=progbase,
- progress_func=prog_f,
- test_selection=test_selection)
+ try:
+ failed = svntest.main.execute_tests(prog_mod.test_list,
+ serial_only=serial_only,
+ test_name=progbase,
+ progress_func=prog_f,
+ test_selection=test_selection)
+ except svntest.main.SVNProcessTerminatedBySignal:
+ if self.log:
+ os.write(old_stdout, '.' * dot_count)
+ failed = True
# restore some values
sys.path = old_path
