This commit seems to be using calls from the branched fs code in the
tests code still on HEAD, I think?
strings-reps-test.o: In function `txn_body_string_copy':
/home/joe/src/svn-Jun26/subversion/tests/libsvn_fs/strings-reps-test.c:395:
undefined reference to `svn_fs__string_copy'
collect2: ld returned 1 exit status
make: *** [subversion/tests/libsvn_fs/strings-reps-test] Error 1
I guess the fs tests directory should be branched too?
On Mon, Jun 25, 2001 at 03:45:44PM -0000, cmpilato@tigris.org wrote:
> User: cmpilato
> Date: 01/06/25 08:45:44
...
>
> Index: strings-reps-test.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/tests/libsvn_fs/strings-reps-test.c,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -b -r1.5 -r1.6
> --- strings-reps-test.c 2001/06/22 15:31:33 1.5
> +++ strings-reps-test.c 2001/06/25 15:45:44 1.6
> @@ -387,6 +387,16 @@
> "la dee dah, la dee day...");
> }
>
> +
> +static svn_error_t *
> +txn_body_string_copy (void *baton, trail_t *trail)
> +{
> + struct string_args *b = (struct string_args *) baton;
> + return svn_fs__string_copy (b->fs, &(b->key), b->key, trail);
> +}
> +
> +
> +
> static const char *bigstring1 = "\
> Alice opened the door and found that it led into a small
> passage, not much larger than a rat-hole: she knelt down and
> @@ -590,6 +600,53 @@
> }
>
>
> +static svn_error_t *
> +copy_string (const char **msg, apr_pool_t *pool)
> +{
> + struct string_args args;
> + svn_fs_t *fs;
> + const char *old_key;
> +
> + *msg = "Create and copy a string";
> +
> + /* Create a new fs and repos */
> + SVN_ERR (svn_test__create_fs_and_repos
> + (&fs, "test-repo-copy-string", pool));
> +
> + /* Write a new string (string1). */
> + args.fs = fs;
> + args.key = NULL;
> + args.text = bigstring1;
> + args.len = strlen (bigstring1);
> + SVN_ERR (svn_fs__retry_txn (args.fs,
> + txn_body_string_append, &args, pool));
> +
> + /* Make sure a key was returned. */
> + if (! (old_key = args.key))
> + return svn_error_create (SVN_ERR_FS_GENERAL, 0, NULL, pool,
> + "write of new string failed to return new key");
> +
> + /* Now copy that string into a new location. */
> + SVN_ERR (svn_fs__retry_txn (args.fs,
> + txn_body_string_copy, &args, pool));
> +
> + /* Make sure a different key was returned. */
> + if ((! args.key) || (! strcmp (old_key, args.key)))
> + return svn_error_create (SVN_ERR_FS_GENERAL, 0, NULL, pool,
> + "copy of string failed to return new key");
> +
> + /* Verify record's size and contents. */
> + SVN_ERR (svn_fs__retry_txn (args.fs,
> + txn_body_verify_string, &args, pool));
> +
> + /* Close the filesystem. */
> + SVN_ERR (svn_fs_close_fs (fs));
> +
> +
> + return SVN_NO_ERROR;
> +}
> +
> +
>
>
>
> @@ -604,6 +661,7 @@
> delete_rep,
> test_strings,
> abort_string,
> + copy_string,
> 0
> };
>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: cvs-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: cvs-help@subversion.tigris.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:32 2006