THRIFT-406 Convert C++ Test to Boost::Test
Sponsored-by: Roger Meier <r.meier@siemens.com>
Signed-off-by: Claudius Heine <ch@denx.de>
diff --git a/lib/cpp/test/Makefile.am b/lib/cpp/test/Makefile.am
index 3470abb..18b4654 100755
--- a/lib/cpp/test/Makefile.am
+++ b/lib/cpp/test/Makefile.am
@@ -88,7 +88,8 @@
TFileTransportTest \
link_test \
OpenSSLManualInitTest \
- EnumTest
+ EnumTest \
+ DenseProtoTest
if AMX_HAVE_LIBEVENT
noinst_PROGRAMS += \
@@ -182,8 +183,9 @@
TFDTransportTest_SOURCES = \
TFDTransportTest.cpp
-TFDTransportTest_LDADD = \
- $(top_builddir)/lib/cpp/libthrift.la
+TFDTransportTest_LDADD = \
+ $(top_builddir)/lib/cpp/libthrift.la \
+ $(BOOST_TEST_LDADD)
#
@@ -193,7 +195,8 @@
TPipedTransportTest.cpp
TPipedTransportTest_LDADD = \
- $(top_builddir)/lib/cpp/libthrift.la
+ $(top_builddir)/lib/cpp/libthrift.la \
+ $(BOOST_TEST_LDADD)
#
# AllProtocolsTest
@@ -203,15 +206,19 @@
AllProtocolTests.tcc \
GenericHelpers.h
-AllProtocolsTest_LDADD = libtestgencpp.la
+AllProtocolsTest_LDADD = \
+ libtestgencpp.la \
+ $(BOOST_TEST_LDADD)
#
# DebugProtoTest
#
DebugProtoTest_SOURCES = \
- DebugProtoTest.cpp
+ DebugProtoTest.cpp
-DebugProtoTest_LDADD = libtestgencpp.la
+DebugProtoTest_LDADD = \
+ libtestgencpp.la \
+ $(BOOST_TEST_LDADD)
#
@@ -220,7 +227,9 @@
JSONProtoTest_SOURCES = \
JSONProtoTest.cpp
-JSONProtoTest_LDADD = libtestgencpp.la
+JSONProtoTest_LDADD = \
+ libtestgencpp.la \
+ $(BOOST_TEST_LDADD)
#
# TNonblockingServerTest
@@ -240,7 +249,9 @@
OptionalRequiredTest_SOURCES = \
OptionalRequiredTest.cpp
-OptionalRequiredTest_LDADD = libtestgencpp.la
+OptionalRequiredTest_LDADD = \
+ libtestgencpp.la \
+ $(BOOST_TEST_LDADD)
#
# OptionalRequiredTest
@@ -248,7 +259,19 @@
RecursiveTest_SOURCES = \
RecursiveTest.cpp
-RecursiveTest_LDADD = libtestgencpp.la
+RecursiveTest_LDADD = \
+ libtestgencpp.la \
+ $(BOOST_TEST_LDADD)
+
+#
+# DenseProtoTest
+#
+DenseProtoTest_SOURCES = \
+ DenseProtoTest.cpp
+
+DenseProtoTest_LDADD = \
+ libtestgencpp.la \
+ $(BOOST_TEST_LDADD)
#
# SpecializationTest
@@ -256,7 +279,9 @@
SpecializationTest_SOURCES = \
SpecializationTest.cpp
-SpecializationTest_LDADD = libtestgencpp.la
+SpecializationTest_LDADD = \
+ libtestgencpp.la \
+ $(BOOST_TEST_LDADD)
concurrency_test_SOURCES = \
concurrency/Tests.cpp \
@@ -331,7 +356,6 @@
$(RM) -r gen-cpp
EXTRA_DIST = \
- DenseProtoTest.cpp \
ThriftTest_extras.cpp \
DebugProtoTest_extras.cpp \
concurrency \