Skip to content

Commit c369cb1

Browse files
PrathyushakothuruPrathyushakothuru
authored
Merge branch 'develop' into feature/RDKEMW-2711-p2
2 parents 35b63e3 + cc36a87 commit c369cb1

File tree

7 files changed

+21
-47
lines changed

7 files changed

+21
-47
lines changed

‎.github/workflows/L1-tests.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
env:
1010
BUILD_TYPE: Debug
1111
THUNDER_REF: "R4.4.1"
12-
INTERFACES_REF: "main"
12+
INTERFACES_REF: "develop"
1313
AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}}
1414
AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}}
1515

@@ -132,7 +132,7 @@ jobs:
132132
- name: Apply patches ThunderTools
133133
run: |
134134
cd $GITHUB_WORKSPACE/ThunderTools
135-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/00010-R4.4-Add-support-for-project-dir.patch
135+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch
136136
cd -
137137
138138
- name: Build ThunderTools
@@ -153,10 +153,10 @@ jobs:
153153
- name: Apply patches Thunder
154154
run: |
155155
cd $GITHUB_WORKSPACE/Thunder
156-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
157-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/error_code_R4_4.patch
158-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/1004-Add-support-for-project-dir.patch
159-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/RDKEMW-733-Add-ENTOS-IDS.patch
156+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
157+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch
158+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch
159+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch
160160
cd -
161161
162162
- name: Build Thunder
@@ -260,7 +260,6 @@ jobs:
260260
rdk/iarmbus/libIBusDaemon.h
261261
rdk/halif/deepsleep-manager/deepSleepMgr.h
262262
rdk/iarmmgrs-hal/mfrMgr.h
263-
rdk/iarmmgrs-hal/pwrMgr.h
264263
rdk/iarmmgrs-hal/sysMgr.h
265264
network/wifiSrvMgrIarmIf.h
266265
network/netsrvmgrIarm.h
@@ -667,3 +666,4 @@ jobs:
667666
rdkL1TestResultsWithoutValgrind.json
668667
rdkL1TestResultsWithValgrind.json
669668
if-no-files-found: warn
669+

‎.github/workflows/L2-tests.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
env:
1111
BUILD_TYPE: Debug
1212
THUNDER_REF: "R4.4.1"
13-
INTERFACES_REF: "main"
13+
INTERFACES_REF: "develop"
1414
AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}}
1515
AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}}
1616

@@ -103,7 +103,7 @@ jobs:
103103
- name: Apply patches ThunderTools
104104
run: |
105105
cd $GITHUB_WORKSPACE/ThunderTools
106-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/00010-R4.4-Add-support-for-project-dir.patch
106+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch
107107
cd -
108108
109109
- name: Build ThunderTools
@@ -123,10 +123,10 @@ jobs:
123123
- name: Apply patches Thunder
124124
run: |
125125
cd $GITHUB_WORKSPACE/Thunder
126-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
127-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/error_code_R4_4.patch
128-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/1004-Add-support-for-project-dir.patch
129-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/RDKEMW-733-Add-ENTOS-IDS.patch
126+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
127+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch
128+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch
129+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch
130130
cd -
131131
- name: Build Thunder
132132
run: >
@@ -206,7 +206,6 @@ jobs:
206206
rdk/iarmbus/libIBus.h
207207
rdk/iarmbus/libIBusDaemon.h
208208
rdk/iarmmgrs-hal/mfrMgr.h
209-
rdk/iarmmgrs-hal/pwrMgr.h
210209
rdk/iarmmgrs-hal/sysMgr.h
211210
rdk/iarmbus/iarmUtil.h
212211
rfcapi.h

‎L2HalMock/build.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,7 @@ cp $SCRIPTS_DIR/patches/rdkservices/files/wdmp-c.h /usr/local/include/wdmp-c
184184
cd /usr/include/
185185
mkdir rdk
186186
cd /usr/include/rdk
187-
mkdir iarmmgrs-hal
188-
cp $WORKSPACE/deps/rdk/iarmmgrs/hal/include/pwrMgr.h /usr/include/rdk/iarmmgrs-hal
187+
189188

190189
sed -i 's/sendNotify/Notify/g' $RDK_DIR/HdmiCecSource/HdmiCecSource.cpp
191190
sed -i 's/sendNotify/Notify/g' $RDK_DIR/HdmiCecSink/HdmiCecSink.cpp

‎Tests/L1Tests/tests/test_HdcpProfile.cpp‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "dsMgr.h"
3232
#include "dsDisplay.h"
3333
#include "ThunderPortability.h"
34-
#include "pwrMgr.h"
3534
#include "PowerManagerMock.h"
3635

3736
#include <iostream>
@@ -505,16 +504,6 @@ TEST_F(HDCPProfileEventIarmTest, onHdmiOutputHDCPStatusEvent)
505504
return Core::ERROR_NONE;
506505
}));
507506

508-
ON_CALL(*p_iarmBusImplMock, IARM_Bus_Call)
509-
.WillByDefault(
510-
[](const char* ownerName, const char* methodName, void* arg, size_t argLen) {
511-
if (strcmp(methodName, IARM_BUS_PWRMGR_API_GetPowerState) == 0) {
512-
auto* param = static_cast<IARM_Bus_PWRMgr_GetPowerState_Param_t*>(arg);
513-
param->curState = IARM_BUS_PWRMGR_POWERSTATE_ON;
514-
}
515-
return IARM_RESULT_SUCCESS;
516-
});
517-
518507
EVENT_SUBSCRIBE(0, _T("onDisplayConnectionChanged"), _T("client.events"), message);
519508

520509
IARM_Bus_DSMgr_EventData_t eventData;

‎Tests/L1Tests/tests/test_HdmiCecSource.cpp‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "HdmiCecSourceImplementation.h"
2727
#include "HdmiCec.h"
2828
#include "HdmiCecSource.h"
29-
#include "pwrMgr.h"
3029
#include "PowerManagerMock.h"
3130
#include "FactoriesImplementation.h"
3231
#include "IarmBusMock.h"
@@ -365,16 +364,6 @@ class HdmiCecSourceTest : public ::testing::Test {
365364

366365
return IARM_RESULT_SUCCESS;
367366
}));
368-
369-
ON_CALL(*p_iarmBusImplMock, IARM_Bus_Call)
370-
.WillByDefault(
371-
[](const char* ownerName, const char* methodName, void* arg, size_t argLen) {
372-
if (strcmp(methodName, IARM_BUS_PWRMGR_API_GetPowerState) == 0) {
373-
auto* param = static_cast<IARM_Bus_PWRMgr_GetPowerState_Param_t*>(arg);
374-
param->curState = IARM_BUS_PWRMGR_POWERSTATE_ON;
375-
}
376-
return IARM_RESULT_SUCCESS;
377-
});
378367

379368
}
380369
virtual ~HdmiCecSourceTest() override

‎build_dependencies.sh‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ git clone https://[email protected]/rdkcentral/entservices-testframework.
4040
echo "======================================================================================"
4141
echo "buliding thunderTools"
4242
cd ThunderTools
43-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/00010-R4.4-Add-support-for-project-dir.patch
43+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch
4444
cd -
4545

4646

@@ -59,10 +59,10 @@ echo "==========================================================================
5959
echo "buliding thunder"
6060

6161
cd Thunder
62-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
63-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L2Tests/patches/error_code_R4_4.patch
64-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/1004-Add-support-for-project-dir.patch
65-
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/patches/RDKEMW-733-Add-ENTOS-IDS.patch
62+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
63+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch
64+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch
65+
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch
6666
cd -
6767

6868
cmake -G Ninja -S Thunder -B build/Thunder \
@@ -153,7 +153,6 @@ touch rdk/iarmbus/libIBus.h
153153
touch rdk/iarmbus/libIBusDaemon.h
154154
touch rdk/iarmmgrs-hal/deepSleepMgr.h
155155
touch rdk/iarmmgrs-hal/mfrMgr.h
156-
touch rdk/iarmmgrs-hal/pwrMgr.h
157156
touch rdk/iarmmgrs-hal/sysMgr.h
158157
touch network/wifiSrvMgrIarmIf.h
159158
touch network/netsrvmgrIarm.h

‎cmake/FindIARMBus.cmake‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ find_package(PkgConfig)
2828
find_library(IARMBUS_LIBRARIES NAMES IARMBus)
2929
find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus)
3030
find_path(IARMRECEIVER_INCLUDE_DIRS NAMES receiverMgr.h PATH_SUFFIXES rdk/iarmmgrs/receiver)
31-
find_path(IARMPWR_INCLUDE_DIRS NAMES pwrMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
3231

3332
set(IARMBUS_LIBRARIES ${IARMBUS_LIBRARIES} CACHE PATH "Path to IARMBus library")
34-
set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS})
35-
set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS} CACHE PATH "Path to IARMBus include")
33+
set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS})
34+
set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} CACHE PATH "Path to IARMBus include")
3635

3736
include(FindPackageHandleStandardArgs)
3837
FIND_PACKAGE_HANDLE_STANDARD_ARGS(IARMBUS DEFAULT_MSG IARMBUS_INCLUDE_DIRS IARMBUS_LIBRARIES)

0 commit comments

Comments
 (0)