Appended is a patch to clean up 'make check' if the user does not have
Python 2.1 installed. A ChangeLog message is included.
--s
Ft. Meade Washington Albanian FSF [Hello to all my fans in domestic surveillance]
class struggle AP President Saddam Hussein direct action Clinton quiche
( http://lesser-magoo.lcs.mit.edu/~cananian )
----------------------------
2001-09-05 C. Scott Ananian <cananian@mit.edu>
* commit_tests.py
* prop_tests.py
* schedule_tests.py
* svnadmin_tests.py
Clean up the 'make check' output when the user has a pre-2.1 version
of Python on their machine. Now the standard error shows that the
test was skipped but counted as successful as '...[SKIPPED] SUCCESS'
while the standard out (which is redirected to tests.log) shows
why the test was skipped (probably python version < 2.1) and the
traceback for the syntax error caught.
Index: ./trunk/subversion/tests/clients/cmdline/commit_tests.py
===================================================================
--- ./trunk/subversion/tests/clients/cmdline/SVN/text-base/commit_tests.py Wed Sep 5 15:32:24 2001
+++ ./trunk/subversion/tests/clients/cmdline/commit_tests.py Wed Sep 5 15:53:32 2001
@@ -23,8 +23,9 @@
try:
import svntest
except SyntaxError:
+ sys.stderr.write('[SKIPPED] ')
print "<<< Please make sure you have Python 2.1 or better! >>>"
- traceback.print_exc()
+ traceback.print_exc(None,sys.stdout)
raise SystemExit
# Quick macro for auto-generating sandbox names
Index: ./trunk/subversion/tests/clients/cmdline/schedule_tests.py
===================================================================
--- ./trunk/subversion/tests/clients/cmdline/SVN/text-base/schedule_tests.py Wed Sep 5 15:32:24 2001
+++ ./trunk/subversion/tests/clients/cmdline/schedule_tests.py Wed Sep 5 15:53:58 2001
@@ -24,8 +24,9 @@
try:
import svntest
except SyntaxError:
+ sys.stderr.write('[SKIPPED] ')
print "<<< Please make sure you have Python 2.1 or better! >>>"
- traceback.print_exc()
+ traceback.print_exc(None,sys.stdout)
raise SystemExit
# Quick macro for auto-generating sandbox names
Index: ./trunk/subversion/tests/clients/cmdline/svnadmin_tests.py
===================================================================
--- ./trunk/subversion/tests/clients/cmdline/SVN/text-base/svnadmin_tests.py Wed Sep 5 15:32:24 2001
+++ ./trunk/subversion/tests/clients/cmdline/svnadmin_tests.py Wed Sep 5 15:54:14 2001
@@ -23,8 +23,9 @@
try:
import svntest
except SyntaxError:
+ sys.stderr.write('[SKIPPED] ')
print "<<< Please make sure you have Python 2.1 or better! >>>"
- traceback.print_exc()
+ traceback.print_exc(None,sys.stdout)
raise SystemExit
# Quick macro for auto-generating sandbox names
Index: ./trunk/subversion/tests/clients/cmdline/prop_tests.py
===================================================================
--- ./trunk/subversion/tests/clients/cmdline/SVN/text-base/prop_tests.py Wed Sep 5 15:32:24 2001
+++ ./trunk/subversion/tests/clients/cmdline/prop_tests.py Wed Sep 5 15:53:41 2001
@@ -23,8 +23,9 @@
try:
import svntest
except SyntaxError:
+ sys.stderr.write('[SKIPPED] ')
print "<<< Please make sure you have Python 2.1 or better! >>>"
- traceback.print_exc()
+ traceback.print_exc(None,sys.stdout)
raise SystemExit
# Quick macro for auto-generating sandbox names
Index: ./trunk/subversion/tests/clients/cmdline/basic_tests.py
===================================================================
--- ./trunk/subversion/tests/clients/cmdline/SVN/text-base/basic_tests.py Wed Sep 5 15:32:24 2001
+++ ./trunk/subversion/tests/clients/cmdline/basic_tests.py Wed Sep 5 15:52:18 2001
@@ -23,8 +23,9 @@
try:
import svntest
except SyntaxError:
+ sys.stderr.write('[SKIPPED] ')
print "<<< Please make sure you have Python 2.1 or better! >>>"
- traceback.print_exc()
+ traceback.print_exc(None,sys.stdout)
raise SystemExit
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:40 2006