apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1390475 - in /apr/apr-util/branches/1.4.x: ./ include/apr_buckets.h test/testmemcache.c
Date Wed, 26 Sep 2012 13:34:44 GMT
Author: trawick
Date: Wed Sep 26 13:34:44 2012
New Revision: 1390475

URL: http://svn.apache.org/viewvc?rev=1390475&view=rev
Log:
merge r1390461 from trunk:

memcache test: log a message in verbose mode if memcached isn't running

Modified:
    apr/apr-util/branches/1.4.x/   (props changed)
    apr/apr-util/branches/1.4.x/include/apr_buckets.h   (props changed)
    apr/apr-util/branches/1.4.x/test/testmemcache.c

Propchange: apr/apr-util/branches/1.4.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1390461

Propchange: apr/apr-util/branches/1.4.x/include/apr_buckets.h
------------------------------------------------------------------------------
  Merged /apr/apr/trunk/include/apr_buckets.h:r1390461

Modified: apr/apr-util/branches/1.4.x/test/testmemcache.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/test/testmemcache.c?rev=1390475&r1=1390474&r2=1390475&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/test/testmemcache.c (original)
+++ apr/apr-util/branches/1.4.x/test/testmemcache.c Wed Sep 26 13:34:44 2012
@@ -603,10 +603,10 @@ abts_suite *testmemcache(abts_suite * su
     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 +615,11 @@ abts_suite *testmemcache(abts_suite * su
       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;
 }



Mime
View raw message