[openrtm-commit:01569] r2636 - trunk/OpenRTM-aist/src/lib/rtm/tests/Manager

[openrtm ＠ openrtm.org]

Author: irie
Date: 2015-06-22 16:33:45 +0900 (Mon, 22 Jun 2015)
New Revision: 2636

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am
   trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/ManagerTests.cpp
Log:
[compat,test] Add -coverage and -lgcov to rtcprof_LDFLAGS of Makefile.am. Add source files to Makefile.am. refs #3229

Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am	2015-06-22 06:30:51 UTC (rev 2635)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am	2015-06-22 07:33:45 UTC (rev 2636)
@@ -40,6 +40,16 @@
 noinst_LTLIBRARIES = DummyLib.la DummyModule.la DummyModule2.la  
 nodist_DummyLib_la_SOURCES = \
 	$(IDL_SOURCES:.idl=Skel.cpp) \
+	$(top_srcdir)/src/lib/rtm/ConfigurationListener.cpp \
+	$(top_srcdir)/src/lib/rtm/RTObjectStateMachine.cpp \
+	$(top_srcdir)/src/lib/rtm/ExecutionContextProfile.cpp \
+	$(top_srcdir)/src/lib/rtm/ExecutionContextWorker.cpp \
+	$(top_srcdir)/src/lib/rtm/ComponentActionListener.cpp \
+	$(top_srcdir)/src/lib/rtm/SdoServiceAdmin.cpp \
+	$(top_srcdir)/src/lib/rtm/LocalServiceAdmin.cpp \
+	$(top_srcdir)/src/lib/rtm/ExecutionContextBase.cpp \
+	$(top_srcdir)/src/lib/rtm/ManagerActionListener.cpp \
+	$(top_srcdir)/src/lib/rtm/PortConnectListener.cpp \
 	$(top_srcdir)/src/lib/rtm/NVUtil.cpp \
 	$(top_srcdir)/src/lib/rtm/CorbaNaming.cpp \
 	$(top_srcdir)/src/lib/rtm/NamingManager.cpp \
@@ -155,7 +165,7 @@
 rtcprof_SOURCES = $(top_builddir)/utils/rtcprof/rtcprof.cpp
 rtcprof_LDADD   = $(top_builddir)/src/lib/rtm/libRTC.la \
 	$(top_builddir)/src/lib/coil/lib/libcoil.la
-rtcprof_LDFLAGS = -L$(top_builddir)/src/lib/rtm
+rtcprof_LDFLAGS = -coverage -L$(top_builddir)/src/lib/rtm -lgcov
 
 
 

Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/ManagerTests.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/ManagerTests.cpp	2015-06-22 06:30:51 UTC (rev 2635)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/ManagerTests.cpp	2015-06-22 07:33:45 UTC (rev 2636)
@@ -944,14 +944,14 @@
       // 正常にECFactoryを登録できるか？
       CPPUNIT_ASSERT(m_mgr->registerECFactory(
 		      "PeriodicEC",
-		      RTC::ECCreate<RTC::PeriodicExecutionContext>,
-		      RTC::ECDelete<RTC::PeriodicExecutionContext>));
+		      RTC::ECCreate<RTC_exp::PeriodicExecutionContext>,
+		      RTC::ECDelete<RTC_exp::PeriodicExecutionContext>));
 			
       // 登録済みのECFactoryと同一の名称で登録を試みた場合、意図どおり登録失敗するか？
       CPPUNIT_ASSERT(! m_mgr->registerECFactory(
 			"PeriodicEC",
-			RTC::ECCreate<RTC::PeriodicExecutionContext>,
-			RTC::ECDelete<RTC::PeriodicExecutionContext>));
+			RTC::ECCreate<RTC_exp::PeriodicExecutionContext>,
+			RTC::ECDelete<RTC_exp::PeriodicExecutionContext>));
     }
 		
     /*!
@@ -1017,8 +1017,8 @@
       // ECFactoryを登録しておく
       CPPUNIT_ASSERT(m_mgr->registerECFactory(
 		      "PeriodicEC",
-		      RTC::ECCreate<RTC::PeriodicExecutionContext>,
-		      RTC::ECDelete<RTC::PeriodicExecutionContext>));
+		      RTC::ECCreate<RTC_exp::PeriodicExecutionContext>,
+		      RTC::ECDelete<RTC_exp::PeriodicExecutionContext>));
 			
       // 正しくコンポーネントを生成できるか？
       RTC::RtcBase* comp = m_mgr->createComponent("DataFlowComponentFactory");
@@ -1144,8 +1144,8 @@
       // ECFactoryを登録しておく
       CPPUNIT_ASSERT(m_mgr->registerECFactory(
 		      "PeriodicEC",
-		      RTC::ECCreate<RTC::PeriodicExecutionContext>,
-		      RTC::ECDelete<RTC::PeriodicExecutionContext>));
+		      RTC::ECCreate<RTC_exp::PeriodicExecutionContext>,
+		      RTC::ECDelete<RTC_exp::PeriodicExecutionContext>));
 
       // 確認用にネームサービスへのアクセス手段としてNamingManagerを準備しておく
       // ※fixture4.confの各設定に合わせている点に注意
@@ -1231,8 +1231,8 @@
       // ECFactoryを登録しておく
       CPPUNIT_ASSERT(m_mgr->registerECFactory(
 		      "PeriodicEC",
-		      RTC::ECCreate<RTC::PeriodicExecutionContext>,
-		      RTC::ECDelete<RTC::PeriodicExecutionContext>));
+		      RTC::ECCreate<RTC_exp::PeriodicExecutionContext>,
+		      RTC::ECDelete<RTC_exp::PeriodicExecutionContext>));
 			
       // 複数のコンポーネントを生成しておく
       RTC::RtcBase* comp1 = m_mgr->createComponent("DataFlowComponentFactory");
@@ -1486,8 +1486,8 @@
 
       // return any check
       m_mgr->registerECFactory("PeriodicEC", 
-			RTC::ECCreate<RTC::PeriodicExecutionContext>, 
-			RTC::ECDelete<RTC::PeriodicExecutionContext>);
+			RTC::ECCreate<RTC_exp::PeriodicExecutionContext>, 
+			RTC::ECDelete<RTC_exp::PeriodicExecutionContext>);
       ec_args = "PeriodicEC?rate=1000";
       ec = m_mgr->createContext(ec_args.c_str());
       CPPUNIT_ASSERT(ec != NULL);
@@ -1523,8 +1523,8 @@
       // ECFactoryを登録しておく
       CPPUNIT_ASSERT(m_mgr->registerECFactory(
 		      "PeriodicEC",
-		      RTC::ECCreate<RTC::PeriodicExecutionContext>,
-		      RTC::ECDelete<RTC::PeriodicExecutionContext>));
+		      RTC::ECCreate<RTC_exp::PeriodicExecutionContext>,
+		      RTC::ECDelete<RTC_exp::PeriodicExecutionContext>));
 
       // 正しくコンポーネントを生成できるか？
       RTC::RtcBase* comp = m_mgr->createComponent("DataFlowComponentFactory");