You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2012/11/23 21:29:09 UTC

svn commit: r1413046 - /subversion/trunk/subversion/tests/svn_test_fs.c

Author: hwright
Date: Fri Nov 23 20:29:09 2012
New Revision: 1413046

URL: http://svn.apache.org/viewvc?rev=1413046&view=rev
Log:
When removing old filesystems before re-creating them for tests, we don't need
to be clean about it, so just recursively remove the directory.  This fixes
a problem when rerunning fs-test 37, as it explicitly tests fs_delete, so the
subsequent delete in this function would fail.

* subversion/tests/svn_test_fs.c
  (create_fs): Just remove the target directory, rather than just the FS.

Modified:
    subversion/trunk/subversion/tests/svn_test_fs.c

Modified: subversion/trunk/subversion/tests/svn_test_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test_fs.c?rev=1413046&r1=1413045&r2=1413046&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/svn_test_fs.c (original)
+++ subversion/trunk/subversion/tests/svn_test_fs.c Fri Nov 23 20:29:09 2012
@@ -115,7 +115,7 @@ create_fs(svn_fs_t **fs_p,
   if (apr_stat(&finfo, name, APR_FINFO_TYPE, pool) == APR_SUCCESS)
     {
       if (finfo.filetype == APR_DIR)
-        SVN_ERR_W(svn_fs_delete_fs(name, pool),
+        SVN_ERR_W(svn_io_remove_dir2(name, TRUE, NULL, NULL, pool),
                   apr_psprintf(pool,
                                "cannot create fs '%s' there is already "
                                "a directory of that name", name));