You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/06/30 13:40:51 UTC

svn commit: r1498098 - in /subversion/branches/fsfs-format7: ./ subversion/tests/libsvn_fs_fs/ subversion/tests/libsvn_fs_x/

Author: stefan2
Date: Sun Jun 30 11:40:50 2013
New Revision: 1498098

URL: http://svn.apache.org/r1498098
Log:
On the fsfs-format7 branch:  Second step in creating the new FSX backend.
Copy libsvn_fs_fs tests to libsvn_fs_x tests, rename them, remove fsfs-f7
tests from fsfs and and update the build config.

* build.conf
  (fs-pack-test): rename to ...
  (fs-fs-pack-test): ... this and update the source name
  (fs-x-pack-test): new test target
  (string-table-test): now a fs-x text
  (__ALL_TESTS__): update and register new test

* subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c:
  renamed from ./fs-pack-test.c
* subversion/tests/libsvn_fs_fs/string-table-test.c: drop

* subversion/tests/libsvn_fs_x: copied from ../libsvn_fs_fs
* subversion/tests/libsvn_fs_x/fs-x-pack-test.c
  renamed from ./fs-pack-test.c; update #includes
* subversion/tests/libsvn_fs_x/string-table-test.c
  update #includes

Added:
    subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
      - copied unchanged from r1498045, subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_fs/fs-pack-test.c
    subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_x/
      - copied from r1498043, subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_fs/
    subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_x/fs-x-pack-test.c
      - copied, changed from r1498045, subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_fs/fs-pack-test.c
Removed:
    subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_fs/fs-pack-test.c
    subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_fs/string-table-test.c
    subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_x/fs-pack-test.c
Modified:
    subversion/branches/fsfs-format7/build.conf
    subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_x/string-table-test.c

Modified: subversion/branches/fsfs-format7/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build.conf?rev=1498098&r1=1498097&r2=1498098&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build.conf (original)
+++ subversion/branches/fsfs-format7/build.conf Sun Jun 30 11:40:50 2013
@@ -733,22 +733,33 @@ libs = libsvn_test libsvn_fs libsvn_fs_b
 
 # ----------------------------------------------------------------------------
 # Tests for libsvn_fs_fs
-[fs-pack-test]
+[fs-fs-pack-test]
 description = Test fsfs packing in libsvn_fs_fs
 type = exe
 path = subversion/tests/libsvn_fs_fs
-sources = fs-pack-test.c
+sources = fs-fs-pack-test.c
 install = test
 libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
        libsvn_subr apriconv apr
 
+# ----------------------------------------------------------------------------
+# Tests for libsvn_fs_x
+[fs-x-pack-test]
+description = Test fsx packing in libsvn_fs_fs
+type = exe
+path = subversion/tests/libsvn_fs_x
+sources = fs-x-pack-test.c
+install = test
+libs = libsvn_test libsvn_fs libsvn_fs_x libsvn_delta
+       libsvn_subr apriconv apr
+
 [string-table-test]
 description = Test fsfs string tables
 type = exe
-path = subversion/tests/libsvn_fs_fs
+path = subversion/tests/libsvn_fs_x
 sources = string-table-test.c
 install = test
-libs = libsvn_test libsvn_fs_fs libsvn_subr apr
+libs = libsvn_test libsvn_fs_x libsvn_subr apr
 
 # ----------------------------------------------------------------------------
 # Tests for libsvn_fs
@@ -1257,7 +1268,8 @@ libs = svn svnadmin svndumpfilter svnloo
 type = project
 path = build/win32
 libs = __ALL__
-       fs-test fs-base-test fs-fsfs-test fs-pack-test string-table-tester
+       fs-test fs-base-test fs-fsfs-test fs-fs-pack-test fs-x-pack-test
+       string-table-test
        skel-test strings-reps-test changes-test locks-test repos-test
        checksum-test compat-test config-test hashdump-test mergeinfo-test
        opt-test path-test stream-test string-test time-test utf-test

Copied: subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_x/fs-x-pack-test.c (from r1498045, subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_fs/fs-pack-test.c)
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_x/fs-x-pack-test.c?p2=subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_x/fs-x-pack-test.c&p1=subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_fs/fs-pack-test.c&r1=1498045&r2=1498098&rev=1498098&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_fs/fs-pack-test.c (original)
+++ subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_x/fs-x-pack-test.c Sun Jun 30 11:40:50 2013
@@ -25,8 +25,8 @@
 #include <apr_pools.h>
 
 #include "../svn_test.h"
-#include "../../libsvn_fs_fs/fs.h"
-#include "../../libsvn_fs_fs/reps.h"
+#include "../../libsvn_fs_x/fs.h"
+#include "../../libsvn_fs_x/reps.h"
 
 #include "svn_pools.h"
 #include "svn_props.h"

Modified: subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_x/string-table-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_x/string-table-test.c?rev=1498098&r1=1498043&r2=1498098&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_x/string-table-test.c (original)
+++ subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_x/string-table-test.c Sun Jun 30 11:40:50 2013
@@ -21,7 +21,7 @@
  */
 
 #include "../svn_test.h"
-#include "../../libsvn_fs_fs/string_table.h"
+#include "../../libsvn_fs_x/string_table.h"
 #include "svn_pools.h"
 #include "svn_sorts.h"