svn commit: r1089828 - /subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c

[ph...@apache.org]

Author: philip
Date: Thu Apr  7 11:31:35 2011
New Revision: 1089828

URL: http://svn.apache.org/viewvc?rev=1089828&view=rev
Log:
Fix fs-pack-tests when run with --server-minor-version.

* subversion/tests/libsvn_fs_fs/fs-pack-test.c
  (create_packed_filesystem): Preserve the the version number when
   rewriting the format file.

Modified:
    subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c

Modified: subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c?rev=1089828&r1=1089827&r2=1089828&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c Thu Apr  7 11:31:35 2011
@@ -114,6 +114,7 @@ create_packed_filesystem(const char *dir
   svn_revnum_t after_rev;
   apr_pool_t *subpool = svn_pool_create(pool);
   apr_pool_t *iterpool;
+  int version;
 
   /* Create a filesystem, then close it */
   SVN_ERR(svn_test__create_fs(&fs, dir, opts, subpool));
@@ -122,8 +123,10 @@ create_packed_filesystem(const char *dir
   subpool = svn_pool_create(pool);
 
   /* Rewrite the format file */
-  SVN_ERR(write_format(dir, SVN_FS_FS__FORMAT_NUMBER,
-                       shard_size, subpool));
+  SVN_ERR(svn_io_read_version_file(&version,
+                                   svn_path_join(dir, "format", subpool),
+                                   subpool));
+  SVN_ERR(write_format(dir, version, shard_size, subpool));
 
   /* Reopen the filesystem */
   SVN_ERR(svn_fs_open(&fs, dir, NULL, subpool));