Skip to content

Update abseil #6668

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 1 commit into from
May 4, 2026
Merged

Update abseil #6668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use_relative_paths = True
vars = {
'github': 'https://github.com',

'abseil_revision': '351086314d46e73d430296c9eca1f6d6c0372cd1',
'abseil_revision': '7dcc24cf19674efc75b8e8de06b9617838b8e0e9',

'effcee_revision': 'ae38e040cbb7e83efa8bfbb4967e5b8c8c89b55a',

Expand Down
20 changes: 14 additions & 6 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@ endif()
# Add a SPIR-V Tools unit test. Signature:
# add_spvtools_unittest(
# TARGET target_name
# SKIP_EFFCEE ON # optional
# SRCS src_file.h src_file.cpp
# LIBS lib1 lib2
# )
function(add_spvtools_unittest)
if (NOT "${SPIRV_SKIP_TESTS}" AND TARGET gmock_main)
set(one_value_args TARGET PCH_FILE)
set(one_value_args TARGET PCH_FILE SKIP_EFFCEE)
Comment thread
dneto0 marked this conversation as resolved.
set(multi_value_args SRCS LIBS ENVIRONMENT DEFINES)
cmake_parse_arguments(
ARG "" "${one_value_args}" "${multi_value_args}" ${ARGN})
Expand Down Expand Up @@ -68,13 +69,14 @@ function(add_spvtools_unittest)
${gtest_SOURCE_DIR}/include
${gmock_SOURCE_DIR}/include
)
if (TARGET effcee)
# If using Effcee for testing, then add its include directory.
target_include_directories(${target} PRIVATE ${effcee_SOURCE_DIR})
endif()
target_link_libraries(${target} PRIVATE ${ARG_LIBS})
if (TARGET effcee)
target_link_libraries(${target} PRIVATE effcee)
if ("${ARG_SKIP_EFFCEE}")
else()
# If using Effcee for testing, then add its include directory.
target_include_directories(${target} PRIVATE ${effcee_SOURCE_DIR})
target_link_libraries(${target} PRIVATE effcee)
endif()
endif()
target_link_libraries(${target} PRIVATE gmock_main)
add_test(NAME spirv-tools-${target} COMMAND ${target})
Expand Down Expand Up @@ -174,11 +176,17 @@ add_spvtools_unittest(

add_spvtools_unittest(
TARGET c_interface
SKIP_EFFCEE ON
SRCS c_interface_test.cpp
LIBS ${SPIRV_TOOLS_FULL_VISIBILITY})

add_spvtools_unittest(
TARGET c_interface_shared
# Effcee pulls in Abseil. But if the executable is compiled
# with the shared C++ runtime, then Abseil also needs the shared
# C++ runtime. Skip linking effcee to avoid the problem in the
# first place. The C interface test doesn't need it.
SKIP_EFFCEE ON
SRCS c_interface_test.cpp
LIBS ${SPIRV_TOOLS}-shared
ENVIRONMENT PATH=$<TARGET_FILE_DIR:${SPIRV_TOOLS}-shared>)
Expand Down