You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2012/09/10 23:58:54 UTC
svn commit: r1383123 - in /subversion/trunk/subversion/tests/cmdline:
getopt_tests.py getopt_tests_data/svn--version--verbose_stdout
Author: brane
Date: Mon Sep 10 21:58:53 2012
New Revision: 1383123
URL: http://svn.apache.org/viewvc?rev=1383123&view=rev
Log:
Fix bug getopt_test 4.
* subversion/tests/cmdline/getopt_tests.py (switched_rep_lines_res): Fix regex.
* subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout: Cleanup.
Modified:
subversion/trunk/subversion/tests/cmdline/getopt_tests.py
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
Modified: subversion/trunk/subversion/tests/cmdline/getopt_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests.py?rev=1383123&r1=1383122&r2=1383123&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/getopt_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/getopt_tests.py Mon Sep 10 21:58:53 2012
@@ -113,7 +113,7 @@ switched_del_lines_res = [
# seen switch_res_line.
switched_rep_lines_res = [
# We don't care about the actual canonical host
- (re.compile('^\* running on'), '* running on'),
+ (re.compile('^\* running on.*$'), '* running on'),
]
def process_lines(lines):
Modified: subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout?rev=1383123&r1=1383122&r2=1383123&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout (original)
+++ subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout Mon Sep 10 21:58:53 2012
@@ -19,31 +19,31 @@ The following repository access (RA) mod
System information:
-* running on x86_64-apple-darwin11.4.0
+* running on i386-apple-darwin11.4.0
- Mac OS X 10.7.4 Lion, build 11E53
* linked dependencies:
- APR 1.4.2 (compiled with 1.4.2)
- APR-Util 1.3.10 (compiled with 1.3.10)
- SQLite 3.7.13 (compiled with 3.7.13)
* loaded shared libraries:
- - /Users/brane/bin/zvn (Intel 64-bit)
- - /opt/mine/subversion/lib/libsvn_client-1.0.dylib (Intel 64-bit)
- - /opt/mine/subversion/lib/libsvn_wc-1.0.dylib (Intel 64-bit)
- - /opt/mine/subversion/lib/libsvn_ra-1.0.dylib (Intel 64-bit)
- - /opt/mine/subversion/lib/libsvn_diff-1.0.dylib (Intel 64-bit)
- - /opt/mine/subversion/lib/libsvn_ra_local-1.0.dylib (Intel 64-bit)
- - /opt/mine/subversion/lib/libsvn_repos-1.0.dylib (Intel 64-bit)
- - /opt/mine/subversion/lib/libsvn_fs-1.0.dylib (Intel 64-bit)
- - /opt/mine/subversion/lib/libsvn_fs_fs-1.0.dylib (Intel 64-bit)
- - /opt/mine/subversion/lib/libsvn_fs_base-1.0.dylib (Intel 64-bit)
+ - /opt/subversion/bin/svn (Intel 64-bit)
+ - /opt/subversion/lib/libsvn_client-1.0.dylib (Intel 64-bit)
+ - /opt/subversion/lib/libsvn_wc-1.0.dylib (Intel 64-bit)
+ - /opt/subversion/lib/libsvn_ra-1.0.dylib (Intel 64-bit)
+ - /opt/subversion/lib/libsvn_diff-1.0.dylib (Intel 64-bit)
+ - /opt/subversion/lib/libsvn_ra_local-1.0.dylib (Intel 64-bit)
+ - /opt/subversion/lib/libsvn_repos-1.0.dylib (Intel 64-bit)
+ - /opt/subversion/lib/libsvn_fs-1.0.dylib (Intel 64-bit)
+ - /opt/subversion/lib/libsvn_fs_fs-1.0.dylib (Intel 64-bit)
+ - /opt/subversion/lib/libsvn_fs_base-1.0.dylib (Intel 64-bit)
- /usr/local/lib/libdb-5.3.dylib (Intel 64-bit)
- - /opt/mine/subversion/lib/libsvn_fs_util-1.0.dylib (Intel 64-bit)
- - /opt/mine/subversion/lib/libsvn_ra_svn-1.0.dylib (Intel 64-bit)
+ - /opt/subversion/lib/libsvn_fs_util-1.0.dylib (Intel 64-bit)
+ - /opt/subversion/lib/libsvn_ra_svn-1.0.dylib (Intel 64-bit)
- /usr/lib/libsasl2.2.dylib (Intel 64-bit)
- - /opt/mine/subversion/lib/libsvn_ra_serf-1.0.dylib (Intel 64-bit)
+ - /opt/subversion/lib/libsvn_ra_serf-1.0.dylib (Intel 64-bit)
- /usr/local/lib/libserf-1.0.dylib (Intel 64-bit)
- - /opt/mine/subversion/lib/libsvn_delta-1.0.dylib (Intel 64-bit)
- - /opt/mine/subversion/lib/libsvn_subr-1.0.dylib (Intel 64-bit)
+ - /opt/subversion/lib/libsvn_delta-1.0.dylib (Intel 64-bit)
+ - /opt/subversion/lib/libsvn_subr-1.0.dylib (Intel 64-bit)
- /usr/lib/libexpat.1.dylib (Intel 64-bit)
- /usr/lib/libz.1.dylib (Intel 64-bit)
- /usr/local/lib/libsqlite3.0.8.6.dylib (Intel 64-bit)