diff options
Diffstat (limited to 'AudioManagerDaemon/test/AmRouterMapTest')
3 files changed, 29 insertions, 44 deletions
diff --git a/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.cpp b/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.cpp index a6680e5..6481a59 100644 --- a/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.cpp +++ b/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.cpp @@ -20,7 +20,7 @@ #include "CAmRouterMapTest.h" #include <string.h> -#include "shared/CAmDltWrapper.h" +#include "CAmDltWrapper.h" using namespace am; diff --git a/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.h b/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.h index 19bccfe..5b86e1a 100644 --- a/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.h +++ b/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.h @@ -36,7 +36,7 @@ #include "CAmDatabaseObserver.h" #include "CAmRoutingSender.h" #include "CAmRouter.h" -#include "shared/CAmSocketHandler.h" +#include "CAmSocketHandler.h" #include "../IAmControlBackdoor.h" #include "../IAmCommandBackdoor.h" #include "../CAmCommonFunctions.h" diff --git a/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt index 2209f40..e870e20 100644 --- a/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt @@ -10,80 +10,65 @@ # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with # this file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 +# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 # # For further information see http://www.genivi.org/. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.8) -PROJECT(AmRouterMapTest) +project (AmRouterMapTest) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") - -FIND_PACKAGE(PkgConfig) - -IF(WITH_DLT) +set (AM_LINK_LIBS + ${CMAKE_DL_LIBS} + rt) + +if(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) -ENDIF(WITH_DLT) + set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DLT_LIBRARIES}) +endif(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDE_FOLDER} - ${DBUS_ARCH_INCLUDE_DIR} - ${DBUS_INCLUDE_FOLDER} ${CMAKE_SOURCE_DIR} - ${STD_INCLUDE_DIRS} - ${DLT_INCLUDE_DIRS} - ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} ${GOOGLE_TEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ) file(GLOB ROUTINGMAP_SRCS_CXX - "../../src/CAmDatabaseHandlerMap.cpp" - "../../src/CAmDatabaseObserver.cpp" - "../../src/CAmCommandSender.cpp" - "../../src/CAmRoutingSender.cpp" - "../../src/CAmControlReceiver.cpp" - "../../src/CAmControlSender.cpp" - "../../src/CAmRouter.cpp" - "../../src/CAmDltWrapper.cpp" - "../../src/CAmSocketHandler.cpp" - "../../src/CAmCommandReceiver.cpp" - "../../src/CAmRoutingReceiver.cpp" - "../../src/CAmDbusWrapper.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandlerMap.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" + "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" "../CAmCommonFunctions.cpp" "*.cpp" ) -IF(WITH_NSM) - SET (DATABASE_SRCS_CXX - ${DATABASE_SRCS_CXX} - "../../src/CAmNodeStateCommunicatorDBus.cpp") -ENDIF(WITH_NSM) - ADD_EXECUTABLE( AmRouterMapTest ${ROUTINGMAP_SRCS_CXX}) -TARGET_LINK_LIBRARIES( AmRouterMapTest - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} - ${CMAKE_DL_LIBS} +TARGET_LINK_LIBRARIES(AmRouterMapTest + ${AM_LINK_LIBS} gtest - gmock -) + gmock) ADD_DEPENDENCIES(AmRouterMapTest gtest gmock) INSTALL(TARGETS AmRouterMapTest - DESTINATION "~/AudioManagerTest/" + DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "audiomanager-bin" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0") -set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") - |