summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristian linke <christian.linke@bmw.de>2013-01-08 16:31:16 +0100
committerchristian linke <christian.linke@bmw.de>2013-01-08 16:31:16 +0100
commit5485dee80853f3d014f929d538eb02fee1a62a66 (patch)
tree067c8bbd0a5edeedb1269451281d7a47bc4e1155
parenteb9ff538b99e08cb1a0d1a5e82d1159db90f8fac (diff)
downloadaudiomanager-5485dee80853f3d014f929d538eb02fee1a62a66.tar.gz
* remove python from nodestatemanger test, remove warnings from test CXX flags, fix compare warning
Signed-off-by: christian linke <christian.linke@bmw.de>
-rw-r--r--AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CAmNodeStateCommunicatorTest.cpp1
-rw-r--r--AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CMakeLists.txt1
-rw-r--r--AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp3
-rw-r--r--PluginCommandInterfaceDbus/test/CMakeLists.txt5
-rw-r--r--googleMock/CMakeLists.txt1
5 files changed, 7 insertions, 4 deletions
diff --git a/AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CAmNodeStateCommunicatorTest.cpp b/AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CAmNodeStateCommunicatorTest.cpp
index 0624ff4..68d7c89 100644
--- a/AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CAmNodeStateCommunicatorTest.cpp
+++ b/AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CAmNodeStateCommunicatorTest.cpp
@@ -20,7 +20,6 @@
*/
#include "CAmNodeStateCommunicatorTest.h"
-#include <Python.h>
#include "shared/CAmDltWrapper.h"
#include "shared/CAmSocketHandler.h"
#include "shared/CAmDbusWrapper.h"
diff --git a/AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CMakeLists.txt b/AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CMakeLists.txt
index 4300e49..f5b9b6d 100644
--- a/AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CMakeLists.txt
@@ -27,7 +27,6 @@ set(EXECUTABLE_OUTPUT_PATH ${TEST_EXECUTABLE_OUTPUT_PATH})
FIND_PACKAGE(Threads)
FIND_PACKAGE(DBUS REQUIRED)
FIND_PACKAGE(PkgConfig)
-FIND_PACKAGE(PythonLibs REQUIRED)
pkg_check_modules(SQLITE REQUIRED sqlite3)
diff --git a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp
index 9f172be..7f8bdf3 100644
--- a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp
+++ b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp
@@ -1801,7 +1801,8 @@ TEST_F(CAmRouterTest,simpleRoute4Domains)
compareRoute.sourceID = sourceID;
ASSERT_EQ(E_OK, pRouter.getRoute(false,sourceID,sinkID,listRoutes));
- ASSERT_EQ(1, listRoutes.size());
+ size_t size(1);
+ ASSERT_EQ(size, listRoutes.size());
ASSERT_TRUE(pCF.compareRoute(compareRoute,listRoutes[0]));
}
diff --git a/PluginCommandInterfaceDbus/test/CMakeLists.txt b/PluginCommandInterfaceDbus/test/CMakeLists.txt
index 148a4ba..d9d9e51 100644
--- a/PluginCommandInterfaceDbus/test/CMakeLists.txt
+++ b/PluginCommandInterfaceDbus/test/CMakeLists.txt
@@ -19,7 +19,10 @@ cmake_minimum_required(VERSION 2.6)
PROJECT(CAmCommandSenderDbusTests)
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
+
+string (REPLACE "-g -Wall -Wextra" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+string (REPLACE "-pedantic" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
set(STD_INCLUDE_DIRS "/usr/include")
set(EXECUTABLE_OUTPUT_PATH ${TEST_EXECUTABLE_OUTPUT_PATH})
diff --git a/googleMock/CMakeLists.txt b/googleMock/CMakeLists.txt
index 2db2f96..2569ddb 100644
--- a/googleMock/CMakeLists.txt
+++ b/googleMock/CMakeLists.txt
@@ -7,6 +7,7 @@
# BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to
# make it prominent in the GUI.
+
set (CMAKE_CXX_FLAGS "-std=gnu++0x -D_GNU_SOURCE -Wno-variadic-macros")
option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)