diff options
| author | Luis Pabon <lpabon@redhat.com> | 2014-03-16 23:07:19 -0400 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2014-03-17 11:12:08 -0700 |
| commit | 6224e878cdf780360b49760c4b0c20584bbc0b6f (patch) | |
| tree | 5761caff2cfd23e8ae5f2f44215a7fe2c371ae2c /xlators/cluster/dht/src | |
| parent | 9565ac3328dc91bd721a65b6d4e7957929e9ed59 (diff) | |
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>
Diffstat (limited to 'xlators/cluster/dht/src')
| -rw-r--r-- | xlators/cluster/dht/src/Makefile.am | 15 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-layout.c | 21 |
2 files changed, 0 insertions, 36 deletions
diff --git a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am index 3032705b5d5..174bea84110 100644 --- a/xlators/cluster/dht/src/Makefile.am +++ b/xlators/cluster/dht/src/Makefile.am @@ -36,18 +36,3 @@ uninstall-local: install-data-hook: ln -sf dht.so $(DESTDIR)$(xlatordir)/distribute.so - -#### UNIT TESTS ##### -CLEANFILES += *.gcda *.gcno *_xunit.xml -noinst_PROGRAMS = -TESTS = - -dht_layout_unittest_CPPFLAGS = $(UNITTEST_CPPFLAGS) $(AM_CPPFLAGS) -dht_layout_unittest_SOURCES = unittest/dht_layout_unittest.c \ - unittest/dht_layout_mock.c \ - dht-layout.c -dht_layout_unittest_CFLAGS = $(UNITTEST_CFLAGS) -dht_layout_unittest_LDADD = $(UNITTEST_LDADD) -dht_layout_unittest_LDFLAGS = $(UNITTEST_LDFLAGS) -noinst_PROGRAMS += dht_layout_unittest -TESTS += dht_layout_unittest diff --git a/xlators/cluster/dht/src/dht-layout.c b/xlators/cluster/dht/src/dht-layout.c index deaa493f908..e1a37b77cda 100644 --- a/xlators/cluster/dht/src/dht-layout.c +++ b/xlators/cluster/dht/src/dht-layout.c @@ -25,29 +25,12 @@ #define layout_size(cnt) (layout_base_size + (cnt * layout_entry_size)) -#include <cmockery/pbc.h> -#include <cmockery/cmockery_override.h> - -// Change GF_CALLOC and GF_FREE to use -// cmockery2 memory allocation versions -#ifdef UNIT_TESTING -#undef GF_CALLOC -#define GF_CALLOC(n, s, t) test_calloc(n, s) -#undef GF_FREE -#define GF_FREE test_free -#endif - - - dht_layout_t * dht_layout_new (xlator_t *this, int cnt) { dht_layout_t *layout = NULL; dht_conf_t *conf = NULL; - REQUIRE(NULL != this); - REQUIRE(cnt >= 0); - conf = this->private; layout = GF_CALLOC (1, layout_size (cnt), @@ -66,10 +49,6 @@ dht_layout_new (xlator_t *this, int cnt) layout->ref = 1; - ENSURE(NULL != layout); - ENSURE(layout->type == DHT_HASH_TYPE_DM); - ENSURE(layout->cnt == cnt); - ENSURE(layout->ref == 1); out: return layout; } |