You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2010/11/10 13:06:31 UTC
svn commit: r1033425 - in /subversion/branches/1.6.x: ./ STATUS
build/run_tests.py win-tests.py
Author: danielsh
Date: Wed Nov 10 12:06:31 2010
New Revision: 1033425
URL: http://svn.apache.org/viewvc?rev=1033425&view=rev
Log:
Merge r964349, resolving conflicts:
* r964349
Create fails.log files for test runs.
Justification:
Developer convenience.
Notes:
Somewhat non-trivial merge conflicts.
Votes:
+1: danielsh, cmpilato, stsp
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/build/run_tests.py
subversion/branches/1.6.x/win-tests.py
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 12:06:31 2010
@@ -97,4 +97,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877219,877230,877234,877237,877239,877243,877249,877259,877261,877304,877319,877407,877437,877441-87744
2,877453,877459,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,
879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939375-939376,944635,945350,946767,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,962377-962378,964167,964767,965405,965469,965508,979045,979429,980811,981449,981921,984928,984931,991534,996884,997457,997466,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1027957,1028108,1032808,1033166
+/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877219,877230,877234,877237,877239,877243,877249,877259,877261,877304,877319,877407,877437,877441-87744
2,877453,877459,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,
879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939375-939376,944635,945350,946767,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,962377-962378,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984928,984931,991534,996884,997457,997466,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1027957,1028108,1032808,1033166
Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1033425&r1=1033424&r2=1033425&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Wed Nov 10 12:06:31 2010
@@ -271,12 +271,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r964349
- Create fails.log files for test runs.
- Justification:
- Developer convenience.
- Notes:
- Somewhat non-trivial merge conflicts.
- Votes:
- +1: danielsh, cmpilato, stsp
Modified: subversion/branches/1.6.x/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/build/run_tests.py?rev=1033425&r1=1033424&r2=1033425&view=diff
==============================================================================
--- subversion/branches/1.6.x/build/run_tests.py (original)
+++ subversion/branches/1.6.x/build/run_tests.py Wed Nov 10 12:06:31 2010
@@ -15,7 +15,7 @@ to the TestHarness constructor. All oth
test programs.
'''
-import os, sys
+import os, re, sys
import time
import getopt
@@ -28,7 +28,7 @@ class TestHarness:
'''Test harness for Subversion tests.
'''
- def __init__(self, abs_srcdir, abs_builddir, logfile,
+ def __init__(self, abs_srcdir, abs_builddir, logfile, faillogfile,
base_url=None, fs_type=None, http_library=None,
server_minor_version=None, verbose=None,
cleanup=None, enable_sasl=None, parallel=None, config_file=None,
@@ -47,6 +47,7 @@ class TestHarness:
self.srcdir = abs_srcdir
self.builddir = abs_builddir
self.logfile = logfile
+ self.faillogfile = faillogfile
self.base_url = base_url
self.fs_type = fs_type
self.http_library = http_library
@@ -106,6 +107,27 @@ class TestHarness:
's'*min(len(failed_list), 1)))
if xpassed:
print(' %d test%s XPASSED' % (len(xpassed), 's'*min(len(xpassed), 1)))
+ # Copy the truly interesting verbose logs to a separate file, for easier
+ # viewing.
+ if xpassed or failed_list:
+ faillog = open(self.faillogfile, 'wb')
+ last_start_lineno = None
+ last_start_re = re.compile('^(FAIL|SKIP|XFAIL|PASS|START|CLEANUP|END):')
+ for lineno, line in enumerate(log_lines):
+ # Iterate the lines. If it ends a test we're interested in, dump that
+ # test to FAILLOG. If it starts a test (at all), remember the line
+ # number (in case we need it later).
+ if line in xpassed or line in failed_list:
+ faillog.write('[[[\n')
+ faillog.writelines(log_lines[last_start_lineno : lineno+1])
+ faillog.write(']]]\n\n')
+ if last_start_re.match(line):
+ last_start_lineno = lineno + 1
+ faillog.close()
+ elif os.path.exists(self.faillogfile):
+ print("WARNING: no failures, but '%s' exists from a previous run."
+ % self.faillogfile)
+
self._close_log()
return failed
@@ -281,7 +303,7 @@ def main():
raise getopt.GetoptError
th = TestHarness(args[0], args[1],
- os.path.abspath('tests.log'),
+ os.path.abspath('tests.log'), os.path.abspath('fails.log'),
base_url, fs_type, http_library, server_minor_version,
verbose, cleanup, enable_sasl, parallel, config_file,
fsfs_sharding, fsfs_packing)
Modified: subversion/branches/1.6.x/win-tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/win-tests.py?rev=1033425&r1=1033424&r2=1033425&view=diff
==============================================================================
--- subversion/branches/1.6.x/win-tests.py (original)
+++ subversion/branches/1.6.x/win-tests.py Wed Nov 10 12:06:31 2010
@@ -103,6 +103,7 @@ base_url, fs_type, verbose, cleanup = No
repo_loc = 'local repository.'
objdir = 'Debug'
log = 'tests.log'
+faillog = 'fails.log'
run_svnserve = None
svnserve_args = None
run_httpd = None
@@ -196,13 +197,16 @@ if base_url:
repo_loc = 'remote repository ' + base_url + '.'
if base_url[:4] == 'http':
log = 'dav-tests.log'
+ faillog = 'dav-fails.log'
elif base_url[:3] == 'svn':
log = 'svn-tests.log'
+ faillog = 'svn-fails.log'
run_svnserve = 1
else:
# Don't know this scheme, but who're we to judge whether it's
# correct or not?
log = 'url-tests.log'
+ faillog = 'url-fails.log'
# Have to move the executables where the tests expect them to be
copied_execs = [] # Store copied exec files to avoid the final dir scan
@@ -583,6 +587,7 @@ sys.path.insert(0, os.path.join(abs_srcd
import run_tests
th = run_tests.TestHarness(abs_srcdir, abs_builddir,
os.path.join(abs_builddir, log),
+ os.path.join(abs_builddir, faillog),
base_url, fs_type, http_library,
server_minor_version, 1, cleanup,
enable_sasl, parallel, config_file,