Update to clean up test case.

diff --git a/tests/include.am b/tests/include.am
index 3631a81e25713fc083b4b2d24ff9f2b33a3ab866..08cf67e2d9d8db9b5d90877da97d424f6e66ef84 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -4,7 +4,7 @@
 
 TESTS_LDADDS = libmemcached/libmemcached.la
 
-VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes
+VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes --track-fds=yes
 
 DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
 

diff --git a/tests/mem_functions.c b/tests/mem_functions.c
index ba555111134fa4fd97b847bee43f98318419eb10..f59cf01abb7d37709d0ceaaf11c5927f7326f497 100644 (file)
--- a/tests/mem_functions.c
+++ b/tests/mem_functions.c
@@ -5028,15 +5028,12 @@ static test_return_t memcached_get_MEMCACHED_ERRNO(memcached_st *memc)
   // See if memcached is reachable.
   value= memcached_get(tl_memc_h, key, strlen(key), &len, &flags, &rc);
 
-  if (value)
-  {
-    free(value);
-    test_true(value); // Pointer won't be zero so this is fine.
-  }
-
+  test_false(value);
   test_true(len == 0);
   test_true(rc == MEMCACHED_ERRNO);
 
+  memcached_free(tl_memc_h);
+
   return TEST_SUCCESS;
 }
 
@@ -5054,12 +5051,7 @@ static test_return_t memcached_get_MEMCACHED_NOTFOUND(memcached_st *memc)
   // See if memcached is reachable.
   value= memcached_get(memc, key, strlen(key), &len, &flags, &rc);
 
-  if (value)
-  {
-    free(value);
-    test_true(value); // Pointer won't be zero so this is fine.
-  }
-
+  test_false(value);
   test_true(len == 0);
   test_true(rc == MEMCACHED_NOTFOUND);
 
@@ -5093,15 +5085,12 @@ static test_return_t memcached_get_by_key_MEMCACHED_ERRNO(memcached_st *memc)
   // See if memcached is reachable.
   value= memcached_get_by_key(tl_memc_h, key, strlen(key), key, strlen(key), &len, &flags, &rc);
 
-  if (value)
-  {
-    free(value);
-    test_true(value); // Pointer won't be zero so this is fine.
-  }
-
+  test_false(value);
   test_true(len == 0);
   test_true(rc == MEMCACHED_ERRNO);
 
+  memcached_free(tl_memc_h);
+
   return TEST_SUCCESS;
 }
 
@@ -5119,12 +5108,7 @@ static test_return_t memcached_get_by_key_MEMCACHED_NOTFOUND(memcached_st *memc)
   // See if memcached is reachable.
   value= memcached_get_by_key(memc, key, strlen(key), key, strlen(key), &len, &flags, &rc);
 
-  if (value)
-  {
-    free(value);
-    test_true(value); // Pointer won't be zero so this is fine.
-  }
-
+  test_false(value);
   test_true(len == 0);
   test_true(rc == MEMCACHED_NOTFOUND);