Author: prabhugs
Date: Thu Jun 13 10:42:06 2013
New Revision: 1492617
URL: http://svn.apache.org/r1492617
Log:
Formatting changes and no functional change except for the test-case.
Pass False to match_all to handle the debug traces when built with
--enable-maintainer-mode.
* subversion/libsvn_repos/dump.c
(notify_verification_error) : Format to c90 standards. No functional change.
(svn_repos_verify_fs3): Remove unused variables.
* subversion/tests/cmdline/svnadmin_tests.py
(verify_keep_going): Pass False for match_all in RegexListOutput to handle
the debug traces when built with --enable-maintainer-mode.
Delete the duplicate exp_err.
Modified:
subversion/branches/verify-keep-going/subversion/libsvn_repos/dump.c
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
Modified: subversion/branches/verify-keep-going/subversion/libsvn_repos/dump.c
URL:
http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/libsvn_repos/dump.c?rev=1492617&r1=1492616&r2=1492617&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/libsvn_repos/dump.c
(original)
+++ subversion/branches/verify-keep-going/subversion/libsvn_repos/dump.c Thu
Jun 13 10:42:06 2013
@@ -1339,9 +1339,11 @@ notify_verification_error(svn_revnum_t r
void *notify_baton,
apr_pool_t *pool)
{
+ svn_repos_notify_t *notify_failure;
+
if (notify_func == NULL)
return;
- svn_repos_notify_t *notify_failure;
+
notify_failure = svn_repos_notify_create(svn_repos_notify_failure, pool);
notify_failure->err = err;
notify_failure->revision = rev;
@@ -1507,14 +1509,6 @@ svn_repos_verify_fs3(svn_repos_t *repos,
for (rev = start_rev; rev <= end_rev; rev++)
{
- const svn_delta_editor_t *dump_editor;
- void *dump_edit_baton;
- const svn_delta_editor_t *cancel_editor;
- void *cancel_edit_baton;
- svn_fs_root_t *to_root;
- apr_hash_t *props;
- svn_error_t *err;
-
svn_pool_clear(iterpool);
/* Wrapper function to catch the possible errors. */
Modified:
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py?rev=1492617&r1=1492616&r2=1492617&view=diff
==============================================================================
---
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
(original)
+++
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
Thu Jun 13 10:42:06 2013
@@ -1858,7 +1858,8 @@ def verify_keep_going(sbox):
".*Verified revision 3."])
exp_err = svntest.verify.RegexListOutput(["svnadmin: E160004:.*",
- "svnadmin: E165011:.*"])
+ "svnadmin: E165011:.*"], False)
+
if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin
verify'.",
output, errput, exp_out, exp_err):
@@ -1872,9 +1873,6 @@ def verify_keep_going(sbox):
".*Verified revision 1.",
".*Error verifying revision 2."])
- exp_err = svntest.verify.RegexListOutput(["svnadmin: E160004:.*",
- "svnadmin: E165011:.*"])
-
if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin
verify'.",
output, errput, exp_out, exp_err):
raise svntest.Failure
