diff options
author | Christian Linke <Christian.Linke@bmw.de> | 2016-03-08 06:38:33 -0800 |
---|---|---|
committer | Christian Linke <Christian.Linke@bmw.de> | 2016-03-09 05:24:34 -0800 |
commit | daf851ee7a41d1b0572c0c95e15f61e427ce97f1 (patch) | |
tree | 10b709ca4ebbeba72fd08a616a74ca00b89cfe8d /AudioManagerCore/test | |
parent | 6c8aa325ae196c0a58a06086244e080b4b98b554 (diff) | |
download | audiomanager-daf851ee7a41d1b0572c0c95e15f61e427ce97f1.tar.gz |
some cleanup
Signed-off-by: Christian Linke <Christian.Linke@bmw.de>
Diffstat (limited to 'AudioManagerCore/test')
9 files changed, 12 insertions, 154 deletions
diff --git a/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt b/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt index 4f33ac5..7660bbf 100644 --- a/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt +++ b/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt @@ -33,9 +33,9 @@ INCLUDE_DIRECTORIES( add_executable(AmControlInterfaceTest ${CONTROL_INTERFACE_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmControlInterfaceTest - ${GTEST_LIBRARIES} - ${GMOCK_LIBRARIES} - AudioManagerCore + ${GTEST_LIBRARIES} + ${GMOCK_LIBRARIES} + AudioManagerCore ) add_test(AmControlInterfaceTest AmControlInterfaceTest) diff --git a/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt~ b/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt~ deleted file mode 100644 index 5b71a59..0000000 --- a/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt~ +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright (C) 2012, BMW AG -# -# This file is part of GENIVI Project AudioManager. -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# -# copyright -# This Source Code Form is subject to the terms of the -# 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 Linke, christian.linke@bmw.de BMW 2011,2012 -# -# For further information see http://www.genivi.org/. -# - -cmake_minimum_required(VERSION 3.0) - -project(AmControlInterfaceTest LANGUAGES CXX VERSION ${DAEMONVERSION}) - -INCLUDE_DIRECTORIES( - ${AUDIOMANAGER_CORE_INCLUDE} - ${GMOCK_INCLUDE_DIRS} - ${GTEST_INCLUDE_DIRS}) - - - file(GLOB CONTROL_INTERFACE_SRCS_CXX - "../CAmCommonFunctions.cpp" - "*.cpp" -) - -add_executable(AmControlInterfaceTest ${CONTROL_INTERFACE_SRCS_CXX}) - -TARGET_LINK_LIBRARIES(AmControlInterfaceTest - ${GTEST_LIBRARIES} - ${GMOCK_LIBRARIES} - AudioManagerCore -) - -ADD_DEPENDENCIES(AmControlInterfaceTest AudioManagerCore) - -INSTALL(TARGETS AmControlInterfaceTest - DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - COMPONENT tests) - - - - diff --git a/AudioManagerCore/test/AmMapHandlerTest/CMakeLists.txt b/AudioManagerCore/test/AmMapHandlerTest/CMakeLists.txt index 6588710..41c62c7 100644 --- a/AudioManagerCore/test/AmMapHandlerTest/CMakeLists.txt +++ b/AudioManagerCore/test/AmMapHandlerTest/CMakeLists.txt @@ -39,6 +39,8 @@ TARGET_LINK_LIBRARIES( AmMapHandlerTest AudioManagerCore ) +ADD_TEST(AmMapHandlerTest AmMapHandlerTest) + ADD_DEPENDENCIES(AmMapHandlerTest AudioManagerCore) INSTALL(TARGETS AmMapHandlerTest diff --git a/AudioManagerCore/test/AmMapHandlerTest/CMakeLists.txt~ b/AudioManagerCore/test/AmMapHandlerTest/CMakeLists.txt~ deleted file mode 100644 index 05d2a05..0000000 --- a/AudioManagerCore/test/AmMapHandlerTest/CMakeLists.txt~ +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright (C) 2012, BMW AG -# -# This file is part of GENIVI Project AudioManager. -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# -# copyright -# This Source Code Form is subject to the terms of the -# 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 Linke, christian.linke@bmw.de BMW 2011,2012 -# -# For further information see http://www.genivi.org/. -# - -cmake_minimum_required(VERSION 3.0) - -project(AmMapHandlerTest LANGUAGES CXX VERSION ${DAEMONVERSION}) - -INCLUDE_DIRECTORIES( - ${AUDIOMANAGER_UTILITIES_INCLUDE} - ${GMOCK_INCLUDE_DIRS} -) - -if(WITH_DLT) - INCLUDE_DIRECTORIES( - ${INCLUDE_DIRECTORIES} - ${DLT_INCLUDE_DIRS}) -endif(WITH_DLT) - -file(GLOB DATABASE_SRCS_CXX - "../CAmCommonFunctions.cpp" - "CAmTestDatabaseObserver.cpp" - "*.cpp" - ) - -ADD_EXECUTABLE( AmMapHandlerTest ${DATABASE_SRCS_CXX}) - -TARGET_LINK_LIBRARIES( AmMapHandlerTest - ${GTEST_LIBRARIES} - ${GMOCK_LIBRARIES} - AudioManagerCore -) - -ADD_DEPENDENCIES(AmMapHandlerTest AudioManagerCore) - -INSTALL(TARGETS AmMapHandlerTest - DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - COMPONENT tests -) - diff --git a/AudioManagerCore/test/AmRouterMapTest/CMakeLists.txt b/AudioManagerCore/test/AmRouterMapTest/CMakeLists.txt index 17689d9..dc2732c 100644 --- a/AudioManagerCore/test/AmRouterMapTest/CMakeLists.txt +++ b/AudioManagerCore/test/AmRouterMapTest/CMakeLists.txt @@ -37,6 +37,8 @@ TARGET_LINK_LIBRARIES(AmRouterMapTest AudioManagerCore ) +ADD_TEST(AmRouterMapTest AmRouterMapTest) + ADD_DEPENDENCIES(AmRouterMapTest AudioManagerCore) INSTALL(TARGETS AmRouterMapTest diff --git a/AudioManagerCore/test/AmRouterTest/CMakeLists.txt b/AudioManagerCore/test/AmRouterTest/CMakeLists.txt index d1c0635..89094c8 100644 --- a/AudioManagerCore/test/AmRouterTest/CMakeLists.txt +++ b/AudioManagerCore/test/AmRouterTest/CMakeLists.txt @@ -40,6 +40,8 @@ TARGET_LINK_LIBRARIES(AmRouterTest ADD_DEPENDENCIES(AmRouterTest AudioManagerCore) +ADD_TEST(AmRouterTest AmRouterTest) + INSTALL(TARGETS AmRouterTest DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ diff --git a/AudioManagerCore/test/AmRoutingInterfaceTest/CMakeLists.txt b/AudioManagerCore/test/AmRoutingInterfaceTest/CMakeLists.txt index dc5115d..6d47c15 100644 --- a/AudioManagerCore/test/AmRoutingInterfaceTest/CMakeLists.txt +++ b/AudioManagerCore/test/AmRoutingInterfaceTest/CMakeLists.txt @@ -33,6 +33,8 @@ file(GLOB ROUTING_INTERFACE_SRCS_CXX ADD_EXECUTABLE(AmRoutingInterfaceTest ${ROUTING_INTERFACE_SRCS_CXX}) +ADD_TEST(AmRoutingInterfaceTest AmRoutingInterfaceTest) + TARGET_LINK_LIBRARIES(AmRoutingInterfaceTest ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} diff --git a/AudioManagerCore/test/AmTelnetServerTest/CMakeLists.txt b/AudioManagerCore/test/AmTelnetServerTest/CMakeLists.txt index 8dcb0a3..746edb5 100644 --- a/AudioManagerCore/test/AmTelnetServerTest/CMakeLists.txt +++ b/AudioManagerCore/test/AmTelnetServerTest/CMakeLists.txt @@ -35,7 +35,7 @@ TARGET_LINK_LIBRARIES(AmTelnetServerTest ${GMOCK_LIBRARIES} AudioManagerCore ) -add_test(AmTelnetServerTest AmTelnetServerTest) +#add_test(AmTelnetServerTest AmTelnetServerTest) ADD_DEPENDENCIES(AmTelnetServerTest AudioManagerCore) diff --git a/AudioManagerCore/test/AmTelnetServerTest/CMakeLists.txt~ b/AudioManagerCore/test/AmTelnetServerTest/CMakeLists.txt~ deleted file mode 100644 index 51e92b8..0000000 --- a/AudioManagerCore/test/AmTelnetServerTest/CMakeLists.txt~ +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (C) 2012, BMW AG -# -# This file is part of GENIVI Project AudioManager. -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# -# copyright -# This Source Code Form is subject to the terms of the -# 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 Linke, christian.linke@bmw.de BMW 2011,2012 -# -# For further information see http://www.genivi.org/. -# - -cmake_minimum_required(VERSION 3.0) - -PROJECT(AmTelnetServerTest LANGUAGES CXX VERSION ${DAEMONVERSION}) - -INCLUDE_DIRECTORIES( - ${AUDIOMANAGER_CORE_INCLUDE} - ${GMOCK_INCLUDE_DIR}) - -file(GLOB TELNET_SRCS_CXX - "*.cpp" -) - -ADD_EXECUTABLE(AmTelnetServerTest ${TELNET_SRCS_CXX}) - -TARGET_LINK_LIBRARIES(AmTelnetServerTest - ${GTEST_LIBRARIES} - ${GMOCK_LIBRARIES} - AudioManagerCore -) - -ADD_DEPENDENCIES(AmTelnetServerTest AudioManagerCore) - -INSTALL(TARGETS AmTelnetServerTest - DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - COMPONENT tests -) - - |