Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1390468 - in /apr/apr-util/branches/1.5.x: ./
 test/testmemcache.c
Date: Wed, 26 Sep 2012 13:24:12 -0000
To: commits@apr.apache.org
From: trawick@apache.org
Message-Id: <20120926132412.65EE123889C5@eris.apache.org>

Author: trawick
Date: Wed Sep 26 13:24:11 2012
New Revision: 1390468

URL: http://svn.apache.org/viewvc?rev=1390468&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.5.x/   (props changed)
    apr/apr-util/branches/1.5.x/test/testmemcache.c

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

Modified: apr/apr-util/branches/1.5.x/test/testmemcache.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/test/testmemcache.c?rev=1390468&r1=1390467&r2=1390468&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/test/testmemcache.c (original)
+++ apr/apr-util/branches/1.5.x/test/testmemcache.c Wed Sep 26 13:24:11 2012
@@ -604,10 +604,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);
@@ -616,6 +616,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;
 }