Author: stefan2
Date: Fri Mar 20 19:01:42 2015
New Revision: 1668117
URL: http://svn.apache.org/r1668117
Log:
Partially undo r1667524. One of the tests is hard-coded to always use FSFS.
* subversion/tests/libsvn_fs/fs-test.c
(test_create_with_config_opts):
(test_create_with_config_opts): Rename to ...
(test_fsfs_config_opts): ... this. Execute for FSFS only.
(test_funcs): Update function name and test description.
Modified:
subversion/trunk/subversion/tests/libsvn_fs/fs-test.c
Modified: subversion/trunk/subversion/tests/libsvn_fs/fs-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs/fs-test.c?rev=1668117&r1=1668116&r2=1668117&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs/fs-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs/fs-test.c Fri Mar 20 19:01:42
2015
@@ -6715,8 +6715,8 @@ test_fs_merge(const svn_test_opts_t *opt
}
static svn_error_t *
-test_create_with_config_opts(const svn_test_opts_t *opts,
- apr_pool_t *pool)
+test_fsfs_config_opts(const svn_test_opts_t *opts,
+ apr_pool_t *pool)
{
apr_hash_t *fs_config;
svn_fs_t *fs;
@@ -6724,9 +6724,9 @@ test_create_with_config_opts(const svn_t
const svn_fs_fsfs_info_t *fsfs_info;
/* Bail (with SKIP) on known-untestable scenarios */
- if (strcmp(opts->fs_type, SVN_FS_TYPE_BDB) == 0)
+ if (strcmp(opts->fs_type, SVN_FS_TYPE_FSFS) != 0)
return svn_error_create(SVN_ERR_TEST_SKIPPED, NULL,
- "this will not test BDB repositories");
+ "this will test FSFS repositories only");
/* Remove the test directory from previous runs. */
SVN_ERR(svn_io_remove_dir2("test-fsfs-config-opts", TRUE, NULL, NULL, pool));
@@ -7108,8 +7108,8 @@ static struct svn_test_descriptor_t test
"get a delta stream on a file"),
SVN_TEST_OPTS_PASS(test_fs_merge,
"get merging txns with newer revisions"),
- SVN_TEST_OPTS_PASS(test_create_with_config_opts,
- "test creating a repository with different opts"),
+ SVN_TEST_OPTS_PASS(test_fsfs_config_opts,
+ "test creating FSFS repository with different opts"),
SVN_TEST_OPTS_PASS(test_txn_pool_lifetime,
"test pool lifetime dependencies with txn roots"),
SVN_TEST_OPTS_PASS(test_modify_txn_being_written,
