← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to subversion/tests/libsvn_subr/cache-test.c

  • Committer: Package Import Robot
  • Author(s): James McCoy, Peter Samuelson, James McCoy
  • Date: 2014-01-12 19:48:33 UTC
  • mfrom: (0.2.10)
  • Revision ID: package-import@ubuntu.com-20140112194833-w3axfwksn296jn5x
Tags: 1.8.5-1
http://bugs.debian.org/725787
http://bugs.debian.org/507430
http://bugs.debian.org/734163
http://bugs.debian.org/601544
http://bugs.debian.org/687291
http://bugs.debian.org/273874
http://bugs.debian.org/690815
http://bugs.debian.org/654172
http://bugs.debian.org/678224
http://bugs.debian.org/566148
http://bugs.debian.org/734918
http://bugs.debian.org/722393
[ Peter Samuelson ]
* New upstream release.  (Closes: #725787) Rediff patches:
  - Remove apr-abi1 (applied upstream), rename apr-abi2 to apr-abi
  - Remove loosen-sqlite-version-check (shouldn't be needed)
  - Remove java-osgi-metadata (applied upstream)
  - svnmucc prompts for a changelog if none is provided. (Closes: #507430)
  - Remove fix-bdb-version-detection, upstream uses "apu-config --dbm-libs"
  - Remove ruby-test-wc (applied upstream)
  - Fix “svn diff -r N file” when file has svn:mime-type set.
    (Closes: #734163)
  - Support specifying an encoding for mod_dav_svn's environment in which
    hooks are run.  (Closes: #601544)
  - Fix ordering of “svnadmin dump” paths with certain APR versions.
    (Closes: #687291)
  - Provide a better error message when authentication fails with an
    svn+ssh:// URL.  (Closes: #273874)
  - Updated Polish translations.  (Closes: #690815)

[ James McCoy ]
* Remove all traces of libneon, replaced by libserf.
* patches/sqlite_3.8.x_workaround: Upstream fix for wc-queries-test test
  failurse.
* Run configure with --with-apache-libexecdir, which allows removing part of
  patches/rpath.
* Re-enable auth-test as upstream has fixed the problem of picking up
  libraries from the environment rather than the build tree.
  (Closes: #654172)
* Point LD_LIBRARY_PATH at the built auth libraries when running the svn
  command during the build.  (Closes: #678224)
* Add a NEWS entry describing how to configure mod_dav_svn to understand
  UTF-8.  (Closes: #566148)
* Remove ancient transitional package, libsvn-ruby.
* Enable compatibility with Sqlite3 versions back to Wheezy.
* Enable hardening flags.  (Closes: #734918)
* patches/build-fixes: Enable verbose build logs.
* Build against the default ruby version.  (Closes: #722393)

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/tests/libsvn_subr/cache-test.c
36
36
 
37
37
/* Implements svn_cache__serialize_func_t */
38
38
static svn_error_t *
39
 
serialize_revnum(char **data,
 
39
serialize_revnum(void **data,
40
40
                 apr_size_t *data_len,
41
41
                 void *in,
42
42
                 apr_pool_t *pool)
51
51
/* Implements svn_cache__deserialize_func_t */
52
52
static svn_error_t *
53
53
deserialize_revnum(void **out,
54
 
                   char *data,
 
54
                   void *data,
55
55
                   apr_size_t data_len,
56
56
                   apr_pool_t *pool)
57
57
{
155
155
 
156
156
  if (opts->config_file)
157
157
    {
158
 
      SVN_ERR(svn_config_read2(&config, opts->config_file,
159
 
                               TRUE, FALSE, pool));
 
158
      SVN_ERR(svn_config_read3(&config, opts->config_file,
 
159
                               TRUE, FALSE, FALSE, pool));
160
160
      SVN_ERR(svn_cache__make_memcache_from_config(&memcache, config, pool));
161
161
    }
162
162
 
182
182
{
183
183
  svn_cache__t *cache;
184
184
  svn_membuffer_t *membuffer;
185
 
  svn_boolean_t thread_safe;
186
 
 
187
 
#if APR_HAS_THREADS
188
 
  thread_safe = TRUE;
189
 
#else
190
 
  thread_safe = FALSE;
191
 
#endif
192
 
 
193
 
  SVN_ERR(svn_cache__membuffer_cache_create(&membuffer, 10*1024, 1,
194
 
                                            thread_safe, pool));
 
185
 
 
186
  SVN_ERR(svn_cache__membuffer_cache_create(&membuffer, 10*1024, 1, 0,
 
187
                                            TRUE, TRUE, pool));
195
188
 
196
189
  /* Create a cache with just one entry. */
197
190
  SVN_ERR(svn_cache__create_membuffer_cache(&cache,
200
193
                                            deserialize_revnum,
201
194
                                            APR_HASH_KEY_STRING,
202
195
                                            "cache:",
 
196
                                            FALSE,
203
197
                                            pool));
204
198
 
205
199
  return basic_cache_test(cache, FALSE, pool);
229
223
 
230
224
  if (opts->config_file)
231
225
    {
232
 
      SVN_ERR(svn_config_read2(&config, opts->config_file,
233
 
                               TRUE, FALSE, pool));
 
226
      SVN_ERR(svn_config_read3(&config, opts->config_file,
 
227
                               TRUE, FALSE, FALSE, pool));
234
228
      SVN_ERR(svn_cache__make_memcache_from_config(&memcache, config, pool));
235
229
    }
236
230