X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2FCMakeLists.txt;h=bd9848fec1c362355b8e145bcd77f402dc14027b;hp=6031392281d3bd21d4818b2fc28d18afac81e685;hb=79267e9786ebcba2b4d79e2f8f75d9b01610e29d;hpb=bbcf594f5a6c2f41773ccffd2f80bd53d7c310a6

diff --git a/automated-tests/src/dali-toolkit/CMakeLists.txt b/automated-tests/src/dali-toolkit/CMakeLists.txt
old mode 100644
new mode 100755
index 6031392..bd9848f
--- a/automated-tests/src/dali-toolkit/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit/CMakeLists.txt
@@ -7,101 +7,128 @@ SET(CAPI_LIB "dali-toolkit")
 
 # List of test case sources (Only these get parsed for test cases)
 SET(TC_SOURCES
-   utc-Dali-Alignment.cpp
-   utc-Dali-BloomView.cpp
-   utc-Dali-BubbleEmitter.cpp
-   utc-Dali-Builder.cpp
-   utc-Dali-CheckBoxButton.cpp
-   utc-Dali-ConfirmationPopup.cpp
-   utc-Dali-CubeTransitionEffect.cpp
-   utc-Dali-EffectsView.cpp
-   utc-Dali-FlexContainer.cpp
-   utc-Dali-GaussianBlurView.cpp
-   utc-Dali-ImageView.cpp
-   utc-Dali-JsonParser.cpp
-   utc-Dali-KeyInputFocusManager.cpp
-   utc-Dali-PageTurnView.cpp
-   utc-Dali-Script.cpp
-   utc-Dali-ScrollBar.cpp
-   utc-Dali-ScrollView.cpp
-   utc-Dali-ShaderEffects.cpp
-   utc-Dali-ShadowView.cpp
-   utc-Dali-Slider.cpp
-   utc-Dali-TableView.cpp
-   utc-Dali-TextEditor.cpp
-   utc-Dali-TextField.cpp
-   utc-Dali-TextLabel.cpp
-   utc-Dali-TextSelectionPopup.cpp
-   utc-Dali-ToolBar.cpp
-   utc-Dali-Button.cpp
-   utc-Dali-Control.cpp
-   utc-Dali-ControlImpl.cpp
-   utc-Dali-AccessibilityManager.cpp
-   utc-Dali-ItemLayout.cpp
-   utc-Dali-ItemView.cpp
-   utc-Dali-KeyboardFocusManager.cpp
-   utc-Dali-Magnifier.cpp
-   utc-Dali-NavigationView.cpp
-   utc-Dali-Popup.cpp
-   utc-Dali-ProgressBar.cpp
-   utc-Dali-PushButton.cpp
-   utc-Dali-RadioButton.cpp
-   utc-Dali-ScrollViewEffect.cpp
-   utc-Dali-SuperBlurView.cpp
-   utc-Dali-Toolkit.cpp
-   utc-Dali-Model3dView.cpp
-   utc-Dali-Visual.cpp
-   utc-Dali-VisualFactory.cpp
-   utc-Dali-DebugRendering.cpp
-   utc-Dali-ImageAtlas.cpp
-   utc-Dali-VideoView.cpp
-   utc-Dali-AsyncImageLoader.cpp
+  utc-Dali-AbsoluteLayout.cpp
+  utc-Dali-Alignment.cpp
+  utc-Dali-AnimatedImageVisual.cpp
+  utc-Dali-AnimatedVectorImageVisual.cpp
+  utc-Dali-BinLayout.cpp
+  utc-Dali-BloomView.cpp
+  utc-Dali-BubbleEmitter.cpp
+  utc-Dali-Builder.cpp
+  utc-Dali-CheckBoxButton.cpp
+  utc-Dali-ConfirmationPopup.cpp
+  utc-Dali-CubeTransitionEffect.cpp
+  utc-Dali-EffectsView.cpp
+  utc-Dali-FlexContainer.cpp
+  utc-Dali-FlexLayout.cpp
+  utc-Dali-GaussianBlurView.cpp
+  utc-Dali-GridLayout.cpp
+  utc-Dali-ImageView.cpp
+  utc-Dali-ImageVisual.cpp
+  utc-Dali-JsonParser.cpp
+  utc-Dali-KeyInputFocusManager.cpp
+  utc-Dali-Layouting.cpp
+  utc-Dali-LayoutingAnimation.cpp
+  utc-Dali-LayoutingNesting.cpp
+  utc-Dali-LayoutingResizePolicy.cpp
+  utc-Dali-LayoutingSettingAndRemoval.cpp
+  utc-Dali-PageTurnView.cpp
+  utc-Dali-Scene3dView.cpp
+  utc-Dali-Script.cpp
+  utc-Dali-ScrollBar.cpp
+  utc-Dali-ScrollView.cpp
+  utc-Dali-ShaderEffects.cpp
+  utc-Dali-ShadowView.cpp
+  utc-Dali-Slider.cpp
+  utc-Dali-TableView.cpp
+  utc-Dali-TextEditor.cpp
+  utc-Dali-TextField.cpp
+  utc-Dali-TextLabel.cpp
+  utc-Dali-TextSelectionPopup.cpp
+  utc-Dali-TextSelectionPopupMirroringLTR.cpp
+  utc-Dali-TextSelectionPopupMirroringRTL.cpp
+  utc-Dali-TextureManager.cpp
+  utc-Dali-ToolBar.cpp
+  utc-Dali-Tooltip.cpp
+  utc-Dali-TransitionData.cpp
+  utc-Dali-Button.cpp
+  utc-Dali-Control.cpp
+  utc-Dali-ControlImpl.cpp
+  utc-Dali-AccessibilityManager.cpp
+  utc-Dali-ItemLayout.cpp
+  utc-Dali-ItemView.cpp
+  utc-Dali-KeyboardFocusManager.cpp
+  utc-Dali-Magnifier.cpp
+  utc-Dali-NavigationView.cpp
+  utc-Dali-Popup.cpp
+  utc-Dali-ProgressBar.cpp
+  utc-Dali-PushButton.cpp
+  utc-Dali-RadioButton.cpp
+  utc-Dali-ToggleButton.cpp
+  utc-Dali-ScrollViewEffect.cpp
+  utc-Dali-SuperBlurView.cpp
+  utc-Dali-Toolkit.cpp
+  utc-Dali-Model3dView.cpp
+  utc-Dali-Visual.cpp
+  utc-Dali-VisualFactory.cpp
+  utc-Dali-ImageAtlas.cpp
+  utc-Dali-VideoView.cpp
+  utc-Dali-WebView.cpp
+  utc-Dali-AsyncImageLoader.cpp
+  utc-Dali-SyncImageLoader.cpp
+  utc-Dali-ControlWrapper.cpp
+  utc-Dali-DragAndDropDetector.cpp
 )
 
 # Append list of test harness files (Won't get parsed for test cases)
 LIST(APPEND TC_SOURCES
-   dali-toolkit-test-utils/toolkit-adaptor.cpp
-   dali-toolkit-test-utils/toolkit-accessibility-adaptor.cpp
-   dali-toolkit-test-utils/toolkit-application.cpp
-   dali-toolkit-test-utils/toolkit-bitmap-loader.cpp
-   dali-toolkit-test-utils/toolkit-clipboard.cpp
-   dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp
-   dali-toolkit-test-utils/toolkit-event-thread-callback.cpp
-   dali-toolkit-test-utils/toolkit-environment-variable.cpp
-   dali-toolkit-test-utils/toolkit-imf-manager.cpp
-   dali-toolkit-test-utils/toolkit-orientation.cpp
-   dali-toolkit-test-utils/toolkit-physical-keyboard.cpp
-   dali-toolkit-test-utils/toolkit-style-monitor.cpp
-   dali-toolkit-test-utils/toolkit-singleton-service.cpp
-   dali-toolkit-test-utils/toolkit-timer.cpp
-   dali-toolkit-test-utils/toolkit-tts-player.cpp
-   dali-toolkit-test-utils/toolkit-native-image-source.cpp
-   dali-toolkit-test-utils/toolkit-video-player.cpp
-   dali-toolkit-test-utils/dali-test-suite-utils.cpp
-   dali-toolkit-test-utils/dummy-control.cpp
-   dali-toolkit-test-utils/mesh-builder.cpp
-   dali-toolkit-test-utils/test-actor-utils.cpp
-   dali-toolkit-test-utils/test-animation-data.cpp
-   dali-toolkit-test-utils/test-application.cpp
-   dali-toolkit-test-utils/test-button.cpp
-   dali-toolkit-test-utils/test-harness.cpp
-   dali-toolkit-test-utils/test-gesture-manager.cpp
-   dali-toolkit-test-utils/test-gl-abstraction.cpp
-   dali-toolkit-test-utils/test-gl-sync-abstraction.cpp
-   dali-toolkit-test-utils/test-platform-abstraction.cpp
-   dali-toolkit-test-utils/test-render-controller.cpp
-   dali-toolkit-test-utils/test-trace-call-stack.cpp
-   dali-toolkit-test-utils/test-native-image.cpp
+  custom-layout.cpp
+  custom-layout-impl.cpp
+  dali-toolkit-test-utils/toolkit-adaptor.cpp
+  dali-toolkit-test-utils/toolkit-accessibility-adaptor.cpp
+  dali-toolkit-test-utils/toolkit-application.cpp
+  dali-toolkit-test-utils/toolkit-clipboard.cpp
+  dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp
+  dali-toolkit-test-utils/toolkit-event-thread-callback.cpp
+  dali-toolkit-test-utils/toolkit-environment-variable.cpp
+  dali-toolkit-test-utils/toolkit-input-method-context.cpp
+  dali-toolkit-test-utils/toolkit-orientation.cpp
+  dali-toolkit-test-utils/toolkit-physical-keyboard.cpp
+  dali-toolkit-test-utils/toolkit-style-monitor.cpp
+  dali-toolkit-test-utils/toolkit-singleton-service.cpp
+  dali-toolkit-test-utils/toolkit-timer.cpp
+  dali-toolkit-test-utils/toolkit-tts-player.cpp
+  dali-toolkit-test-utils/toolkit-native-image-source.cpp
+  dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp
+  dali-toolkit-test-utils/toolkit-video-player.cpp
+  dali-toolkit-test-utils/toolkit-web-engine.cpp
+  dali-toolkit-test-utils/toolkit-trigger-event-factory.cpp
+  dali-toolkit-test-utils/dali-test-suite-utils.cpp
+  dali-toolkit-test-utils/dummy-control.cpp
+  dali-toolkit-test-utils/layout-utils.cpp
+  dali-toolkit-test-utils/mesh-builder.cpp
+  dali-toolkit-test-utils/test-actor-utils.cpp
+  dali-toolkit-test-utils/test-animation-data.cpp
+  dali-toolkit-test-utils/test-application.cpp
+  dali-toolkit-test-utils/test-button.cpp
+  dali-toolkit-test-utils/test-harness.cpp
+  dali-toolkit-test-utils/test-gesture-manager.cpp
+  dali-toolkit-test-utils/test-gl-abstraction.cpp
+  dali-toolkit-test-utils/test-gl-sync-abstraction.cpp
+  dali-toolkit-test-utils/test-platform-abstraction.cpp
+  dali-toolkit-test-utils/test-render-controller.cpp
+  dali-toolkit-test-utils/test-trace-call-stack.cpp
+  dali-toolkit-test-utils/test-native-image.cpp
 )
 
-
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
-    dali-core
-    dali-adaptor
-    dali-toolkit
+  dali-core
+  dali-adaptor
+  dali-toolkit
 )
 
-SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -O0 -ggdb --coverage -Wall -Werror")
+ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror -DDEBUG_ENABLED)
+ADD_COMPILE_OPTIONS( ${${CAPI_LIB}_CFLAGS_OTHER} )
 
 ADD_DEFINITIONS(-DTEST_RESOURCE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/../../resources\" )
 
@@ -118,7 +145,7 @@ INCLUDE_DIRECTORIES(
 ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})
 TARGET_LINK_LIBRARIES(${EXEC_NAME}
     ${${CAPI_LIB}_LIBRARIES}
-    -lpthread
+    -lpthread --coverage
 )
 
 INSTALL(PROGRAMS ${EXEC_NAME}