Skip to content

Commit 2a78fa4

Browse files
suppal045suppal045
committed
Merge branch 'release/1.2.0' into main
2 parents dc75e9f + 1c94f60 commit 2a78fa4

File tree

12 files changed

+395
-34
lines changed

12 files changed

+395
-34
lines changed

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

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: L1-tests
22

33
on:
44
push:
5-
branches: [ main, develop, 'sprint/**', 'release/**', 'topic/RDK*' ]
5+
branches: [ main, develop, 'sprint/**', 'release/**' ]
66
pull_request:
7-
branches: [ main, develop, 'sprint/**', 'release/**', 'topic/RDK*' ]
7+
branches: [ main, develop, 'sprint/**', 'release/**' ]
88

99
env:
1010
BUILD_TYPE: Debug
@@ -121,6 +121,14 @@ jobs:
121121
with:
122122
path: entservices-inputoutput
123123

124+
- name: Checkout googletest
125+
if: steps.cache.outputs.cache-hit != 'true'
126+
uses: actions/checkout@v3
127+
with:
128+
repository: google/googletest
129+
path: googletest
130+
ref: v1.15.0
131+
124132
- name: Apply patches ThunderTools
125133
run: |
126134
cd $GITHUB_WORKSPACE/ThunderTools
@@ -342,6 +350,22 @@ jobs:
342350
&&
343351
cmake --install build/mocks
344352
353+
- name: Build googletest
354+
if: steps.cache.outputs.cache-hit != 'true'
355+
run: >
356+
cmake -G Ninja
357+
-S "$GITHUB_WORKSPACE/googletest"
358+
-B build/googletest
359+
-DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr"
360+
-DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
361+
-DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
362+
-DBUILD_TYPE=Debug
363+
-DBUILD_GMOCK=ON
364+
&&
365+
cmake --build build/googletest -j8
366+
&&
367+
cmake --install build/googletest
368+
345369
- name: Build entservices-inputoutput
346370
run: >
347371
cmake -G Ninja
@@ -368,6 +392,8 @@ jobs:
368392
-I $GITHUB_WORKSPACE/entservices-testframework/Tests
369393
-I $GITHUB_WORKSPACE/Thunder/Source
370394
-I $GITHUB_WORKSPACE/Thunder/Source/core
395+
-I $GITHUB_WORKSPACE/install/usr/include
396+
-I $GITHUB_WORKSPACE/install/usr/include/WPEFramework
371397
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/devicesettings.h
372398
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h
373399
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Rfc.h
@@ -406,6 +432,8 @@ jobs:
406432
-DDS_FOUND=ON
407433
-DHAS_FRONT_PANEL=ON
408434
-DRDK_SERVICES_L1_TEST=ON
435+
-DPLUGIN_AVINPUT=ON
436+
-DPLUGIN_HDMIINPUT=ON
409437
-DPLUGIN_HDCPPROFILE=ON
410438
-DPLUGIN_HDMICECSOURCE=ON
411439
-DPLUGIN_HDMICECSINK=ON
@@ -443,6 +471,8 @@ jobs:
443471
-I $GITHUB_WORKSPACE/entservices-testframework/Tests
444472
-I $GITHUB_WORKSPACE/Thunder/Source
445473
-I $GITHUB_WORKSPACE/Thunder/Source/core
474+
-I $GITHUB_WORKSPACE/install/usr/include
475+
-I $GITHUB_WORKSPACE/install/usr/include/WPEFramework
446476
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/devicesettings.h
447477
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h
448478
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Rfc.h
@@ -459,7 +489,7 @@ jobs:
459489
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/thunder/Communicator.h
460490
--coverage
461491
-Wall -Wno-unused-result -Wno-deprecated-declarations -Wno-error=format=
462-
-Wl,-wrap,system -Wl,-wrap,popen -Wl,-wrap,syslog
492+
-Wl,-wrap,system -Wl,-wrap,popen -Wl,-wrap,syslog -Wl,--no-as-needed
463493
-DENABLE_TELEMETRY_LOGGING
464494
-DUSE_IARMBUS
465495
-DENABLE_SYSTEM_GET_STORE_DEMO_LINK
@@ -480,6 +510,8 @@ jobs:
480510
-DCMAKE_DISABLE_FIND_PACKAGE_CEC=ON
481511
-DCMAKE_BUILD_TYPE=Debug
482512
-DDS_FOUND=ON
513+
-DPLUGIN_AVINPUT=ON
514+
-DPLUGIN_HDMIINPUT=ON
483515
-DPLUGIN_HDCPPROFILE=ON
484516
-DPLUGIN_HDMICECSOURCE=ON
485517
-DPLUGIN_HDMICECSINK=ON

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

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
name: L2-tests
22

3-
#enable the workflow incase of any plugin/testcase changes
4-
#Add "Tests/L2Tests" subdirectory in CMakeLists.txt, when enabling L2Tests
53
on:
6-
workflow_dispatch:
4+
push:
5+
branches: [ main, develop, 'sprint/**', 'release/**' ]
6+
pull_request:
7+
branches: [ main, develop, 'sprint/**', 'release/**' ]
78

89
env:
910
BUILD_TYPE: Debug
@@ -90,6 +91,14 @@ jobs:
9091
ref: develop
9192
token: ${{ secrets.RDKCM_RDKE }}
9293

94+
- name: Checkout googletest
95+
if: steps.cache.outputs.cache-hit != 'true'
96+
uses: actions/checkout@v3
97+
with:
98+
repository: google/googletest
99+
path: googletest
100+
ref: v1.15.0
101+
93102
- name: Apply patches ThunderTools
94103
run: |
95104
cd $GITHUB_WORKSPACE/ThunderTools
@@ -248,6 +257,22 @@ jobs:
248257
&&
249258
cmake --install build/mocks
250259
260+
- name: Build googletest
261+
if: steps.cache.outputs.cache-hit != 'true'
262+
run: >
263+
cmake -G Ninja
264+
-S "$GITHUB_WORKSPACE/googletest"
265+
-B build/googletest
266+
-DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr"
267+
-DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
268+
-DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
269+
-DBUILD_TYPE=Debug
270+
-DBUILD_GMOCK=ON
271+
&&
272+
cmake --build build/googletest -j8
273+
&&
274+
cmake --install build/googletest
275+
251276
- name: Build entservices-inputoutput
252277
run: >
253278
cmake
@@ -274,6 +299,8 @@ jobs:
274299
-I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/rdk/iarmmgrs-hal
275300
-I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/systemservices
276301
-I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/systemservices/proc
302+
-I $GITHUB_WORKSPACE/install/usr/include
303+
-I $GITHUB_WORKSPACE/install/usr/include/WPEFramework
277304
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/devicesettings.h
278305
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h
279306
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Rfc.h
@@ -365,6 +392,8 @@ jobs:
365392
-I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/systemservices
366393
-I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/systemservices/proc
367394
-I $GITHUB_WORKSPACE/entservices-deviceanddisplay/helpers
395+
-I $GITHUB_WORKSPACE/install/usr/include
396+
-I $GITHUB_WORKSPACE/install/usr/include/WPEFramework
368397
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/devicesettings.h
369398
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h
370399
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Rfc.h
@@ -384,6 +413,7 @@ jobs:
384413
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/tvSettingsODM.h
385414
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/tvTypes.h
386415
-Werror -Wall -Wno-unused-result -Wno-deprecated-declarations -Wno-error=format=
416+
-Wl,--no-as-needed
387417
-DUSE_IARMBUS
388418
-DRDK_SERVICE_L2_TEST
389419
-DDISABLE_SECURITY_TOKEN

0 commit comments

Comments
 (0)