subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1326289 - /subversion/trunk/build/run_tests.py
Date Sun, 15 Apr 2012 09:23:01 GMT
Author: danielsh
Date: Sun Apr 15 09:23:01 2012
New Revision: 1326289

URL: http://svn.apache.org/viewvc?rev=1326289&view=rev
Log:
* build/run_tests.py
  (_get_term_width): Prefer $SVN_MAKE_CHECK_LINES and $SVN_MAKE_CHECK_COLUMNS
    to ioctl(GWINSZ).

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=1326289&r1=1326288&r2=1326289&view=diff
==============================================================================
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Sun Apr 15 09:23:01 2012
@@ -84,7 +84,16 @@ def _get_term_width():
       return None
     return cr
 
-  cr = ioctl_GWINSZ(0) or ioctl_GWINSZ(1) or ioctl_GWINSZ(2)
+  cr = None
+  if not cr:
+    try:
+      cr = (os.environ['SVN_MAKE_CHECK_LINES'],
+	          os.environ['SVN_MAKE_CHECK_COLUMNS'])
+    except:
+      raise Exception(`cr`)
+      cr = None
+  if not cr:
+    cr = ioctl_GWINSZ(0) or ioctl_GWINSZ(1) or ioctl_GWINSZ(2)
   if not cr:
     try:
       fd = os.open(os.ctermid(), os.O_RDONLY)



Mime
View raw message