Author: rhuijben
Date: Fri Aug 22 10:57:21 2014
New Revision: 1619737
URL: http://svn.apache.org/r1619737
Log:
Avoid abort() call in the enforce_consistent_revprop_caching() test on Visual
Studio X86 <= 2012 by registering an fs warning func. This should make the
Windows buildbots green again.
* subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
(enforce_consistent_revprop_caching): Set warning funcs on two opened fss.
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=1619737&r1=1619736&r2=1619737&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 Fri Aug 22
10:57:21 2014
@@ -1249,9 +1249,17 @@ enforce_consistent_revprop_caching(const
svn_hash_sets(fs_config, SVN_FS_CONFIG_FSFS_CACHE_REVPROPS, "1");
SVN_ERR(svn_fs_open2(&fs_cache, REPO_NAME, fs_config, pool, pool));
+ /* With inefficient named atomics, the filesystem will output a warning
+ and disable the revprop caching, but we still would like to test
+ these cases. Ignore the warning(s). */
+ svn_fs_set_warning_func(fs_cache, ignore_fs_warnings, NULL);
svn_hash_sets(fs_config, SVN_FS_CONFIG_FSFS_CACHE_REVPROPS, "3");
SVN_ERR(svn_fs_open2(&fs_auto_cache, REPO_NAME, fs_config, pool, pool));
+ /* With inefficient named atomics, the filesystem will output a warning
+ and disable the revprop caching, but we still would like to test
+ these cases. Ignore the warning(s). */
+ svn_fs_set_warning_func(fs_auto_cache, ignore_fs_warnings, NULL);
/* Revprop mods not using the revprop cache is fine by default */
value.data = "1";
