Corrected makefile for tests

diff --git a/Makefile.am b/Makefile.am
index 99ad461..daa63f0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,19 +85,22 @@ TestInterfaceSources = \
                src/test/commonapi/tests/TestInterfaceStubDefault.cpp
 
 check_PROGRAMS = \
+               DBusInputStreamTest \
+               DBusOutputStreamTest \
+               DBusRuntimeTest \
+               DBusFactoryTest \
+               DBusProxyTest \
                DBusVariantTest \
                DBusTypeStreamTest \
-               DBusInputStreamTest \
-               DBusVariantOutputStreamTest
+               DBusVariantOutputStreamTest \
+               DBusDaemonProxyTest \
+               DBusCommunicationTest \
+               DBusMultipleConnectionTest \
+               DBusBenchmarkingTest
 
 
 TESTS =        ${check_PROGRAMS}
 
-DBusVariantTest_SOURCES = src/test/DBusVariantTest.cpp
-DBusVariantTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
-DBusVariantTest_CXXFLAGS = ${GTEST_CXXFLAGS}
-DBusVariantTest_LDADD = ${LDADD} ${GTEST_LIBS} libCommonAPI-DBus.la
-
 DBusTypeStreamTest_SOURCES = src/test/DBusTypeStreamTest.cpp
 DBusTypeStreamTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
 DBusTypeStreamTest_CXXFLAGS = ${GTEST_CXXFLAGS}
@@ -108,11 +111,66 @@ DBusVariantOutputStreamTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
 DBusVariantOutputStreamTest_CXXFLAGS = ${GTEST_CXXFLAGS}
 DBusVariantOutputStreamTest_LDADD = ${LDADD} ${GTEST_LIBS} libCommonAPI-DBus.la
 
+DBusBenchmarkingTest_SOURCES = src/test/DBusBenchmarkingTest.cpp
+DBusBenchmarkingTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
+DBusBenchmarkingTest_CXXFLAGS = ${GTEST_CXXFLAGS}
+DBusBenchmarkingTest_LDADD = ${LDADD} ${GTEST_LIBS} libCommonAPI-DBus.la
+
+DBusCommunicationTest_SOURCES = \
+               src/test/DBusCommunicationTest.cpp \
+               ${TestInterfaceSources}
+DBusCommunicationTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
+DBusCommunicationTest_CXXFLAGS = ${GTEST_CXXFLAGS}
+DBusCommunicationTest_LDADD = ${LDADD} ${GTEST_LIBS} libCommonAPI-DBus.la
+
+DBusDaemonProxyTest_SOURCES = src/test/DBusDaemonProxyTest.cpp
+DBusDaemonProxyTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
+DBusDaemonProxyTest_CXXFLAGS = ${GTEST_CXXFLAGS}
+DBusDaemonProxyTest_LDADD = ${LDADD} ${GTEST_LIBS} libCommonAPI-DBus.la
+
 DBusInputStreamTest_SOURCES = src/test/DBusInputStreamTest.cpp
 DBusInputStreamTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
 DBusInputStreamTest_CXXFLAGS = ${GTEST_CXXFLAGS}
 DBusInputStreamTest_LDADD = ${LDADD} ${GTEST_LIBS} libCommonAPI-DBus.la
 
+DBusOutputStreamTest_SOURCES = src/test/DBusOutputStreamTest.cpp
+DBusOutputStreamTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
+DBusOutputStreamTest_CXXFLAGS = ${GTEST_CXXFLAGS}
+DBusOutputStreamTest_LDADD = ${LDADD} ${GTEST_LIBS} libCommonAPI-DBus.la
+
+DBusFactoryTest_SOURCES = \
+               src/test/DBusFactoryTest.cpp \
+               ${TestInterfaceSources}
+DBusFactoryTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
+DBusFactoryTest_CXXFLAGS = ${GTEST_CXXFLAGS}
+DBusFactoryTest_LDADD = ${LDADD} ${GTEST_LIBS} libCommonAPI-DBus.la
+
+DBusRuntimeTest_SOURCES = src/test/DBusRuntimeTest.cpp
+DBusRuntimeTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
+DBusRuntimeTest_CXXFLAGS = ${GTEST_CXXFLAGS}
+DBusRuntimeTest_LDADD = ${LDADD} ${GTEST_LIBS} libCommonAPI-DBus.la
+
+#DBusStubAdapterTest_SOURCES = src/test/DBusStubAdapterTest.cpp
+#DBusStubAdapterTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
+#DBusStubAdapterTest_CXXFLAGS = ${GTEST_CXXFLAGS}
+#DBusStubAdapterTest_LDADD = ${LDADD} ${GTEST_LIBS} libCommonAPI-DBus.la
+
+DBusMultipleConnectionTest_SOURCES = src/test/DBusMultipleConnectionTest.cpp \
+                                                                        ${TestInterfaceSources}
+DBusMultipleConnectionTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
+DBusMultipleConnectionTest_CXXFLAGS = ${GTEST_CXXFLAGS}
+DBusMultipleConnectionTest_LDADD = ${LDADD} ${GTEST_LIBS} libCommonAPI-DBus.la
+
+DBusProxyTest_SOURCES = src/test/DBusProxyTest.cpp
+DBusProxyTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
+DBusProxyTest_CXXFLAGS = ${GTEST_CXXFLAGS}
+DBusProxyTest_LDADD = ${LDADD} ${GTEST_LIBS} libCommonAPI-DBus.la
+
+DBusVariantTest_SOURCES = src/test/DBusVariantTest.cpp
+DBusVariantTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
+DBusVariantTest_CXXFLAGS = ${GTEST_CXXFLAGS}
+DBusVariantTest_LDADD = ${LDADD} ${GTEST_LIBS} libCommonAPI-DBus.la
+
 endif