(AutomatedTests) Merged managed & unmanaged tests

[platform/core/uifw/dali-core.git] / automated-tests / src / dali-internal / CMakeLists.txt

diff --git a/automated-tests/src/dali-internal/CMakeLists.txt b/automated-tests/src/dali-internal/CMakeLists.txt
index fd77142..4eb0052 100644 (file)
--- a/automated-tests/src/dali-internal/CMakeLists.txt
+++ b/automated-tests/src/dali-internal/CMakeLists.txt
@@ -6,15 +6,24 @@ SET(RPM_NAME "core-${PKG_NAME}-tests")
 SET(CAPI_LIB "dali-internal")
 
 SET(TC_SOURCES
-        utc-Dali-ImageFactory.cpp
-        utc-Dali-Material.cpp
-        utc-DaliInternal-Font.cpp
-        utc-DaliInternal-ResourceClient.cpp
+        utc-Dali-Internal-Character.cpp
+        utc-Dali-Internal-Font.cpp
+        utc-Dali-Internal-Handles.cpp
+        utc-Dali-Internal-ImageFactory.cpp
+        utc-Dali-Internal-Mesh.cpp
+        utc-Dali-Internal-Text.cpp
+        utc-Dali-Internal-ResourceClient.cpp
+        utc-Dali-Internal-Image-Culling.cpp
+        utc-Dali-Internal-Text-Culling.cpp
+        utc-Dali-Internal-Constraint.cpp
 )
 
 LIST(APPEND TC_SOURCES
+        ../dali/dali-test-suite-utils/mesh-builder.cpp
+        ../dali/dali-test-suite-utils/test-harness.cpp
         ../dali/dali-test-suite-utils/dali-test-suite-utils.cpp
         ../dali/dali-test-suite-utils/test-application.cpp
+        ../dali/dali-test-suite-utils/test-dynamics.cpp
         ../dali/dali-test-suite-utils/test-gesture-manager.cpp
         ../dali/dali-test-suite-utils/test-gl-abstraction.cpp
         ../dali/dali-test-suite-utils/test-gl-sync-abstraction.cpp
@@ -22,14 +31,13 @@ LIST(APPEND TC_SOURCES
         ../dali/dali-test-suite-utils/test-platform-abstraction.cpp
         ../dali/dali-test-suite-utils/test-render-controller.cpp
         ../dali/dali-test-suite-utils/test-trace-call-stack.cpp
-        ../dali-unmanaged/dali-test-suite-utils/mesh-builder.cpp
 )
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
      dali-core
 )
 
-SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -O0 -ggdb --coverage")
+SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -O0 -ggdb --coverage -Wall -Werror=return-type")
 
 FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
     SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}")
@@ -38,7 +46,6 @@ ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
 INCLUDE_DIRECTORIES(
     ${${CAPI_LIB}_INCLUDE_DIRS}
     ../dali/dali-test-suite-utils
-    ../dali-unmanaged/dali-test-suite-utils
     ../../..
 )