From bb8dfe371876f466d2ade1dccdd1e6c56dbda780 Mon Sep 17 00:00:00 2001 From: David Steele Date: Thu, 27 Jun 2024 14:54:58 +0100 Subject: [PATCH] Changed test harness to work with Vulkan build Renamed dali-graphics module to dali-egl-graphics If the main build is Vulkan, then some of the test modules won't build, nor will some of the tests in particular modules. Added a configure option to the main build to configure the top level test harness CMakeLists.txt with the ENABLE_VULKAN option. Added handling to the scripts to use CMake cache to figure out list of source files for a given module rather than using AWK on CMakeLists.txt. This enables conditional source inclusion based on whether Vulkan is enabled or not in the main build. (tct--core.h is generated in source tree by these scripts) Changed the build script to ignore dali-egl-graphics module if VULKAN is enabled. Changed the execute script to use only the built folders, not the source folders to determine what to run. Change-Id: Id00dd7c00d011af7d40c6b4b1b138e0ac0a58fa6 Signed-off-by: David Steele --- automated-tests/CMakeLists.txt | 2 + automated-tests/CMakeLists.txt.in | 17 ++++++++ automated-tests/build.sh | 40 ++++++++++++++----- automated-tests/execute.sh | 3 +- automated-tests/scripts/retriever.sh | 12 ++++-- .../src/dali-adaptor-internal/CMakeLists.txt | 12 +++++- .../src/dali-adaptor/CMakeLists.txt | 15 ++++++- .../CMakeLists.txt | 10 +++-- .../tct-dali-egl-graphics-core.cpp} | 2 +- .../utc-Dali-GraphicsBuffer.cpp | 2 +- .../utc-Dali-GraphicsDraw.cpp | 2 +- .../utc-Dali-GraphicsFramebuffer.cpp | 2 +- .../utc-Dali-GraphicsGeometry.cpp | 0 .../utc-Dali-GraphicsNativeImage.cpp | 2 +- .../utc-Dali-GraphicsProgram.cpp | 4 +- .../utc-Dali-GraphicsSampler.cpp | 2 +- .../utc-Dali-GraphicsShader.cpp | 30 +++++++------- .../utc-Dali-GraphicsShaderParser.cpp | 0 .../utc-Dali-GraphicsTexture.cpp | 2 +- .../dali-platform-abstraction/CMakeLists.txt | 2 + build/tizen/CMakeLists.txt | 3 +- build/tizen/deps-check.cmake | 10 ++++- 22 files changed, 128 insertions(+), 46 deletions(-) create mode 100644 automated-tests/CMakeLists.txt.in rename automated-tests/src/{dali-graphics => dali-egl-graphics}/CMakeLists.txt (90%) rename automated-tests/src/{dali-graphics/tct-dali-graphics-core.cpp => dali-egl-graphics/tct-dali-egl-graphics-core.cpp} (75%) rename automated-tests/src/{dali-graphics => dali-egl-graphics}/utc-Dali-GraphicsBuffer.cpp (97%) rename automated-tests/src/{dali-graphics => dali-egl-graphics}/utc-Dali-GraphicsDraw.cpp (98%) rename automated-tests/src/{dali-graphics => dali-egl-graphics}/utc-Dali-GraphicsFramebuffer.cpp (99%) rename automated-tests/src/{dali-graphics => dali-egl-graphics}/utc-Dali-GraphicsGeometry.cpp (100%) rename automated-tests/src/{dali-graphics => dali-egl-graphics}/utc-Dali-GraphicsNativeImage.cpp (97%) rename automated-tests/src/{dali-graphics => dali-egl-graphics}/utc-Dali-GraphicsProgram.cpp (99%) rename automated-tests/src/{dali-graphics => dali-egl-graphics}/utc-Dali-GraphicsSampler.cpp (99%) rename automated-tests/src/{dali-graphics => dali-egl-graphics}/utc-Dali-GraphicsShader.cpp (87%) rename automated-tests/src/{dali-graphics => dali-egl-graphics}/utc-Dali-GraphicsShaderParser.cpp (100%) rename automated-tests/src/{dali-graphics => dali-egl-graphics}/utc-Dali-GraphicsTexture.cpp (98%) diff --git a/automated-tests/CMakeLists.txt b/automated-tests/CMakeLists.txt index 7700589aa..b9d7387e9 100644 --- a/automated-tests/CMakeLists.txt +++ b/automated-tests/CMakeLists.txt @@ -8,6 +8,8 @@ PROJECT(tct_coreapi_utc) INCLUDE(FindPkgConfig) SET(BIN_DIR "/opt/usr/bin") +OPTION(ENABLE_VULKAN "Whether to build tests for vulkan or gl" ON) + INCLUDE_DIRECTORIES( src/common ) diff --git a/automated-tests/CMakeLists.txt.in b/automated-tests/CMakeLists.txt.in new file mode 100644 index 000000000..b79475b62 --- /dev/null +++ b/automated-tests/CMakeLists.txt.in @@ -0,0 +1,17 @@ +include(CheckIncludeFileCXX) + +CMAKE_MINIMUM_REQUIRED(VERSION 3.8.2) +SET(CMAKE_CXX_STANDARD 17) + +PROJECT(tct_coreapi_utc) + +INCLUDE(FindPkgConfig) +SET(BIN_DIR "/opt/usr/bin") + +OPTION(ENABLE_VULKAN "Whether to build tests for vulkan or gl" @ENABLE_VULKAN@) + +INCLUDE_DIRECTORIES( + src/common +) + +ADD_SUBDIRECTORY(src) diff --git a/automated-tests/build.sh b/automated-tests/build.sh index a56cd87e1..513dcd73a 100755 --- a/automated-tests/build.sh +++ b/automated-tests/build.sh @@ -28,30 +28,52 @@ fi function build { - if [ $opt_generate == true -o $opt_rebuild == false ] ; then - (cd src/$1; ../../scripts/tcheadgen.sh tct-$1-core.h) - if [ $? -ne 0 ]; then echo "Aborting..."; exit 1; fi - fi + echo Building $1 + BUILDSYSTEM="Unix Makefiles" BUILDCMD=make if [ -e ../build/tizen/build.ninja ] ; then BUILDSYSTEM="Ninja" BUILDCMD=ninja fi + + if [ $opt_generate == true -o $opt_rebuild == false ] ; then + (cd build ; rm CMakeCache.txt ; cmake .. -C /dev/null -G "$BUILDSYSTEM" -DMODULE=$1) + (cd src/$1; ../../scripts/retriever.sh -l) + (cd src/$1; ../../scripts/tcheadgen.sh tct-$1-core.h) + if [ $? -ne 0 ]; then echo "Aborting..."; exit 1; fi + fi + (cd build ; cmake .. -DMODULE=$1 -G "$BUILDSYSTEM" ; $BUILDCMD -j7 ) } +# Query main build to determine if we are using vulkan or egl +ENABLE_VULKAN=0 +(cd ../build/tizen ; cmake -LA -N 2>/dev/null | grep ENABLE_VULKAN | grep "\=ON") +if [ $? -eq 0 ] ; then + ENABLE_VULKAN=1 +fi if [ -n "$1" ] ; then echo BUILDING ONLY $1 build $1 else for mod in `ls -1 src/ | grep -v CMakeList ` do - if [ $mod != 'common' ] && [ $mod != 'manual' ]; then - echo BUILDING $mod - build $mod - if [ $? -ne 0 ]; then echo "Build failed" ; exit 1; fi - fi + build=0 + # Don't build dali-egl-graphics if we are using Vulkan... + if [ $mod == 'dali-egl-graphics' ] ; then + if [ $ENABLE_VULKAN == 0 ] ; then + build=1 + fi + elif [ $mod != 'common' ] && [ $mod != 'manual' ]; then + build=1 + fi + + if [ $build == 1 ] ; then + echo BUILDING $mod + build $mod + if [ $? -ne 0 ]; then echo "Build failed" ; exit 1; fi + fi done fi diff --git a/automated-tests/execute.sh b/automated-tests/execute.sh index 152b0524e..1f45211c0 100755 --- a/automated-tests/execute.sh +++ b/automated-tests/execute.sh @@ -97,9 +97,9 @@ function output_end EOF } +modules=`ls -1 build/src | grep -v CMakeFiles | grep -v cmake_install.cmake` if [ $opt_modules == 1 ] ; then - modules= get_modules echo $modules exit 0 fi @@ -116,7 +116,6 @@ find build \( -name "*.gcda" \) -exec rm '{}' \; ASCII_BOLD="\e[1m" ASCII_RESET="\e[0m" -modules=`ls -1 src/ | grep -v CMakeList | grep -v common | grep -v manual` if [ -f summary.xml ] ; then unlink summary.xml ; fi if [ $opt_tct == 1 ] ; then diff --git a/automated-tests/scripts/retriever.sh b/automated-tests/scripts/retriever.sh index c1d466d03..1bcbcde7c 100755 --- a/automated-tests/scripts/retriever.sh +++ b/automated-tests/scripts/retriever.sh @@ -13,7 +13,7 @@ In case of TC in form of "int tc_name()" script will abort. EOF ) -function get_tc_files { +function get_tc_files_old { CMAKE_FILE="$DIR/CMakeLists.txt" if [ ! -e $CMAKE_FILE ]; then echo "File $CMAKE_FILE not found. Aborting..." @@ -46,6 +46,10 @@ function get_tc_files { }') } +function get_tc_files { + TC_FILES=$(cd ../../build; cmake -LA -N 2>/dev/null | grep TC_SOURCE_LIST | perl -n -e 'my ($blah, $vars)=split(/=/,$_);my @files=split(/;/, $vars); print join("\n", @files) ;' ) +} + function tc_names { if [[ -z "$1" ]]; then exit @@ -163,13 +167,13 @@ function tc_fullinfo { # usage note and exit: # - argument begin with '-' but is not recognised or number of arguments is > 3, # - argument doesn't begin with '-' and number of arguments is > 2 -if [[ ( "$1" == -* && ( ! "$1" =~ ^-(anum|mnum|f)$ || $# > 3 ) ) || ( "$1" != -* && $# > 2 ) ]]; then +if [[ ( "$1" == -* && ( ! "$1" =~ ^-(anum|mnum|f|l)$ || $# > 3 ) ) || ( "$1" != -* && $# > 2 ) ]]; then echo -e "$USAGE" exit 1 fi # get directory from last argument (or assume current one) -if [[ ! "$1" =~ ^-(anum|mnum|f)$ ]]; then +if [[ ! "$1" =~ ^-(anum|mnum|f|l)$ ]]; then DIR=${1:-.} else DIR=${2:-.} @@ -207,6 +211,8 @@ case "$1" in tc_mnum $TC_FILES ;; -f) tc_fullinfo $TC_FILES ;; + -l) + echo $TC_FILES ;; *) tc_names $TC_FILES ;; esac diff --git a/automated-tests/src/dali-adaptor-internal/CMakeLists.txt b/automated-tests/src/dali-adaptor-internal/CMakeLists.txt index ad09bad35..a9424bd2a 100644 --- a/automated-tests/src/dali-adaptor-internal/CMakeLists.txt +++ b/automated-tests/src/dali-adaptor-internal/CMakeLists.txt @@ -3,6 +3,8 @@ SET(PKG_NAME "dali-adaptor-internal") SET(EXEC_NAME "tct-${PKG_NAME}-core") SET(RPM_NAME "core-${PKG_NAME}-tests") +MESSAGE(STATUS "ENABLE_VULKAN: ${ENABLE_VULKAN}") + SET(CAPI_LIB "dali-adaptor-internal") SET(TC_SOURCES @@ -19,9 +21,17 @@ SET(TC_SOURCES utc-Dali-LRUCacheContainer.cpp utc-Dali-TiltSensor.cpp utc-Dali-WbmpLoader.cpp +) + +IF(ENABLE_VULKAN) +ELSE() + LIST(APPEND TC_SOURCES utc-Dali-GlImplementation.cpp utc-Dali-GlesImplementation.cpp -) + ) +ENDIF() + +SET(TC_SOURCE_LIST ${TC_SOURCES} CACHE STRING "List of test sources") LIST(APPEND TC_SOURCES image-loaders.cpp diff --git a/automated-tests/src/dali-adaptor/CMakeLists.txt b/automated-tests/src/dali-adaptor/CMakeLists.txt index ab191d0e8..7dbf4ecf3 100644 --- a/automated-tests/src/dali-adaptor/CMakeLists.txt +++ b/automated-tests/src/dali-adaptor/CMakeLists.txt @@ -3,15 +3,16 @@ SET(PKG_NAME "dali-adaptor") SET(EXEC_NAME "tct-${PKG_NAME}-core") SET(RPM_NAME "core-${PKG_NAME}-tests") +MESSAGE(STATUS "ENABLE_VULKAN: ${ENABLE_VULKAN}") + SET(CAPI_LIB "dali-adaptor") + SET(TC_SOURCES utc-Dali-Application.cpp utc-Dali-EncodedImageBuffer.cpp - utc-Dali-Capture.cpp utc-Dali-WindowData.cpp utc-Dali-FileLoader.cpp utc-Dali-GifLoading.cpp - utc-Dali-Gl-Window.cpp utc-Dali-ImageLoading.cpp utc-Dali-Key.cpp utc-Dali-NativeImageSource.cpp @@ -25,6 +26,16 @@ SET(TC_SOURCES utc-Dali-WindowSystem.cpp ) +IF(ENABLE_VULKAN) +ELSE() + LIST(APPEND TC_SOURCES + utc-Dali-Gl-Window.cpp + utc-Dali-Capture.cpp +) +ENDIF() + +SET(TC_SOURCE_LIST ${TC_SOURCES} CACHE STRING "List of test sources") + LIST(APPEND TC_SOURCES dali-test-suite-utils/mesh-builder.cpp dali-test-suite-utils/dali-test-suite-utils.cpp diff --git a/automated-tests/src/dali-graphics/CMakeLists.txt b/automated-tests/src/dali-egl-graphics/CMakeLists.txt similarity index 90% rename from automated-tests/src/dali-graphics/CMakeLists.txt rename to automated-tests/src/dali-egl-graphics/CMakeLists.txt index 3dcc4f643..330aba805 100644 --- a/automated-tests/src/dali-graphics/CMakeLists.txt +++ b/automated-tests/src/dali-egl-graphics/CMakeLists.txt @@ -1,9 +1,11 @@ -SET(PKG_NAME "dali-graphics") +SET(PKG_NAME "dali-egl-graphics") SET(EXEC_NAME "tct-${PKG_NAME}-core") SET(RPM_NAME "core-${PKG_NAME}-tests") +MESSAGE(STATUS "ENABLE_VULKAN: ${ENABLE_VULKAN}") + +SET(CAPI_LIB "dali-egl-graphics") -SET(CAPI_LIB "dali-graphics") SET(TC_SOURCES utc-Dali-GraphicsBuffer.cpp utc-Dali-GraphicsDraw.cpp @@ -17,6 +19,8 @@ SET(TC_SOURCES utc-Dali-GraphicsTexture.cpp ) +SET(TC_SOURCE_LIST ${TC_SOURCES} CACHE STRING "List of test sources") + LIST(APPEND TC_SOURCES ../dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.cpp ../dali-adaptor/dali-test-suite-utils/mesh-builder.cpp @@ -34,7 +38,7 @@ LIST(APPEND TC_SOURCES ../dali-adaptor/dali-test-suite-utils/test-render-surface.cpp ../dali-adaptor/dali-test-suite-utils/test-trace-call-stack.cpp ../dali-adaptor/dali-test-suite-utils/adaptor-test-adaptor-impl.cpp - tct-dali-graphics-core.cpp + tct-dali-egl-graphics-core.cpp ) PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED diff --git a/automated-tests/src/dali-graphics/tct-dali-graphics-core.cpp b/automated-tests/src/dali-egl-graphics/tct-dali-egl-graphics-core.cpp similarity index 75% rename from automated-tests/src/dali-graphics/tct-dali-graphics-core.cpp rename to automated-tests/src/dali-egl-graphics/tct-dali-egl-graphics-core.cpp index 8b6db8078..f43dfcfaa 100644 --- a/automated-tests/src/dali-graphics/tct-dali-graphics-core.cpp +++ b/automated-tests/src/dali-egl-graphics/tct-dali-egl-graphics-core.cpp @@ -1,6 +1,6 @@ #include -#include "tct-dali-graphics-core.h" +#include "tct-dali-egl-graphics-core.h" int main(int argc, char* const argv[]) { diff --git a/automated-tests/src/dali-graphics/utc-Dali-GraphicsBuffer.cpp b/automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsBuffer.cpp similarity index 97% rename from automated-tests/src/dali-graphics/utc-Dali-GraphicsBuffer.cpp rename to automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsBuffer.cpp index bc7042bae..6d363c401 100644 --- a/automated-tests/src/dali-graphics/utc-Dali-GraphicsBuffer.cpp +++ b/automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsBuffer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/automated-tests/src/dali-graphics/utc-Dali-GraphicsDraw.cpp b/automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsDraw.cpp similarity index 98% rename from automated-tests/src/dali-graphics/utc-Dali-GraphicsDraw.cpp rename to automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsDraw.cpp index 41e991d17..2d6be1216 100644 --- a/automated-tests/src/dali-graphics/utc-Dali-GraphicsDraw.cpp +++ b/automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsDraw.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/automated-tests/src/dali-graphics/utc-Dali-GraphicsFramebuffer.cpp b/automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsFramebuffer.cpp similarity index 99% rename from automated-tests/src/dali-graphics/utc-Dali-GraphicsFramebuffer.cpp rename to automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsFramebuffer.cpp index 733a8ecb7..e969f7ca2 100644 --- a/automated-tests/src/dali-graphics/utc-Dali-GraphicsFramebuffer.cpp +++ b/automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsFramebuffer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/automated-tests/src/dali-graphics/utc-Dali-GraphicsGeometry.cpp b/automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsGeometry.cpp similarity index 100% rename from automated-tests/src/dali-graphics/utc-Dali-GraphicsGeometry.cpp rename to automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsGeometry.cpp diff --git a/automated-tests/src/dali-graphics/utc-Dali-GraphicsNativeImage.cpp b/automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsNativeImage.cpp similarity index 97% rename from automated-tests/src/dali-graphics/utc-Dali-GraphicsNativeImage.cpp rename to automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsNativeImage.cpp index 577d80c17..227701b40 100644 --- a/automated-tests/src/dali-graphics/utc-Dali-GraphicsNativeImage.cpp +++ b/automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsNativeImage.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/automated-tests/src/dali-graphics/utc-Dali-GraphicsProgram.cpp b/automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsProgram.cpp similarity index 99% rename from automated-tests/src/dali-graphics/utc-Dali-GraphicsProgram.cpp rename to automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsProgram.cpp index 2082dc33e..5719b614b 100644 --- a/automated-tests/src/dali-graphics/utc-Dali-GraphicsProgram.cpp +++ b/automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsProgram.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -71,7 +71,7 @@ const std::string FRAG_SHADER_SOURCE2 = " gl_fragColor = texture2d(sTextures[0], vTexCoord) + lightDirection*texture2d(sTextures[2], vTexCoord);\n" "}\n"; -} //anonymous namespace +} // anonymous namespace int UtcDaliGraphicsProgram01(void) { diff --git a/automated-tests/src/dali-graphics/utc-Dali-GraphicsSampler.cpp b/automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsSampler.cpp similarity index 99% rename from automated-tests/src/dali-graphics/utc-Dali-GraphicsSampler.cpp rename to automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsSampler.cpp index e452bbe2b..873b1c3ec 100644 --- a/automated-tests/src/dali-graphics/utc-Dali-GraphicsSampler.cpp +++ b/automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsSampler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/automated-tests/src/dali-graphics/utc-Dali-GraphicsShader.cpp b/automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsShader.cpp similarity index 87% rename from automated-tests/src/dali-graphics/utc-Dali-GraphicsShader.cpp rename to automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsShader.cpp index 51c67bdf0..788bd244a 100644 --- a/automated-tests/src/dali-graphics/utc-Dali-GraphicsShader.cpp +++ b/automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsShader.cpp @@ -1,19 +1,19 @@ /* -* Copyright (c) 2024 Samsung Electronics Co., Ltd. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -*/ + * Copyright (c) 2024 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ #include #include diff --git a/automated-tests/src/dali-graphics/utc-Dali-GraphicsShaderParser.cpp b/automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsShaderParser.cpp similarity index 100% rename from automated-tests/src/dali-graphics/utc-Dali-GraphicsShaderParser.cpp rename to automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsShaderParser.cpp diff --git a/automated-tests/src/dali-graphics/utc-Dali-GraphicsTexture.cpp b/automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsTexture.cpp similarity index 98% rename from automated-tests/src/dali-graphics/utc-Dali-GraphicsTexture.cpp rename to automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsTexture.cpp index 5e2c0f209..d003ae5e5 100644 --- a/automated-tests/src/dali-graphics/utc-Dali-GraphicsTexture.cpp +++ b/automated-tests/src/dali-egl-graphics/utc-Dali-GraphicsTexture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/automated-tests/src/dali-platform-abstraction/CMakeLists.txt b/automated-tests/src/dali-platform-abstraction/CMakeLists.txt index 4fd1c6279..48d0d81b2 100644 --- a/automated-tests/src/dali-platform-abstraction/CMakeLists.txt +++ b/automated-tests/src/dali-platform-abstraction/CMakeLists.txt @@ -9,6 +9,8 @@ SET(TC_SOURCES utc-image-fitting-modes.cpp ) +SET(TC_SOURCE_LIST ${TC_SOURCES} CACHE STRING "List of test sources") + LIST(APPEND TC_SOURCES ../dali-adaptor/dali-test-suite-utils/mesh-builder.cpp ../dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.cpp diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index 94c624711..e0fcafd8f 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -20,6 +20,7 @@ OPTION(ENABLE_ATSPI "Enable AT-SPI accessibility" ON) OPTION(ENABLE_APPMODEL "Enable AppModel" OFF) OPTION(ENABLE_TRACE "Enable Trace" OFF) OPTION(ENABLE_TRACE_STREAMLINE "Enable Trace (Streamline)" OFF) +OPTION(CONFIGURE_AUTOMATED_TESTS "Configure automated tests" ON) # Include additional macros INCLUDE( common.cmake ) @@ -470,4 +471,4 @@ IF( ENABLE_APPMODEL ) ADD_SUBDIRECTORY( application-model ) ENDIF() -CLEAN_ARG_CACHE() +#CLEAN_ARG_CACHE() diff --git a/build/tizen/deps-check.cmake b/build/tizen/deps-check.cmake index eb3c90849..ca2b7dbe8 100755 --- a/build/tizen/deps-check.cmake +++ b/build/tizen/deps-check.cmake @@ -25,7 +25,8 @@ ARG_ENABLE( ENABLE_WAYLAND enable_wayland "${ENABLE_VAL}" "Build on Wayland" ) ARG_ENABLE( ENABLE_ECORE_WAYLAND2 enable_ecore_wayland2 "${ENABLE_VAL}" "Build on Ecore Wayland2" ) ARG_ENABLE( ENABLE_RENAME_SO enable_rename_so "${ENABLE_VAL};1" "Specify whether so file is renamed or not" ) ARG_ENABLE( ENABLE_COVERAGE enable_coverage "${ENABLE_VAL}" "Enables coverage" ) -ARG_ENABLE( ENABLE_VULKAN enable_vulkan 1 "Enables Vulkan build") + +ARG_ENABLE( ENABLE_VULKAN enable_vulkan "${ENABLE_VAL}" "Enables Vulkan build") # help option ARG_ENABLE( PRINT_HELP print_help "${ENABLE_VAL}" "Prints help" ) @@ -35,6 +36,13 @@ IF( print_help ) EXIT() ENDIF() +IF( CONFIGURE_AUTOMATED_TESTS ) + # Configure automated tests + CONFIGURE_FILE( ${ROOT_SRC_DIR}/automated-tests/CMakeLists.txt.in + ${ROOT_SRC_DIR}/automated-tests/CMakeLists.txt @ONLY ) +ENDIF() + + IF( NOT enable_profile ) IF( ANDROID ) SET( enable_profile ANDROID ) -- 2.34.1