TCT tests fix for Wayland refactor

Change-Id: I9cb7e8a348ef6e2bcb852af60474bc73e13243c7
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>

diff --git a/automated-tests/src/dali-adaptor-internal/CMakeLists.txt b/automated-tests/src/dali-adaptor-internal/CMakeLists.txt
index 8b3f686..8f30e59 100644 (file)
--- a/automated-tests/src/dali-adaptor-internal/CMakeLists.txt
+++ b/automated-tests/src/dali-adaptor-internal/CMakeLists.txt
@@ -42,10 +42,15 @@ FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
     SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}")
 ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
 
+# Adaptor directories are included in order of most-specific to least specific:
 INCLUDE_DIRECTORIES(
     ${${CAPI_LIB}_INCLUDE_DIRS}
     ../dali-adaptor/dali-test-suite-utils
-    ../../../adaptors/tizen
+    ../../../adaptors/mobile
+    ../../../adaptors/x11
+    ../../../adaptors/common
+    ../../../adaptors/base
+    ../../../adaptors/public-api
     ../../../
 )
 

diff --git a/automated-tests/src/dali-adaptor-internal/utc-Dali-CommandLineOptions.cpp b/automated-tests/src/dali-adaptor-internal/utc-Dali-CommandLineOptions.cpp
index 95d4c3d..d0e6339 100644 (file)
--- a/automated-tests/src/dali-adaptor-internal/utc-Dali-CommandLineOptions.cpp
+++ b/automated-tests/src/dali-adaptor-internal/utc-Dali-CommandLineOptions.cpp
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <dali/dali.h>
-#include <internal/command-line-options.h>
+#include <command-line-options.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali-adaptor-internal/utc-Dali-TiltSensor.cpp b/automated-tests/src/dali-adaptor-internal/utc-Dali-TiltSensor.cpp
index a49ef26..8461789 100644 (file)
--- a/automated-tests/src/dali-adaptor-internal/utc-Dali-TiltSensor.cpp
+++ b/automated-tests/src/dali-adaptor-internal/utc-Dali-TiltSensor.cpp
@@ -21,7 +21,7 @@
 #include <Ecore.h>
 #include <dali/dali.h>
 #include <dali-test-suite-utils.h>
-#include <internal/common/tilt-sensor-impl.h>
+#include <tilt-sensor-impl.h>
 
 using namespace Dali;