From 6224e878cdf780360b49760c4b0c20584bbc0b6f Mon Sep 17 00:00:00 2001
From: Luis Pabon <lpabon@redhat.com>
Date: Sun, 16 Mar 2014 23:07:19 -0400
Subject: build: Remove cmockery2 from repo

While we wait for cmockery2 to be available from Fedora,
we can remove cmockery2 from the repo.

BUG: 1077011

Change-Id: I75d462c607cd376a5d838ea83f4d12eb59757e73
Signed-off-by: Luis Pabon <lpabon@redhat.com>
Reviewed-on: http://review.gluster.org/7281
Reviewed-by: Justin Clift <justin@gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Harshavardhana <harsha@harshavardhana.net>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>
---
 libglusterfs/src/Makefile.am | 17 -----------------
 libglusterfs/src/mem-pool.c  |  9 ---------
 2 files changed, 26 deletions(-)

(limited to 'libglusterfs/src')

diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am
index ac6a3b9ec..634e217ed 100644
--- a/libglusterfs/src/Makefile.am
+++ b/libglusterfs/src/Makefile.am
@@ -55,20 +55,3 @@ y.tab.h: graph.y
 
 CLEANFILES = graph.lex.c y.tab.c y.tab.h
 CONFIG_CLEAN_FILES = $(CONTRIB_BUILDDIR)/uuid/uuid_types.h
-
-#### UNIT TESTS #####
-CLEANFILES += *.gcda *.gcno *_xunit.xml
-noinst_PROGRAMS =
-TESTS =
-
-mem_pool_unittest_CPPFLAGS = $(UNITTEST_CPPFLAGS) $(libglusterfs_la_CPPFLAGS)
-mem_pool_unittest_SOURCES = mem-pool.c \
-							mem-pool.h \
-							unittest/mem_pool_unittest.c \
-							unittest/log_mock.c \
-							unittest/global_mock.c
-mem_pool_unittest_CFLAGS = $(UNITTEST_CFLAGS)
-mem_pool_unittest_LDADD = $(UNITTEST_LDADD)
-mem_pool_unittest_LDFLAGS = $(UNITTEST_LDFLAGS)
-noinst_PROGRAMS += mem_pool_unittest
-TESTS += mem_pool_unittest
diff --git a/libglusterfs/src/mem-pool.c b/libglusterfs/src/mem-pool.c
index 96e049105..b92803d4d 100644
--- a/libglusterfs/src/mem-pool.c
+++ b/libglusterfs/src/mem-pool.c
@@ -24,24 +24,17 @@
 
 #define GLUSTERFS_ENV_MEM_ACCT_STR  "GLUSTERFS_DISABLE_MEM_ACCT"
 
-#include <cmockery/pbc.h>
-#include <cmockery/cmockery_override.h>
-
 void
 gf_mem_acct_enable_set (void *data)
 {
         glusterfs_ctx_t *ctx = NULL;
 
-        REQUIRE(data != NULL);
-
         ctx = data;
 
         GF_ASSERT (ctx != NULL);
 
         ctx->mem_acct_enable = 1;
 
-        ENSURE(1 == ctx->mem_acct_enable);
-
         return;
 }
 
@@ -156,8 +149,6 @@ __gf_realloc (void *ptr, size_t size)
         if (!THIS->ctx->mem_acct_enable)
                 return REALLOC (ptr, size);
 
-        REQUIRE(NULL != ptr);
-
         tot_size = size + GF_MEM_HEADER_SIZE + GF_MEM_TRAILER_SIZE;
 
         orig_ptr = (char *)ptr - 8 - 4;
-- 
cgit