Author: rhuijben
Date: Thu Apr 21 22:00:57 2011
New Revision: 1095829
URL: http://svn.apache.org/viewvc?rev=1095829&view=rev
Log:
Fix the Windows shared library build by renaming a test tool to something
that contains the magic word 'test'. In that case it is linked against the
static libraries, which allows it to access private apis.
At the same time move it to the libsvn_wc specific tests folder.
* build.conf
(lock-wc-dir): Rename to ...
(wc-lock-tester): ... this and update paths.
(__ALL_TESTS__): Update reference
* subversion/tests/libsvn_wc
(svn:ignore): Add posix output to svn:ignore.
* subversion/tests/libsvn_wc/wc-lock-tester.c
Moved file here. Update names.
* subversion/tests/cmdline
(svn:ignore): Remove old output
* subversion/tests/cmdline/lock-wc-dir.c
Remove old file.
* subversion/tests/cmdline/svntest/actions.py
(lock_admin_dir): Update caller. Add optional recursive argument.
* subversion/tests/cmdline/svntest/main.py
(lock_wc_dir_binary): Rename to ...
(wc_lock_tester_binary): ... this and fix reference.
(run_lock_wc_dir): Rename to ...
(run_wc_lock_tester): ... this and update caller.
Added:
subversion/trunk/subversion/tests/libsvn_wc/wc-lock-tester.c
- copied, changed from r1095813,
subversion/trunk/subversion/tests/cmdline/lock-wc-dir.c
Removed:
subversion/trunk/subversion/tests/cmdline/lock-wc-dir.c
Modified:
subversion/trunk/build.conf
subversion/trunk/subversion/tests/cmdline/ (props changed)
subversion/trunk/subversion/tests/cmdline/svntest/actions.py
subversion/trunk/subversion/tests/cmdline/svntest/main.py
subversion/trunk/subversion/tests/libsvn_client/client-test.c
subversion/trunk/subversion/tests/libsvn_wc/ (props changed)
Modified: subversion/trunk/build.conf
URL:
http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1095829&r1=1095828&r2=1095829&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Thu Apr 21 22:00:57 2011
@@ -1026,15 +1026,14 @@ install = test
libs = libsvn_ra libsvn_subr apriconv apr
testing = skip
-[lock-wc-dir]
+[wc-lock-tester]
type = exe
-path = subversion/tests/cmdline
-sources = lock-wc-dir.c
+path = subversion/tests/libsvn_wc
+sources = wc-lock-tester.c
install = test
libs = libsvn_wc libsvn_subr apriconv apr
testing = skip
-
# ----------------------------------------------------------------------------
#
# EXTERNAL TARGETS (NO BUILD NEEDED)
@@ -1137,7 +1136,7 @@ libs = __ALL__
diff-diff3-test
ra-local-test
svndiff-test vdelta-test
- entries-dump atomic-ra-revprop-change lock-wc-dir
+ entries-dump atomic-ra-revprop-change wc-lock-tester
diff-test diff3-test diff4-test
client-test
tree-conflict-data-test db-test pristine-store-test entries-compat-test
op-depth-test
Propchange: subversion/trunk/subversion/tests/cmdline/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Apr 21 22:00:57 2011
@@ -7,5 +7,4 @@ httpd-*
.*~
entries-dump
atomic-ra-revprop-change
-lock-wc-dir
.libs
Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=1095829&r1=1095828&r2=1095829&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Thu Apr 21
22:00:57 2011
@@ -1696,11 +1696,11 @@ def get_virginal_state(wc_dir, rev):
return state
# Cheap administrative directory locking
-def lock_admin_dir(wc_dir):
+def lock_admin_dir(wc_dir, recursive=False):
"Lock a SVN administrative directory"
db, root_path, relpath = wc.open_wc_db(wc_dir)
- svntest.main.run_lock_wc_dir(False, wc_dir)
+ svntest.main.run_wc_lock_tester(recursive, wc_dir)
def get_wc_uuid(wc_dir):
"Return the UUID of the working copy at WC_DIR."
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1095829&r1=1095828&r2=1095829&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Thu Apr 21
22:00:57 2011
@@ -163,7 +163,7 @@ svndumpfilter_binary = os.path.abspath('
entriesdump_binary = os.path.abspath('entries-dump' + _exe)
atomic_ra_revprop_change_binary = os.path.abspath('atomic-ra-revprop-change' +
\
_exe)
-lock_wc_dir_binary = os.path.abspath('lock-wc-dir' + _exe)
+wc_lock_tester_binary = os.path.abspath('../libsvn_wc/wc-lock-tester' + _exe)
# Location to the pristine repository, will be calculated from test_area_url
# when we know what the user specified for --url.
@@ -654,13 +654,13 @@ def run_atomic_ra_revprop_change(url, re
url, revision, propname, skel,
options.http_library, want_error and 1 or 0)
-def run_lock_wc_dir(recursive, path):
+def run_wc_lock_tester(recursive, path):
"Run the wc-lock obtainer tool, returning its exit code, stdout and stderr"
if recursive:
option = "-r"
else:
option = "-1"
- return run_command(lock_wc_dir_binary, False, False, option, path)
+ return run_command(wc_lock_tester_binary, False, False, option, path)
def youngest(repos_path):
Modified: subversion/trunk/subversion/tests/libsvn_client/client-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/client-test.c?rev=1095829&r1=1095828&r2=1095829&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/client-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/client-test.c Thu Apr 21
22:00:57 2011
@@ -650,7 +650,7 @@ test_16k_add(const svn_test_opts_t *opts
&peg_rev, &rev, svn_depth_infinity,
TRUE, FALSE, ctx, pool));
- for (i = 0; i < 16384; i++)
+ for (i = 0; i < 4000; i++)
{
const char *path;
Propchange: subversion/trunk/subversion/tests/libsvn_wc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Apr 21 22:00:57 2011
@@ -7,3 +7,4 @@ pristine-store-test
svn-test-work
entries-compat-test
op-depth-test
+wc-lock-tester
Copied: subversion/trunk/subversion/tests/libsvn_wc/wc-lock-tester.c (from
r1095813, subversion/trunk/subversion/tests/cmdline/lock-wc-dir.c)
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/wc-lock-tester.c?p2=subversion/trunk/subversion/tests/libsvn_wc/wc-lock-tester.c&p1=subversion/trunk/subversion/tests/cmdline/lock-wc-dir.c&r1=1095813&r2=1095829&rev=1095829&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/lock-wc-dir.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/wc-lock-tester.c Thu Apr 21
22:00:57 2011
@@ -1,5 +1,5 @@
/*
- * lock-wc-dir.c : wrapper around svn_wc__acquire_write_lock()
+ * wc-lock-tester.c : wrapper around svn_wc__acquire_write_lock()
*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
@@ -106,7 +106,7 @@ main(int argc, const char *argv[])
if (err)
{
- svn_handle_error2(err, stderr, FALSE, "lock-wc-dir: ");
+ svn_handle_error2(err, stderr, FALSE, "wc-lock-tester: ");
svn_error_clear(err);
exit_code = EXIT_FAILURE;
}
