Skip to content

update bot tooling #137

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
dneto0 merged 6 commits into from
Dec 16, 2024
Merged

update bot tooling #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0f7c102
Disable warnings in googlesource
dneto0 Dec 13, 2024
31d1da9
kokoro: linux,win: cmake-3.31
dneto0 Dec 13, 2024
1efedac
disable license check on .github/workflows/main.yml
dneto0 Dec 13, 2024
669eb3e
Use add_subdirectory for internal gtest
amaiorano Dec 13, 2024
fa1ffec
Disable warnings in googletest code
dneto0 Dec 16, 2024
7089a8c
Disable warnings in gmock
dneto0 Dec 16, 2024
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
20 changes: 9 additions & 11 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,21 +298,19 @@ if(CPPDAP_BUILD_TESTS)
if(CPPDAP_USE_EXTERNAL_GTEST_PACKAGE)
find_package(GTest REQUIRED)
else()
list(APPEND DAP_TEST_LIST
${CPPDAP_GOOGLETEST_DIR}/googletest/src/gtest-all.cc
)

set(DAP_TEST_INCLUDE_DIR
${CPPDAP_GOOGLETEST_DIR}/googlemock/include/
${CPPDAP_GOOGLETEST_DIR}/googletest/
${CPPDAP_GOOGLETEST_DIR}/googletest/include/
)
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
add_subdirectory(${CPPDAP_GOOGLETEST_DIR})
# googletest has -Werror=maybe-uninitialized problems.
# Disable all warnings in googletest code.
target_compile_options(gtest PRIVATE -w)
# gmock has -Werror=deprecated-copy problems.
target_compile_options(gmock PRIVATE -w)
endif()

add_executable(cppdap-unittests ${DAP_TEST_LIST})
add_test(NAME cppdap-unittests COMMAND cppdap-unittests)

target_include_directories(cppdap-unittests PUBLIC ${DAP_TEST_INCLUDE_DIR} )
set_target_properties(cppdap-unittests PROPERTIES
FOLDER "Tests"
)
Expand All @@ -326,7 +324,7 @@ if(CPPDAP_BUILD_TESTS)
if(CPPDAP_USE_EXTERNAL_GTEST_PACKAGE)
target_link_libraries(cppdap-unittests PRIVATE cppdap GTest::gtest)
else()
target_link_libraries(cppdap-unittests PRIVATE cppdap)
target_link_libraries(cppdap-unittests PRIVATE cppdap gtest gmock)
endif()
endif(CPPDAP_BUILD_TESTS)

Expand Down
4 changes: 2 additions & 2 deletions kokoro/ubuntu/presubmit-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ git config --global --add safe.directory '*'
git submodule update --init

if [ "$BUILD_SYSTEM" == "cmake" ]; then
using cmake-3.17.2
using gcc-9
using cmake-3.31.2
using gcc-13

mkdir build
cd build
Expand Down
2 changes: 1 addition & 1 deletion kokoro/windows/presubmit.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ REM limitations under the License.
SETLOCAL ENABLEDELAYEDEXPANSION

SET BUILD_ROOT=%cd%
SET PATH=C:\python36;C:\Program Files\cmake-3.23.1-windows-x86_64\bin;%PATH%
SET PATH=C:\python312;C:\cmake-3.31.2\bin;%PATH%
SET SRC=%cd%\github\cppdap

cd %SRC%
Expand Down
1 change: 1 addition & 0 deletions license-checker.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"exclude": [
".clang-format",
".gitattributes",
".github/workflows/main.yml",
".gitignore",
".gitmodules",
".vscode/*.json",
Expand Down
Loading