Skip to content

Commit 185b6ff

Browse files
enable L2 test
1 parent 4d0c46e commit 185b6ff

File tree

3 files changed

+46
-10
lines changed

3 files changed

+46
-10
lines changed

.github/workflows/L2-tests.yml

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ name: L2-tests
22

33
#enable the workflow incase of any plugin/testcase changes
44
on:
5-
workflow_dispatch:
5+
push:
6+
branches: [ main, develop, 'sprint/**', 'release/**' ]
7+
pull_request:
8+
branches: [ main, develop, 'sprint/**', 'release/**' ]
69

710
env:
811
BUILD_TYPE: Debug
@@ -89,6 +92,14 @@ jobs:
8992
ref: develop
9093
token: ${{ secrets.RDKCM_RDKE }}
9194

95+
- name: Checkout googletest
96+
if: steps.cache.outputs.cache-hit != 'true'
97+
uses: actions/checkout@v3
98+
with:
99+
repository: google/googletest
100+
path: googletest
101+
ref: v1.15.0
102+
92103
- name: Apply patches ThunderTools
93104
run: |
94105
cd $GITHUB_WORKSPACE/ThunderTools
@@ -248,6 +259,22 @@ jobs:
248259
&&
249260
cmake --install build/mocks
250261
262+
- name: Build googletest
263+
if: steps.cache.outputs.cache-hit != 'true'
264+
run: >
265+
cmake -G Ninja
266+
-S "$GITHUB_WORKSPACE/googletest"
267+
-B build/googletest
268+
-DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr"
269+
-DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
270+
-DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
271+
-DBUILD_TYPE=Debug
272+
-DBUILD_GMOCK=ON
273+
&&
274+
cmake --build build/googletest -j8
275+
&&
276+
cmake --install build/googletest
277+
251278
- name: Build entservices-inputoutput
252279
run: >
253280
cmake
@@ -274,6 +301,7 @@ jobs:
274301
-I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/rdk/iarmmgrs-hal
275302
-I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/systemservices
276303
-I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/systemservices/proc
304+
-I $GITHUB_WORKSPACE/install/usr/include
277305
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/devicesettings.h
278306
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h
279307
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Rfc.h
@@ -365,6 +393,7 @@ jobs:
365393
-I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/systemservices
366394
-I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/systemservices/proc
367395
-I $GITHUB_WORKSPACE/entservices-deviceanddisplay/helpers
396+
-I $GITHUB_WORKSPACE/install/usr/include
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

Tests/L2Tests/CMakeLists.txt

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,12 @@
1919
set(PLUGIN_NAME L2TestsIO)
2020
set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
2121
set(THUNDER_PORT 9998)
22-
#set(CMAKE_CXX_STANDARD 11)
22+
2323
find_package(${NAMESPACE}Plugins REQUIRED)
2424

25-
include(FetchContent)
26-
FetchContent_Declare(
27-
googletest
28-
URL https://github.com/google/googletest/archive/e39786088138f2749d64e9e90e0f9902daa77c40.zip
25+
set (TEST_SRC
26+
tests/test_UtilsFile.cpp
2927
)
30-
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
31-
FetchContent_MakeAvailable(googletest)
3228

3329
if(PLUGIN_AVOUTPUT)
3430
set(SRC_FILES ${SRC_FILES} tests/AVOutputTV_L2Test.cpp)
@@ -37,7 +33,7 @@ endif()
3733
add_library(${MODULE_NAME} SHARED ${SRC_FILES})
3834

3935
set_target_properties(${MODULE_NAME} PROPERTIES
40-
CXX_STANDARD 11
36+
CXX_STANDARD 14
4137
CXX_STANDARD_REQUIRED YES)
4238

4339
target_compile_definitions(${MODULE_NAME}
@@ -46,7 +42,7 @@ target_compile_definitions(${MODULE_NAME}
4642
THUNDER_PORT="${THUNDER_PORT}")
4743

4844
target_compile_options(${MODULE_NAME} PRIVATE -Wno-error)
49-
target_link_libraries(${MODULE_NAME} PRIVATE gmock_main ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
45+
target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
5046

5147
if (NOT L2_TEST_OOP_RPC)
5248
find_library(TESTMOCKLIB_LIBRARIES NAMES TestMocklib)

Tests/L2Tests/tests/test_foo.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#include <iostream>
2+
3+
void foo() {
4+
std::cout << "Hello from foo()" << std::endl;
5+
}
6+
7+
int main() {
8+
foo();
9+
return 0;
10+
}

0 commit comments

Comments
 (0)