Skip to content
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.

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

gtest: Init submodule and update version #497

Merged
merged 1 commit into from
Jun 14, 2023
Merged
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: 12 additions & 2 deletions .github/workflows/cmake-ctest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
BUILD_TYPE: Release
WITH_DLT_UNIT_TESTS: ON
BUILD_GMOCK: OFF
minminlittleshrimp marked this conversation as resolved.
Show resolved Hide resolved

jobs:
build:
Expand All @@ -21,10 +22,19 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Prepare submodule
run: |
git submodule init
git submodule update

- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a
# single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DWITH_DLT_UNIT_TESTS=${{env.WITH_DLT_UNIT_TESTS}}
run: |
cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
-DWITH_DLT_UNIT_TESTS=${{env.WITH_DLT_UNIT_TESTS}} \
-DBUILD_GMOCK=${{env.BUILD_GMOCK}}

- name: Build
# Build your program with the given configuration
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "googletest"]
path = googletest
url = https://github.com/google/googletest.git
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ if (WITH_DLT_UNIT_TESTS)
find_package(GTest)

if (NOT GTEST_FOUND)
add_subdirectory( gtest-1.7.0 )
add_subdirectory( googletest )
endif()
enable_testing()
add_subdirectory(tests)
Expand Down
1 change: 1 addition & 0 deletions googletest
Submodule googletest added at e2239e
157 changes: 0 additions & 157 deletions gtest-1.7.0/CHANGES

This file was deleted.

Loading
Loading