Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/L1-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
env:
BUILD_TYPE: Debug
THUNDER_REF: "R4.4.1"
INTERFACES_REF: "main"
INTERFACES_REF: "develop"
AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}}
AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}}

Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
- name: Apply patches ThunderTools
run: |
cd $GITHUB_WORKSPACE/ThunderTools
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/00010-R4.4-Add-support-for-project-dir.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch
cd -

- name: Build ThunderTools
Expand All @@ -145,10 +145,10 @@ jobs:
- name: Apply patches Thunder
run: |
cd $GITHUB_WORKSPACE/Thunder
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/error_code_R4_4.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/1004-Add-support-for-project-dir.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/RDKEMW-733-Add-ENTOS-IDS.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch
cd -

- name: Build Thunder
Expand Down Expand Up @@ -252,7 +252,6 @@ jobs:
rdk/iarmbus/libIBusDaemon.h
rdk/halif/deepsleep-manager/deepSleepMgr.h
rdk/iarmmgrs-hal/mfrMgr.h
rdk/iarmmgrs-hal/pwrMgr.h
rdk/iarmmgrs-hal/sysMgr.h
network/wifiSrvMgrIarmIf.h
network/netsrvmgrIarm.h
Expand Down Expand Up @@ -639,3 +638,4 @@ jobs:
rdkL1TestResultsWithoutValgrind.json
rdkL1TestResultsWithValgrind.json
if-no-files-found: warn

14 changes: 7 additions & 7 deletions .github/workflows/L2-tests.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name: L2-tests

#enable the workflow incase of any plugin/testcase changes
#Add "Tests/L2Tests" subdirectory in CMakeLists.txt, when enabling L2Tests
on:
workflow_dispatch:

env:
BUILD_TYPE: Debug
THUNDER_REF: "R4.4.1"
INTERFACES_REF: "main"
INTERFACES_REF: "develop"
AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}}
AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}}

Expand Down Expand Up @@ -92,7 +93,7 @@ jobs:
- name: Apply patches ThunderTools
run: |
cd $GITHUB_WORKSPACE/ThunderTools
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/00010-R4.4-Add-support-for-project-dir.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch
cd -

- name: Build ThunderTools
Expand All @@ -112,10 +113,10 @@ jobs:
- name: Apply patches Thunder
run: |
cd $GITHUB_WORKSPACE/Thunder
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/error_code_R4_4.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/1004-Add-support-for-project-dir.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/RDKEMW-733-Add-ENTOS-IDS.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch
cd -
- name: Build Thunder
run: >
Expand Down Expand Up @@ -195,7 +196,6 @@ jobs:
rdk/iarmbus/libIBus.h
rdk/iarmbus/libIBusDaemon.h
rdk/iarmmgrs-hal/mfrMgr.h
rdk/iarmmgrs-hal/pwrMgr.h
rdk/iarmmgrs-hal/sysMgr.h
rdk/iarmbus/iarmUtil.h
rfcapi.h
Expand Down
25 changes: 24 additions & 1 deletion AVInput/AVInput.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**

Check failure on line 1 in AVInput/AVInput.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected

Source code with 'Apache-2.0' license found in local file 'AVInput/AVInput.cpp' (Match: rdkcentral/rdkservices/1, 1544 lines, url: https://github.com/rdkcentral/rdkservices/archive/GRT_v1.tar.gz, file: HdmiInput/HdmiInput.cpp)

Check failure on line 1 in AVInput/AVInput.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected

Source code with 'Apache-2.0' license found in local file 'AVInput/AVInput.cpp' (Match: rdkcentral/rdkservices/5.1.0, 1544 lines, url: https://github.com/rdkcentral/rdkservices/archive/AML_BSP_REL_VERSION_RDK5.1.0.tar.gz, file: AVInput/AVInput.cpp)

Check failure on line 1 in AVInput/AVInput.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected

Source code with 'Apache-2.0' license found in local file 'AVInput/AVInput.cpp' (Match: rdkcentral/rdkservices/1, 1544 lines, url: https://github.com/rdkcentral/rdkservices/archive/GRT_v1.tar.gz, file: AVInput/AVInput.cpp)
* If not stated otherwise in this file or this component's LICENSE
* file the following copyright and licenses apply:
*
Expand Down Expand Up @@ -868,7 +868,30 @@
params["frameRateN"] = 60000;
params["frameRateD"] = 1001;
break;

case dsVIDEO_FRAMERATE_100:
params["frameRateN"] = 100000;
params["frameRateD"] = 1000;
break;
case dsVIDEO_FRAMERATE_119dot88:
params["frameRateN"] = 120000;
params["frameRateD"] = 1001;
break;
case dsVIDEO_FRAMERATE_120:
params["frameRateN"] = 120000;
params["frameRateD"] = 1000;
break;
case dsVIDEO_FRAMERATE_200:
params["frameRateN"] = 200000;
params["frameRateD"] = 1000;
break;
case dsVIDEO_FRAMERATE_239dot76:
params["frameRateN"] = 240000;
params["frameRateD"] = 1001;
break;
case dsVIDEO_FRAMERATE_240:
params["frameRateN"] = 240000;
params["frameRateD"] = 100;
break;
default:
params["frameRateN"] = 60000;
params["frameRateD"] = 1000;
Expand Down
20 changes: 19 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,20 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [1.1.1](https://github.com/rdkcentral/entservices-inputoutput/compare/1.1.0...1.1.1)

- RDKEMW-5124: Higher framerate support in Thunder [`#134`](https://github.com/rdkcentral/entservices-inputoutput/pull/134)
- RDK-57440: Enable HdcpProfile for contract test [`#132`](https://github.com/rdkcentral/entservices-inputoutput/pull/132)
- [RDKEMW-2711] RDKEMW-4232: Moving the L2 Test files to specific entservices for inputoutput repo [`#123`](https://github.com/rdkcentral/entservices-inputoutput/pull/123)
- RDKEMW-4196: Cleanup and remove pwrmgr references from workflows [`#126`](https://github.com/rdkcentral/entservices-inputoutput/pull/126)
- RDKEMW-4220: Fix wpeframework crash on reactivating plugin and powerstate change [`#104`](https://github.com/rdkcentral/entservices-inputoutput/pull/104)
- RDKEMW-4139: Coverity integration with Entservices-inputoutput repo [`#116`](https://github.com/rdkcentral/entservices-inputoutput/pull/116)
- Merge tag '1.1.0' into develop [`2ce89ed`](https://github.com/rdkcentral/entservices-inputoutput/commit/2ce89edb2c300ecc3275fab6673b48823578d053)

#### [1.1.0](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.12...1.1.0)

> 20 May 2025

- RDK-52028 : Add CMS,WB,ALS to AVOutput (#6139) [`#23`](https://github.com/rdkcentral/entservices-inputoutput/pull/23)
- [RDKEMW-2711] RDKEMW-4232: Moving the L2 Test files to entservices-inputoutput [`#107`](https://github.com/rdkcentral/entservices-inputoutput/pull/107)
- [RDKEMW-2711] RDKEMW-3851: L1 - Move plugins Unit test to inputoutput repo [`#92`](https://github.com/rdkcentral/entservices-inputoutput/pull/92)
Expand All @@ -14,6 +26,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- RDK-55554 : Gtest for HdmiCecSource and sink [`#78`](https://github.com/rdkcentral/entservices-inputoutput/pull/78)
- RDK-55373:[RDKServices] Coverity integration with middleware componen… [`#96`](https://github.com/rdkcentral/entservices-inputoutput/pull/96)
- RDK-55373:[RDKServices] Coverity integration with middleware component workflow [`#94`](https://github.com/rdkcentral/entservices-inputoutput/pull/94)
- 1.1.0 release changelog updates [`d6c91fa`](https://github.com/rdkcentral/entservices-inputoutput/commit/d6c91fa3fb9bda7e296ce9321921cc8882b2d50d)
- Merge tag '1.0.12' into develop [`2019c9f`](https://github.com/rdkcentral/entservices-inputoutput/commit/2019c9f8d72eba911fe9030cf4476ce99c2127de)

#### [1.0.12](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.11...1.0.12)
Expand Down Expand Up @@ -74,10 +87,15 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Enabling workflow for L1 and L2 [`4049a2e`](https://github.com/rdkcentral/entservices-inputoutput/commit/4049a2eb188efede1c1547be50847d29ddcb9e03)
- Merge tag '1.0.6' into develop [`f46b084`](https://github.com/rdkcentral/entservices-inputoutput/commit/f46b084ed21e61d89e20868eacdea4ba8198266d)

#### [1.0.6](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.5...1.0.6)
#### [1.0.6](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.6-RDK7.1...1.0.6)

> 27 March 2025

#### [1.0.6-RDK7.1](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.5...1.0.6-RDK7.1)

> 22 May 2025

- RDKEMW-4220: Fix wpeframework crash on reactivating plugin and powerstate change [`#104`](https://github.com/rdkcentral/entservices-inputoutput/pull/104)
- Removed Cec host header [`#35`](https://github.com/rdkcentral/entservices-inputoutput/pull/35)
- 1.0.9 release change log updates [`8abd094`](https://github.com/rdkcentral/entservices-inputoutput/commit/8abd09439355af4041436e562c4590769b55bc0c)
- Merge tag '1.0.5' into develop [`3b26eeb`](https://github.com/rdkcentral/entservices-inputoutput/commit/3b26eebfdf0e992e369e5cd3cdc981748c9cdb69)
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ string(TOLOWER ${NAMESPACE} STORAGE_DIRECTORY)
include(CmakeHelperFunctions)

if(RDK_SERVICE_L2_TEST)
add_subdirectory(Tests/L2Tests)
# add_subdirectory(Tests/L2Tests)
endif()

if(RDK_SERVICES_L1_TEST)
Expand Down
2 changes: 1 addition & 1 deletion HdcpProfile/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ if (RDK_SERVICE_L2_TEST)
find_library(TESTMOCKLIB_LIBRARIES NAMES TestMocklib)
if (TESTMOCKLIB_LIBRARIES)
message ("linking mock libraries ${TESTMOCKLIB_LIBRARIES} library")
target_link_libraries(${MODULE_NAME} PRIVATE ${TESTMOCKLIB_LIBRARIES})
target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE ${TESTMOCKLIB_LIBRARIES})
else (TESTMOCKLIB_LIBRARIES)
message ("Require ${TESTMOCKLIB_LIBRARIES} library")
endif (TESTMOCKLIB_LIBRARIES)
Expand Down
1 change: 1 addition & 0 deletions HdmiCecSink/HdmiCecSink.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,7 @@ namespace WPEFramework
{
if(_powerManagerPlugin)
{
_powerManagerPlugin->Unregister(_pwrMgrNotification.baseInterface<Exchange::IPowerManager::IModeChangedNotification>());
_powerManagerPlugin.Reset();
}
_registeredEventHandlers = false;
Expand Down
1 change: 1 addition & 0 deletions HdmiCecSource/HdmiCecSource.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ namespace WPEFramework
}

_connectionId = 0;
_service->Unregister(&_notification);
_service->Release();
_service = nullptr;
LOGINFO("HdmiCecSource plugin is deactivated. Successfully deactivated HdmiCecSource Plugin");
Expand Down
1 change: 1 addition & 0 deletions HdmiCecSource/HdmiCecSourceImplementation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ namespace WPEFramework

if(_powerManagerPlugin)
{
_powerManagerPlugin->Unregister(_pwrMgrNotification.baseInterface<Exchange::IPowerManager::IModeChangedNotification>());
_powerManagerPlugin.Reset();
}
_registeredEventHandlers = false;
Expand Down
25 changes: 24 additions & 1 deletion HdmiInput/HdmiInput.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**

Check failure on line 1 in HdmiInput/HdmiInput.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected

Source code with 'Apache-2.0' license found in local file 'HdmiInput/HdmiInput.cpp' (Match: rdkcentral/rdkservices/1, 1453 lines, url: https://github.com/rdkcentral/rdkservices/archive/GRT_v1.tar.gz, file: HdmiInput/HdmiInput.cpp)
* If not stated otherwise in this file or this component's LICENSE
* file the following copyright and licenses apply:
*
Expand Down Expand Up @@ -718,7 +718,30 @@
params["frameRateN"] = 60000;
params["frameRateD"] = 1001;
break;

case dsVIDEO_FRAMERATE_100:
params["frameRateN"] = 100000;
params["frameRateD"] = 1000;
break;
case dsVIDEO_FRAMERATE_119dot88:
params["frameRateN"] = 120000;
params["frameRateD"] = 1001;
break;
case dsVIDEO_FRAMERATE_120:
params["frameRateN"] = 120000;
params["frameRateD"] = 1000;
break;
case dsVIDEO_FRAMERATE_200:
params["frameRateN"] = 200000;
params["frameRateD"] = 1000;
break;
case dsVIDEO_FRAMERATE_239dot76:
params["frameRateN"] = 240000;
params["frameRateD"] = 1001;
break;
case dsVIDEO_FRAMERATE_240:
params["frameRateN"] = 240000;
params["frameRateD"] = 100;
break;
default:
params["frameRateN"] = 60000;
params["frameRateD"] = 1000;
Expand Down
3 changes: 1 addition & 2 deletions L2HalMock/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,7 @@ cp $SCRIPTS_DIR/patches/rdkservices/files/wdmp-c.h /usr/local/include/wdmp-c
cd /usr/include/
mkdir rdk
cd /usr/include/rdk
mkdir iarmmgrs-hal
cp $WORKSPACE/deps/rdk/iarmmgrs/hal/include/pwrMgr.h /usr/include/rdk/iarmmgrs-hal


sed -i 's/sendNotify/Notify/g' $RDK_DIR/HdmiCecSource/HdmiCecSource.cpp
sed -i 's/sendNotify/Notify/g' $RDK_DIR/HdmiCecSink/HdmiCecSink.cpp
Expand Down
11 changes: 0 additions & 11 deletions Tests/L1Tests/tests/test_HdcpProfile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* limitations under the License.
**/

#include <gtest/gtest.h>

Check failure on line 20 in Tests/L1Tests/tests/test_HdcpProfile.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected

Source code with 'Apache-2.0' license found in local file 'Tests/L1Tests/tests/test_HdcpProfile.cpp' (Match: rdkcentral/rdkservices/1, 222 lines, url: https://github.com/rdkcentral/rdkservices/archive/GRT_v1.tar.gz, file: Tests/tests/test_HdcpProfile.cpp)

#include "HdcpProfile.h"

Expand All @@ -31,7 +31,6 @@
#include "dsMgr.h"
#include "dsDisplay.h"
#include "ThunderPortability.h"
#include "pwrMgr.h"
#include "PowerManagerMock.h"

#include <iostream>
Expand Down Expand Up @@ -505,16 +504,6 @@
return Core::ERROR_NONE;
}));

ON_CALL(*p_iarmBusImplMock, IARM_Bus_Call)
.WillByDefault(
[](const char* ownerName, const char* methodName, void* arg, size_t argLen) {
if (strcmp(methodName, IARM_BUS_PWRMGR_API_GetPowerState) == 0) {
auto* param = static_cast<IARM_Bus_PWRMgr_GetPowerState_Param_t*>(arg);
param->curState = IARM_BUS_PWRMGR_POWERSTATE_ON;
}
return IARM_RESULT_SUCCESS;
});

EVENT_SUBSCRIBE(0, _T("onDisplayConnectionChanged"), _T("client.events"), message);

IARM_Bus_DSMgr_EventData_t eventData;
Expand Down
11 changes: 0 additions & 11 deletions Tests/L1Tests/tests/test_HdmiCecSource.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* If not stated otherwise in this file or this component's LICENSE file the

Check failure on line 2 in Tests/L1Tests/tests/test_HdmiCecSource.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected

Source code with 'Apache-2.0' license found in local file 'Tests/L1Tests/tests/test_HdmiCecSource.cpp' (Match: rdkcentral/rdkservices/1, 1397 lines, url: https://github.com/rdkcentral/rdkservices/archive/GRT_v1.tar.gz, file: Tests/tests/test_HdmiCecSource.cpp)
* following copyright and licenses apply:
*
* Copyright 2022 RDK Management
Expand All @@ -26,7 +26,6 @@
#include "HdmiCecSourceImplementation.h"
#include "HdmiCec.h"
#include "HdmiCecSource.h"
#include "pwrMgr.h"
#include "PowerManagerMock.h"
#include "FactoriesImplementation.h"
#include "IarmBusMock.h"
Expand Down Expand Up @@ -365,16 +364,6 @@

return IARM_RESULT_SUCCESS;
}));

ON_CALL(*p_iarmBusImplMock, IARM_Bus_Call)
.WillByDefault(
[](const char* ownerName, const char* methodName, void* arg, size_t argLen) {
if (strcmp(methodName, IARM_BUS_PWRMGR_API_GetPowerState) == 0) {
auto* param = static_cast<IARM_Bus_PWRMgr_GetPowerState_Param_t*>(arg);
param->curState = IARM_BUS_PWRMGR_POWERSTATE_ON;
}
return IARM_RESULT_SUCCESS;
});

}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverity Issue - Uninitialized pointer field

Non-static class member "pwrMgrEventHandler" is not initialized in this constructor nor in any functions that it calls.

Medium Impact, CWE-457
UNINIT_CTOR

virtual ~HdmiCecSourceTest() override
Expand Down
11 changes: 5 additions & 6 deletions build_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ git clone https://[email protected]/rdkcentral/entservices-testframework.
echo "======================================================================================"
echo "buliding thunderTools"
cd ThunderTools
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/00010-R4.4-Add-support-for-project-dir.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch
cd -


Expand All @@ -59,10 +59,10 @@ echo "==========================================================================
echo "buliding thunder"

cd Thunder
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/error_code_R4_4.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/1004-Add-support-for-project-dir.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/RDKEMW-733-Add-ENTOS-IDS.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch
cd -

cmake -G Ninja -S Thunder -B build/Thunder \
Expand Down Expand Up @@ -153,7 +153,6 @@ touch rdk/iarmbus/libIBus.h
touch rdk/iarmbus/libIBusDaemon.h
touch rdk/iarmmgrs-hal/deepSleepMgr.h
touch rdk/iarmmgrs-hal/mfrMgr.h
touch rdk/iarmmgrs-hal/pwrMgr.h
touch rdk/iarmmgrs-hal/sysMgr.h
touch network/wifiSrvMgrIarmIf.h
touch network/netsrvmgrIarm.h
Expand Down
5 changes: 2 additions & 3 deletions cmake/FindIARMBus.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# If not stated otherwise in this file or this component's license file the

Check failure on line 1 in cmake/FindIARMBus.cmake

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected

Source code with 'Apache-2.0' license found in local file 'cmake/FindIARMBus.cmake' (Match: rdkcentral/rdkservices/1, 43 lines, url: https://github.com/rdkcentral/rdkservices/archive/GRT_v1.tar.gz, file: cmake/FindIARMBus.cmake)
# following copyright and licenses apply:
#
# Copyright 2020 RDK Management
Expand Down Expand Up @@ -28,11 +28,10 @@
find_library(IARMBUS_LIBRARIES NAMES IARMBus)
find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus)
find_path(IARMRECEIVER_INCLUDE_DIRS NAMES receiverMgr.h PATH_SUFFIXES rdk/iarmmgrs/receiver)
find_path(IARMPWR_INCLUDE_DIRS NAMES pwrMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)

set(IARMBUS_LIBRARIES ${IARMBUS_LIBRARIES} CACHE PATH "Path to IARMBus library")
set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS})
set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS} CACHE PATH "Path to IARMBus include")
set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS})
set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} CACHE PATH "Path to IARMBus include")

include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(IARMBUS DEFAULT_MSG IARMBUS_INCLUDE_DIRS IARMBUS_LIBRARIES)
Expand Down
8 changes: 6 additions & 2 deletions cov_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ cmake -G Ninja -S "$GITHUB_WORKSPACE" -B build/entservices-inputoutput \
-DDS_FOUND=ON \
-DPLUGIN_HDMICECSOURCE=ON \
-DPLUGIN_HDCPPROFILE=ON \
-DPLUGIN_HDMICECSINK=ON \
-DCMAKE_CXX_FLAGS="-DEXCEPTIONS_ENABLE=ON \
-I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/headers \
-I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/headers/audiocapturemgr \
Expand All @@ -33,6 +34,9 @@ cmake -G Ninja -S "$GITHUB_WORKSPACE" -B build/entservices-inputoutput \
-I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/headers/rdk/iarmmgrs-hal \
-I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/headers/ccec/drivers \
-I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/headers/network \
-I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks \
-I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/thunder \
-I ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/devicesettings \
-include ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/devicesettings.h \
-include ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/Iarm.h \
-include ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/Rfc.h \
Expand All @@ -45,7 +49,7 @@ cmake -G Ninja -S "$GITHUB_WORKSPACE" -B build/entservices-inputoutput \
-include ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/wpa_ctrl_mock.h \
-include ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/secure_wrappermock.h \
-include ${GITHUB_WORKSPACE}/entservices-testframework/Tests/mocks/HdmiCec.h \
--coverage -Wall -Werror -Wno-error=format \
-Wall -Wno-unused-result -Werror -Wno-error=format \
-Wl,-wrap,system -Wl,-wrap,popen -Wl,-wrap,syslog \
-DENABLE_TELEMETRY_LOGGING -DUSE_IARMBUS \
-DENABLE_SYSTEM_GET_STORE_DEMO_LINK -DENABLE_DEEP_SLEEP \
Expand All @@ -55,4 +59,4 @@ cmake -G Ninja -S "$GITHUB_WORKSPACE" -B build/entservices-inputoutput \

cmake --build build/entservices-inputoutput --target install
echo "======================================================================================"
exit 0
exit 0
Loading