Skip to content

RDKEMW-4196: Cleanup and remove pwrmgr references from workflows #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 30, 2025
Merged

RDKEMW-4196: Cleanup and remove pwrmgr references from workflows #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion .github/workflows/L1-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
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
1 change: 0 additions & 1 deletion .github/workflows/L2-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,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
3 changes: 1 addition & 2 deletions L2HalMock/build.sh
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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;
});

}
virtual ~HdmiCecSourceTest() override
Expand Down
1 change: 0 additions & 1 deletion build_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
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
Loading