Updated after const -> constexpr changes

Change-Id: I31ac3d23b1e31e4e9c49e4f25da4f79f39897b30

diff --git a/automated-tests/CMakeLists.txt b/automated-tests/CMakeLists.txt
index 5b1729a..7700589 100644 (file)
--- a/automated-tests/CMakeLists.txt
+++ b/automated-tests/CMakeLists.txt
@@ -1,6 +1,8 @@
 include(CheckIncludeFileCXX)
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.8.2)
+SET(CMAKE_CXX_STANDARD 17)
+
 PROJECT(tct_coreapi_utc)
 
 INCLUDE(FindPkgConfig)

diff --git a/automated-tests/src/dali-adaptor-internal/CMakeLists.txt b/automated-tests/src/dali-adaptor-internal/CMakeLists.txt
index cf0069c..e83c487 100644 (file)
--- a/automated-tests/src/dali-adaptor-internal/CMakeLists.txt
+++ b/automated-tests/src/dali-adaptor-internal/CMakeLists.txt
@@ -67,7 +67,7 @@ INCLUDE_DIRECTORIES(
 ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})
 TARGET_LINK_LIBRARIES(${EXEC_NAME}
     ${${CAPI_LIB}_LIBRARIES}
-    -lpthread --coverage
+    -lpthread --coverage -rdynamic
 )
 
 INSTALL(PROGRAMS ${EXEC_NAME}
@@ -80,11 +80,10 @@ SET(ADDON_NAME SampleAddOn )
 SET(ADDON_SOURCES addons/test-sample-addon.cpp )
 ADD_LIBRARY( ${ADDON_NAME} SHARED ${ADDON_SOURCES} )
 TARGET_LINK_LIBRARIES(${ADDON_NAME}
-        -lpthread -ldl --coverage
+        -lpthread -ldl --coverage -rdynamic
         )
 
 INSTALL( TARGETS ${ADDON_NAME} DESTINATION ${BIN_DIR} )
 
 # store AddOn list
 FILE( WRITE ${CMAKE_CURRENT_BINARY_DIR}/addons.txt lib${ADDON_NAME}.so )
-

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.cpp b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.cpp
index 4a4ac81..87750e2 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.cpp
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.cpp
@@ -40,6 +40,8 @@ void tet_result(int32_t value)
 #define END_TEST \
   return ((test_return_value>0)?1:0)
 
+extern "C"
+{
 
 void tet_infoline(const char* str)
 {
@@ -53,6 +55,8 @@ void tet_printf(const char *format, ...)
   vfprintf(stderr, format, arg);
   va_end(arg);
 }
+}
+
 
 bool operator==(TimePeriod a, TimePeriod b)
 {

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h
index ac9b214..7ba3196 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h
@@ -29,8 +29,11 @@
 #include <dali/public-api/dali-core.h>
 #include <test-compare-types.h>
 
+extern "C"
+{
 void tet_infoline(const char*str);
 void tet_printf(const char *format, ...);
+}
 
 #include "test-application.h"
 #include "test-actor-utils.h"