diff options
author | Christian Linke <Christian.Linke@bmw.de> | 2016-02-17 14:41:04 +0100 |
---|---|---|
committer | Christian Linke <Christian.Linke@bmw.de> | 2016-02-17 14:41:04 +0100 |
commit | 024ffad4978da6e3e1ab7dfd67f2e9ed8b3758ee (patch) | |
tree | 38ee4e5da832e6c31e137dfcd2055907b98b916c /AudioManagerCore/test/AmRouterTest | |
parent | c7ef1ef0126023ca8a377f00ae9aebb81bc34d37 (diff) | |
download | audiomanager-024ffad4978da6e3e1ab7dfd67f2e9ed8b3758ee.tar.gz |
reworked DltWrapper. fixed gtest and gmock.pc files
Diffstat (limited to 'AudioManagerCore/test/AmRouterTest')
-rw-r--r-- | AudioManagerCore/test/AmRouterTest/CAmRouterTest.cpp | 6 | ||||
-rw-r--r-- | AudioManagerCore/test/AmRouterTest/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/AudioManagerCore/test/AmRouterTest/CAmRouterTest.cpp b/AudioManagerCore/test/AmRouterTest/CAmRouterTest.cpp index a64979e..5f59777 100644 --- a/AudioManagerCore/test/AmRouterTest/CAmRouterTest.cpp +++ b/AudioManagerCore/test/AmRouterTest/CAmRouterTest.cpp @@ -28,7 +28,7 @@ using namespace am; using namespace testing; -TCLAP::SwitchArg enableNoDLTDebug ("V","logDlt","print DLT logs to stdout or dlt-daemon default off",false); +TCLAP::SwitchArg enableDebug ("V","logDlt","print DLT logs to stdout or dlt-daemon default off",false); CAmRouterTest::CAmRouterTest() : plistRoutingPluginDirs(), // @@ -1954,12 +1954,12 @@ int main(int argc, char **argv) try { TCLAP::CmdLine* cmd(CAmCommandLineSingleton::instanciateOnce("The team of the AudioManager wishes you a nice day!",' ',DAEMONVERSION,true)); - cmd->add(enableNoDLTDebug); + cmd->add(enableDebug); } catch (TCLAP::ArgException &e) // catch any exceptions { std::cerr << "error: " << e.error() << " for arg " << e.argId() << std::endl; } CAmCommandLineSingleton::instance()->preparse(argc,argv); - CAmDltWrapper::instance(enableNoDLTDebug.getValue())->registerApp("routing", "CAmRouterTest"); + CAmDltWrapper::instanctiateOnce("RTEST","Router Test",enableDebug.getValue(),CAmDltWrapper::logDestination::DAEMON); logInfo("Routing Test started "); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/AudioManagerCore/test/AmRouterTest/CMakeLists.txt b/AudioManagerCore/test/AmRouterTest/CMakeLists.txt index db05911..d1c0635 100644 --- a/AudioManagerCore/test/AmRouterTest/CMakeLists.txt +++ b/AudioManagerCore/test/AmRouterTest/CMakeLists.txt @@ -34,7 +34,7 @@ ADD_EXECUTABLE( AmRouterTest ${ROUTING_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmRouterTest ${GTEST_LIBRARIES} - ${GMOCK_LIBRARIES} + ${GMOCK_LIBRARIES} AudioManagerCore ) |