subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1593096 - /subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
Date Wed, 07 May 2014 18:11:54 GMT
Author: rhuijben
Date: Wed May  7 18:11:54 2014
New Revision: 1593096

URL: http://svn.apache.org/r1593096
Log:
Revert r1592979 and r1592972, as the test now passes on Windows.

* subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
  (recursive_locking): Remove hack
  (test_funcs): Remove XFail on Windows.

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

Modified: subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c?rev=1593096&r1=1593095&r2=1593096&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c Wed May  7 18:11:54 2014
@@ -1156,13 +1156,6 @@ recursive_locking(const svn_test_opts_t 
 {
   svn_fs_t *fs;
 
-#ifdef WIN32
-  /* ### This test deadlocks on Windows because the mutex code it tries to
-     ### test is not used. This mutex is not needed as the locking is per
-     ### handle on Windows, not per process */
-  return svn_error_create(SVN_ERR_TEST_FAILED, NULL, NULL);
-#endif
-
   SVN_ERR(svn_test__create_fs(&fs, REPO_NAME, opts, pool));
   SVN_ERR(svn_fs_fs__with_all_locks(fs, lock_again, fs, pool));
 
@@ -1208,13 +1201,8 @@ static struct svn_test_descriptor_t test
                        "upgrade txns to log addressing in shared FSFS"),
     SVN_TEST_OPTS_PASS(upgrade_old_txns_to_log_addressing,
                        "upgrade txns started before svnadmin upgrade"),
-#ifdef WIN32
-    SVN_TEST_OPTS_XFAIL(recursive_locking,
-                       "prevent recursive locking"),
-#else
     SVN_TEST_OPTS_PASS(recursive_locking,
                        "prevent recursive locking"),
-#endif
     SVN_TEST_NULL
   };
 



Mime
View raw message