You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2014/03/11 16:44:23 UTC
svn commit: r1576386 - /subversion/trunk/subversion/tests/svn_test_fs.c
Author: rhuijben
Date: Tue Mar 11 15:44:22 2014
New Revision: 1576386
URL: http://svn.apache.org/r1576386
Log:
Following up on r1576377, integrate the fs configuration setup with
the existing settings.
* subversion/tests/svn_test_fs.c
(make_fs_config): Move config here. Use svn_hash_sets().
(svn_test__create_repos): Remove accidental overrides here.
Modified:
subversion/trunk/subversion/tests/svn_test_fs.c
Modified: subversion/trunk/subversion/tests/svn_test_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test_fs.c?rev=1576386&r1=1576385&r2=1576386&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/svn_test_fs.c (original)
+++ subversion/trunk/subversion/tests/svn_test_fs.c Tue Mar 11 15:44:22 2014
@@ -75,11 +75,10 @@ make_fs_config(const char *fs_type,
apr_pool_t *pool)
{
apr_hash_t *fs_config = apr_hash_make(pool);
- apr_hash_set(fs_config, SVN_FS_CONFIG_BDB_TXN_NOSYNC,
- APR_HASH_KEY_STRING, "1");
- apr_hash_set(fs_config, SVN_FS_CONFIG_FS_TYPE,
- APR_HASH_KEY_STRING,
- fs_type);
+
+ svn_hash_sets(fs_config, SVN_FS_CONFIG_BDB_TXN_NOSYNC, "1");
+ svn_hash_sets(fs_config, SVN_FS_CONFIG_BDB_LOG_AUTOREMOVE, "1");
+ svn_hash_sets(fs_config, SVN_FS_CONFIG_FS_TYPE, fs_type);
if (server_minor_version)
{
svn_hash_sets(fs_config, SVN_FS_CONFIG_COMPATIBLE_VERSION,
@@ -223,11 +222,6 @@ svn_test__create_repos(svn_repos_t **rep
apr_hash_t *fs_config = make_fs_config(opts->fs_type,
opts->server_minor_version, pool);
- /* Apply the same defaults svnadmin would set when not passing
- additional arguments. */
- svn_hash_sets(fs_config, SVN_FS_CONFIG_BDB_TXN_NOSYNC, "0");
- svn_hash_sets(fs_config, SVN_FS_CONFIG_BDB_LOG_AUTOREMOVE, "1");
-
/* If there's already a repository named NAME, delete it. Doing
things this way means that repositories stick around after a
failure for postmortem analysis, but also that tests can be