From: Loic Dachary <ldachary@redhat.com>
Date: Fri, 9 Jan 2015 18:34:35 +0000 (+0100)
Subject: Merge pull request #3248 from dachary/wip-table-formatter
X-Git-Tag: v0.92~45
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7f3497b0a181ad9f8a9d70625334dd2cdbde8930;p=ceph.git

Merge pull request #3248 from dachary/wip-table-formatter

add table to Formatter

Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

7f3497b0a181ad9f8a9d70625334dd2cdbde8930
diff --cc src/test/Makefile.am
index 77e1b332b3602,1b352f3419401..594f6f5de2546
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@@ -650,10 -650,12 +650,14 @@@ check_PROGRAMS += unittest_readahea
  unittest_msgr_SOURCES = test/msgr/test_msgr.cc
  unittest_msgr_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL)
  unittest_msgr_CXXFLAGS = $(UNITTEST_CXXFLAGS)
 -check_PROGRAMS += unittest_msgr
 +# restore once http://tracker.ceph.com/issues/10494 is fixed
 +#check_PROGRAMS += unittest_msgr
 +bin_DEBUGPROGRAMS += unittest_msgr
  
+ unittest_tableformatter_SOURCES = test/common/test_tableformatter.cc
+ unittest_tableformatter_CXXFLAGS = $(UNITTEST_CXXFLAGS)
+ unittest_tableformatter_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL)
+ check_PROGRAMS += unittest_tableformatter
  
  check_SCRIPTS += test/pybind/test_ceph_argparse.py