subversion-1.9.7HEADsubversion-1.9.7master

3 files changed, 21 insertions, 9 deletions

diff --git a/subversion/tests/libsvn_fs_base/changes-test.c b/subversion/tests/libsvn_fs_base/changes-test.c
index b93410e..a637203 100644
--- a/subversion/tests/libsvn_fs_base/changes-test.c
+++ b/subversion/tests/libsvn_fs_base/changes-test.c
@@ -193,7 +193,7 @@ changes_fetch_raw(const svn_test_opts_t *opts,
   struct changes_args args;
 
   /* Create a new fs and repos */
-  SVN_ERR(svn_test__create_bdb_fs(&fs, "test-repo-changes-fetch", opts,
+  SVN_ERR(svn_test__create_bdb_fs(&fs, "test-repo-changes-fetch-raw", opts,
                                   pool));
 
   /* First, verify that we can request changes for an arbitrary key
@@ -903,7 +903,9 @@ changes_bad_sequences(const svn_test_opts_t *opts,
 
 /* The test table.  */
 
-struct svn_test_descriptor_t test_funcs[] =
+static int max_threads = 4;
+
+static struct svn_test_descriptor_t test_funcs[] =
   {
     SVN_TEST_NULL,
     SVN_TEST_OPTS_PASS(changes_add,
@@ -920,3 +922,5 @@ struct svn_test_descriptor_t test_funcs[] =
                        "verify that bad change sequences raise errors"),
     SVN_TEST_NULL
   };
+
+SVN_TEST_MAIN
diff --git a/subversion/tests/libsvn_fs_base/fs-base-test.c b/subversion/tests/libsvn_fs_base/fs-base-test.c
index d16deae..20d4d63 100644
--- a/subversion/tests/libsvn_fs_base/fs-base-test.c
+++ b/subversion/tests/libsvn_fs_base/fs-base-test.c
@@ -124,7 +124,7 @@ static svn_error_t *
 check_entry_present(svn_fs_root_t *root, const char *path,
                     const char *name, apr_pool_t *pool)
 {
-  svn_boolean_t present;
+  svn_boolean_t present = FALSE;
   SVN_ERR(check_entry(root, path, name, &present, pool));
 
   if (! present)
@@ -141,7 +141,7 @@ static svn_error_t *
 check_entry_absent(svn_fs_root_t *root, const char *path,
                    const char *name, apr_pool_t *pool)
 {
-  svn_boolean_t present;
+  svn_boolean_t present = TRUE;
   SVN_ERR(check_entry(root, path, name, &present, pool));
 
   if (present)
@@ -213,7 +213,7 @@ check_id(svn_fs_t *fs, const svn_fs_id_t *id, svn_boolean_t *present,
 static svn_error_t *
 check_id_present(svn_fs_t *fs, const svn_fs_id_t *id, apr_pool_t *pool)
 {
-  svn_boolean_t present;
+  svn_boolean_t present = FALSE;
   SVN_ERR(check_id(fs, id, &present, pool));
 
   if (! present)
@@ -233,7 +233,7 @@ check_id_present(svn_fs_t *fs, const svn_fs_id_t *id, apr_pool_t *pool)
 static svn_error_t *
 check_id_absent(svn_fs_t *fs, const svn_fs_id_t *id, apr_pool_t *pool)
 {
-  svn_boolean_t present;
+  svn_boolean_t present = TRUE;
   SVN_ERR(check_id(fs, id, &present, pool));
 
   if (present)
@@ -1519,7 +1519,9 @@ key_test(apr_pool_t *pool)
 
 /* The test table.  */
 
-struct svn_test_descriptor_t test_funcs[] =
+static int max_threads = 2;
+
+static struct svn_test_descriptor_t test_funcs[] =
   {
     SVN_TEST_NULL,
     SVN_TEST_OPTS_PASS(create_berkeley_filesystem,
@@ -1546,3 +1548,5 @@ struct svn_test_descriptor_t test_funcs[] =
                    "testing sequential alphanumeric key generation"),
     SVN_TEST_NULL
   };
+
+SVN_TEST_MAIN
diff --git a/subversion/tests/libsvn_fs_base/strings-reps-test.c b/subversion/tests/libsvn_fs_base/strings-reps-test.c
index 4512eef..34e829c 100644
--- a/subversion/tests/libsvn_fs_base/strings-reps-test.c
+++ b/subversion/tests/libsvn_fs_base/strings-reps-test.c
@@ -612,7 +612,7 @@ write_null_string(const svn_test_opts_t *opts,
 
   /* Create a new fs and repos */
   SVN_ERR(svn_test__create_bdb_fs
-          (&fs, "test-repo-test-strings", opts,
+          (&fs, "test-repo-write-null-string", opts,
            pool));
 
   args.fs = fs;
@@ -732,7 +732,9 @@ copy_string(const svn_test_opts_t *opts,
 
 /* The test table.  */
 
-struct svn_test_descriptor_t test_funcs[] =
+static int max_threads = 3;
+
+static struct svn_test_descriptor_t test_funcs[] =
   {
     SVN_TEST_NULL,
     SVN_TEST_OPTS_PASS(write_new_rep,
@@ -753,3 +755,5 @@ struct svn_test_descriptor_t test_funcs[] =
                        "create and copy a string"),
     SVN_TEST_NULL
   };
+
+SVN_TEST_MAIN