From 03db39f87d170fa4ace7496db2a8fb9c457bff98 Mon Sep 17 00:00:00 2001 From: Nagalakshmi Dosakayala Date: Thu, 20 Jun 2024 14:51:07 +0530 Subject: [PATCH] Thunder R2 needs different 0001-Add-TextToSpeech-Interface.patch. So added to resolve the patch issue. --- .github/workflows/L2-tests.yml | 2 +- Tests/L2Tests/L2TestsPlugin/CMakeLists.txt | 21 ++++++++++++------- .../0001-Add-TextToSpeech-Interface.patch | 12 +++++++++++ 3 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 Tests/L2Tests/patches/0001-Add-TextToSpeech-Interface.patch diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index aff6035dce..2692c5c702 100755 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -117,7 +117,7 @@ jobs: run: > cd "${{github.workspace}}/ThunderInterfaces" && - git apply "${{github.workspace}}/rdkservices/files/0001-Add-TextToSpeech-Interface.patch" + git apply "${{github.workspace}}/rdkservices/Tests/L2Tests/patches/0001-Add-TextToSpeech-Interface.patch" - name: Build ThunderInterfaces run: > diff --git a/Tests/L2Tests/L2TestsPlugin/CMakeLists.txt b/Tests/L2Tests/L2TestsPlugin/CMakeLists.txt index a3e43b5e84..e23d256a0f 100755 --- a/Tests/L2Tests/L2TestsPlugin/CMakeLists.txt +++ b/Tests/L2Tests/L2TestsPlugin/CMakeLists.txt @@ -21,6 +21,19 @@ set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME}) set(THUNDER_PORT 9998) find_package(${NAMESPACE}Plugins REQUIRED) +# We are not running VerifyContracts,Warehouse_L2Test tests for Thunder R4 as +# this work is not in this scope. In future we will enable these tests for Thunder R4. +if(NOT USE_THUNDER_R4) +add_library(${MODULE_NAME} SHARED + Module.cpp + L2Tests.cpp + L2TestsMock.cpp + tests/SystemService_L2Test.cpp + tests/UsbAccess_L2Test.cpp + tests/Telemetry_L2Test.cpp + tests/Warehouse_L2Test.cpp + tests/VerifyContracts.cpp) +else() add_library(${MODULE_NAME} SHARED Module.cpp L2Tests.cpp @@ -28,13 +41,7 @@ add_library(${MODULE_NAME} SHARED tests/SystemService_L2Test.cpp tests/UsbAccess_L2Test.cpp tests/Telemetry_L2Test.cpp) - -# We are not running VerifyContracts,Warehouse_L2Test tests for Thunder R4 as -# this work is not in this scope. In future we will enable these tests for Thunder R4. -if(NOT USE_THUNDER_R4) - add_library(${MODULE_NAME} SHARED tests/VerifyContracts.cpp) - add_library(${MODULE_NAME} SHARED tests/Warehouse_L2Test.cpp) -endif(USE_THUNDER_R4) +endif(NOT USE_THUNDER_R4) set_target_properties(${MODULE_NAME} PROPERTIES CXX_STANDARD 11 diff --git a/Tests/L2Tests/patches/0001-Add-TextToSpeech-Interface.patch b/Tests/L2Tests/patches/0001-Add-TextToSpeech-Interface.patch new file mode 100644 index 0000000000..aee681e01e --- /dev/null +++ b/Tests/L2Tests/patches/0001-Add-TextToSpeech-Interface.patch @@ -0,0 +1,12 @@ +diff --git a/interfaces/ITextToSpeech.h b/interfaces/ITextToSpeech.h +index d28359e..4d20ac9 100644 +--- a/interfaces/ITextToSpeech.h ++++ b/interfaces/ITextToSpeech.h +@@ -65,6 +65,7 @@ namespace Exchange { + + virtual void Register(ITextToSpeech::INotification* sink) = 0; + virtual void Unregister(ITextToSpeech::INotification* sink) = 0; ++ virtual void RegisterWithCallsign(const string callsign,ITextToSpeech::INotification* sink) = 0; + + // @property + // @brief Query the status/enable tts