diff options
author | peter <peter@FreeBSD.org> | 2013-07-28 06:02:40 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2013-07-28 06:02:40 +0000 |
commit | 0aadc82afbae4dbc41da86cd4f9b2ceb8ddcb17d (patch) | |
tree | 6a96e078c28ea05d418b4e2722bc03b0b930a78b /contrib/apr-util/test/testmemcache.c | |
parent | 7594fa5c70305cda65deedc5cc7e08dc037727cd (diff) | |
parent | b910f82d487cf989800adbd1a65b3a7f71b46277 (diff) | |
download | FreeBSD-src-0aadc82afbae4dbc41da86cd4f9b2ceb8ddcb17d.zip FreeBSD-src-0aadc82afbae4dbc41da86cd4f9b2ceb8ddcb17d.tar.gz |
Update subversion-1.8.0 -> 1.8.1. Update supporting
components: apr-1.4.6 -> 1.4.8 and apr-util-1.4.1 -> 1.5.2.
This is a post point-zero bug-fix / fix-sharp-edges release, including
some workarounds for UTF-8 for people who haven't yet turned on WITH_ICONV.
Diffstat (limited to 'contrib/apr-util/test/testmemcache.c')
-rw-r--r-- | contrib/apr-util/test/testmemcache.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/contrib/apr-util/test/testmemcache.c b/contrib/apr-util/test/testmemcache.c index 4947621..958afa66 100644 --- a/contrib/apr-util/test/testmemcache.c +++ b/contrib/apr-util/test/testmemcache.c @@ -433,6 +433,7 @@ static void test_memcache_multiget(abts_case * tc, void *data) rv = apr_memcache_add_server(memcache, server); ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS); + values = apr_hash_make(p); tdata = apr_hash_make(p); create_test_hash(pool, tdata); @@ -603,10 +604,10 @@ abts_suite *testmemcache(abts_suite * suite) apr_status_t rv; suite = ADD_SUITE(suite); /* check for a running memcached on the typical port before - * trying to run the tests. succeed silently if we don't find one. + * trying to run the tests. succeed if we don't find one. */ rv = check_mc(); - if(rv == APR_SUCCESS) { + if (rv == APR_SUCCESS) { abts_run_test(suite, test_memcache_create, NULL); abts_run_test(suite, test_memcache_user_funcs, NULL); abts_run_test(suite, test_memcache_meta, NULL); @@ -615,6 +616,11 @@ abts_suite *testmemcache(abts_suite * suite) abts_run_test(suite, test_memcache_addreplace, NULL); abts_run_test(suite, test_memcache_incrdecr, NULL); } + else { + abts_log_message("Error %d occurred attempting to reach memcached " + "on %s:%d. Skipping apr_memcache tests...", + rv, HOST, PORT); + } return suite; } |