This is an archive of the discontinued LLVM Phabricator instance.

Differential D149662

[libc] Enable the 'string' unit tests to be hermetic
ClosedPublic

Authored by jhuber6 on May 2 2023, 10:00 AM.

Details

Reviewers
sivachandra
lntue
michaelrj
gchatelet
Commits
rG9a20e024a25c: [libc] Enable the 'string' unit tests to be hermetic
Summary

This changes over the string unit tests to the new add_libc_test
framework. The one test that wasn't changes was the memory utils because
it overran the static buffer used for the hermetic test's bump pointer.

Depends on D149656

Diff Detail

Event Timeline

jhuber6 created this revision.May 2 2023, 10:00 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptMay 2 2023, 10:00 AM
Herald added subscribers: libc-commits, ecnelises, tschuett. · View Herald Transcript
jhuber6 requested review of this revision.May 2 2023, 10:00 AM
Harbormaster completed remote builds in B229469: Diff 518781.May 2 2023, 10:07 AM
lntue added inline comments.May 2 2023, 10:36 AM
libc/test/src/CMakeLists.txt
29 ↗(On Diff #518781)

Is this related to this change?

jhuber6 added inline comments.May 2 2023, 10:37 AM
libc/test/src/CMakeLists.txt
29 ↗(On Diff #518781)

Ah, this was for moving stdlib as well but was included in this patch. I'll remove it.

jhuber6 updated this revision to Diff 518836.May 2 2023, 12:51 PM

Remove unrelated change.

Harbormaster completed remote builds in B229513: Diff 518836.May 2 2023, 12:59 PM
jhuber6 added a child revision: D149691: [libc] Add 'UNIT_TEST_ONLY' and 'HERMETIC_TEST_ONLY' to 'add_libc_test'.May 2 2023, 1:57 PM
sivachandra accepted this revision.May 2 2023, 4:36 PM
This revision is now accepted and ready to land.May 2 2023, 4:36 PM
Closed by commit rG9a20e024a25c: [libc] Enable the 'string' unit tests to be hermetic (authored by jhuber6). · Explain WhyMay 2 2023, 4:51 PM
This revision was automatically updated to reflect the committed changes.
jhuber6 added a commit: rG9a20e024a25c: [libc] Enable the 'string' unit tests to be hermetic.

Revision Contents

PathSize
libc/
test/
UnitTest/
2 lines
src/
string/
166 lines
memory_utils/
3 lines

Diff 518912

libc/test/UnitTest/CMakeLists.txt

Show First 20 Lines • Show All 120 Lines • ▼ Show 20 Linesadd_dependencies(
libc.src.__support.FPUtil.fp_bits libc.src.__support.FPUtil.fp_bits
libc.src.stdio.scanf_core.core_structs libc.src.stdio.scanf_core.core_structs
libc.test.UnitTest.string_utils libc.test.UnitTest.string_utils
) )
foreach(lib LibcFPTestHelpers LibcMemoryHelpers LibcPrintfHelpers LibcScanfHelpers) foreach(lib LibcFPTestHelpers LibcMemoryHelpers LibcPrintfHelpers LibcScanfHelpers)
target_include_directories(${lib} PUBLIC ${LIBC_SOURCE_DIR}) target_include_directories(${lib} PUBLIC ${LIBC_SOURCE_DIR})
target_compile_options(${lib} PRIVATE -fno-exceptions -fno-rtti) target_compile_options(${lib} PRIVATE -fno-exceptions -fno-rtti)
target_link_libraries(${lib} LibcUnitTest) target_link_libraries(${lib} LibcUnitTest)
endforeach() endforeach()

libc/test/src/string/CMakeLists.txt

add_custom_target(libc_string_unittests) add_custom_target(libc-string-tests)
add_subdirectory(memory_utils) add_subdirectory(memory_utils)
add_libc_unittest( add_libc_test(
bcopy_test bcopy_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
bcopy_test.cpp bcopy_test.cpp
DEPENDS DEPENDS
libc.src.string.bcopy libc.src.string.bcopy
LINK_LIBRARIES LINK_LIBRARIES
LibcMemoryHelpers LibcMemoryHelpers
) )
add_header_library( add_header_library(
strchr_test_support strchr_test_support
HDRS HDRS
StrchrTest.h StrchrTest.h
) )
add_libc_unittest( add_libc_test(
index_test index_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
index_test.cpp index_test.cpp
DEPENDS DEPENDS
libc.src.string.index libc.src.string.index
.strchr_test_support .strchr_test_support
) )
add_libc_unittest( add_libc_test(
memccpy_test memccpy_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
memccpy_test.cpp memccpy_test.cpp
DEPENDS DEPENDS
libc.src.string.memccpy libc.src.string.memccpy
) )
add_libc_unittest( add_libc_test(
mempcpy_test mempcpy_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
mempcpy_test.cpp mempcpy_test.cpp
DEPENDS DEPENDS
libc.src.string.mempcpy libc.src.string.mempcpy
) )
add_libc_unittest( add_libc_test(
memmem_test memmem_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
memmem_test.cpp memmem_test.cpp
DEPENDS DEPENDS
libc.src.string.memmem libc.src.string.memmem
) )
add_libc_unittest( add_libc_test(
memchr_test memchr_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
memchr_test.cpp memchr_test.cpp
DEPENDS DEPENDS
libc.src.string.memchr libc.src.string.memchr
) )
add_libc_unittest( add_libc_test(
memrchr_test memrchr_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
memrchr_test.cpp memrchr_test.cpp
DEPENDS DEPENDS
libc.src.string.memrchr libc.src.string.memrchr
) )
add_libc_unittest( add_libc_test(
rindex_test rindex_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
rindex_test.cpp rindex_test.cpp
DEPENDS DEPENDS
libc.src.string.rindex libc.src.string.rindex
.strchr_test_support .strchr_test_support
) )
add_libc_unittest( add_libc_test(
stpcpy_test stpcpy_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
stpcpy_test.cpp stpcpy_test.cpp
DEPENDS DEPENDS
libc.src.string.stpcpy libc.src.string.stpcpy
) )
add_libc_unittest( add_libc_test(
stpncpy_test stpncpy_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
stpncpy_test.cpp stpncpy_test.cpp
DEPENDS DEPENDS
libc.src.string.stpncpy libc.src.string.stpncpy
) )
add_libc_unittest( add_libc_test(
strcat_test strcat_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strcat_test.cpp strcat_test.cpp
DEPENDS DEPENDS
libc.src.string.strcat libc.src.string.strcat
) )
add_libc_unittest( add_libc_test(
strchr_test strchr_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strchr_test.cpp strchr_test.cpp
DEPENDS DEPENDS
libc.src.string.strchr libc.src.string.strchr
.strchr_test_support .strchr_test_support
) )
add_libc_unittest( add_libc_test(
strchrnul_test strchrnul_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strchrnul_test.cpp strchrnul_test.cpp
DEPENDS DEPENDS
libc.src.string.strchrnul libc.src.string.strchrnul
) )
add_libc_unittest( add_libc_test(
strcmp_test strcmp_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strcmp_test.cpp strcmp_test.cpp
DEPENDS DEPENDS
libc.src.string.strcmp libc.src.string.strcmp
) )
add_libc_unittest( add_libc_test(
strcasecmp_test strcasecmp_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strcasecmp_test.cpp strcasecmp_test.cpp
DEPENDS DEPENDS
libc.src.string.strcasecmp libc.src.string.strcasecmp
) )
add_libc_unittest( add_libc_test(
strcasestr_test strcasestr_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strcasestr_test.cpp strcasestr_test.cpp
DEPENDS DEPENDS
libc.src.string.strcasestr libc.src.string.strcasestr
) )
add_libc_unittest( add_libc_test(
strcoll_test strcoll_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strcoll_test.cpp strcoll_test.cpp
DEPENDS DEPENDS
libc.src.string.strcoll libc.src.string.strcoll
) )
add_libc_unittest( add_libc_test(
strcpy_test strcpy_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strcpy_test.cpp strcpy_test.cpp
DEPENDS DEPENDS
libc.src.string.strcpy libc.src.string.strcpy
) )
add_libc_unittest( add_libc_test(
strcspn_test strcspn_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strcspn_test.cpp strcspn_test.cpp
DEPENDS DEPENDS
libc.src.string.strcspn libc.src.string.strcspn
) )
add_libc_unittest( add_libc_test(
strdup_test strdup_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strdup_test.cpp strdup_test.cpp
DEPENDS DEPENDS
libc.include.stdlib libc.include.stdlib
libc.src.string.strdup libc.src.string.strdup
libc.src.errno.errno libc.src.errno.errno
) )
add_libc_unittest( add_libc_test(
strerror_test strerror_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strerror_test.cpp strerror_test.cpp
DEPENDS DEPENDS
libc.src.string.strerror libc.src.string.strerror
) )
add_libc_unittest( add_libc_test(
strerror_r_test strerror_r_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strerror_r_test.cpp strerror_r_test.cpp
DEPENDS DEPENDS
libc.src.string.strerror_r libc.src.string.strerror_r
) )
add_libc_unittest( add_libc_test(
strlcat_test strlcat_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strlcat_test.cpp strlcat_test.cpp
DEPENDS DEPENDS
libc.src.string.strlcat libc.src.string.strlcat
) )
add_libc_unittest( add_libc_test(
strlcpy_test strlcpy_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strlcpy_test.cpp strlcpy_test.cpp
DEPENDS DEPENDS
libc.src.string.strlcpy libc.src.string.strlcpy
) )
add_libc_unittest( add_libc_test(
strlen_test strlen_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strlen_test.cpp strlen_test.cpp
DEPENDS DEPENDS
libc.src.string.strlen libc.src.string.strlen
) )
add_libc_unittest( add_libc_test(
strncat_test strncat_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strncat_test.cpp strncat_test.cpp
DEPENDS DEPENDS
libc.src.string.strncat libc.src.string.strncat
) )
add_libc_unittest( add_libc_test(
strncmp_test strncmp_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strncmp_test.cpp strncmp_test.cpp
DEPENDS DEPENDS
libc.src.string.strncmp libc.src.string.strncmp
) )
add_libc_unittest( add_libc_test(
strncasecmp_test strncasecmp_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strncasecmp_test.cpp strncasecmp_test.cpp
DEPENDS DEPENDS
libc.src.string.strncasecmp libc.src.string.strncasecmp
) )
add_libc_unittest( add_libc_test(
strncpy_test strncpy_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strncpy_test.cpp strncpy_test.cpp
DEPENDS DEPENDS
libc.src.string.strncpy libc.src.string.strncpy
) )
add_libc_unittest( add_libc_test(
strndup_test strndup_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strndup_test.cpp strndup_test.cpp
DEPENDS DEPENDS
libc.include.stdlib libc.include.stdlib
libc.src.string.strndup libc.src.string.strndup
) )
add_libc_unittest( add_libc_test(
strnlen_test strnlen_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strnlen_test.cpp strnlen_test.cpp
DEPENDS DEPENDS
libc.src.string.strnlen libc.src.string.strnlen
) )
add_libc_unittest( add_libc_test(
strpbrk_test strpbrk_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strpbrk_test.cpp strpbrk_test.cpp
DEPENDS DEPENDS
libc.src.string.strpbrk libc.src.string.strpbrk
) )
add_libc_unittest( add_libc_test(
strrchr_test strrchr_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strrchr_test.cpp strrchr_test.cpp
DEPENDS DEPENDS
libc.src.string.strrchr libc.src.string.strrchr
.strchr_test_support .strchr_test_support
) )
add_libc_unittest( add_libc_test(
strsep_test strsep_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strsep_test.cpp strsep_test.cpp
DEPENDS DEPENDS
libc.src.string.strsep libc.src.string.strsep
) )
add_libc_unittest( add_libc_test(
strsignal_test strsignal_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strsignal_test.cpp strsignal_test.cpp
DEPENDS DEPENDS
libc.src.string.strsignal libc.src.string.strsignal
) )
add_libc_unittest( add_libc_test(
strspn_test strspn_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strspn_test.cpp strspn_test.cpp
DEPENDS DEPENDS
libc.src.string.strspn libc.src.string.strspn
) )
add_libc_unittest( add_libc_test(
strstr_test strstr_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strstr_test.cpp strstr_test.cpp
DEPENDS DEPENDS
libc.src.string.strstr libc.src.string.strstr
) )
add_libc_unittest( add_libc_test(
strtok_test strtok_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strtok_test.cpp strtok_test.cpp
DEPENDS DEPENDS
libc.src.string.strtok libc.src.string.strtok
) )
add_libc_unittest( add_libc_test(
strtok_r_test strtok_r_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strtok_r_test.cpp strtok_r_test.cpp
DEPENDS DEPENDS
libc.src.string.strtok_r libc.src.string.strtok_r
) )
add_libc_unittest( add_libc_test(
strxfrm_test strxfrm_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
strxfrm_test.cpp strxfrm_test.cpp
DEPENDS DEPENDS
libc.src.string.strxfrm libc.src.string.strxfrm
) )
# Tests all implementations that can run on the target CPU. # Tests all implementations that can run on the target CPU.
function(add_libc_multi_impl_test name) function(add_libc_multi_impl_test name)
get_property(fq_implementations GLOBAL PROPERTY ${name}_implementations) get_property(fq_implementations GLOBAL PROPERTY ${name}_implementations)
foreach(fq_config_name IN LISTS fq_implementations) foreach(fq_config_name IN LISTS fq_implementations)
get_target_property(required_cpu_features ${fq_config_name} REQUIRE_CPU_FEATURES) get_target_property(required_cpu_features ${fq_config_name} REQUIRE_CPU_FEATURES)
cpu_supports(can_run "${required_cpu_features}") cpu_supports(can_run "${required_cpu_features}")
if(can_run) if(can_run)
add_libc_unittest( add_libc_test(
${fq_config_name}_test ${fq_config_name}_test
SUITE SUITE
libc_string_unittests libc-string-tests
COMPILE_OPTIONS COMPILE_OPTIONS
${LIBC_COMPILE_OPTIONS_NATIVE} ${LIBC_COMPILE_OPTIONS_NATIVE}
LINK_LIBRARIES LINK_LIBRARIES
LibcMemoryHelpers LibcMemoryHelpers
${ARGN} ${ARGN}
DEPENDS DEPENDS
${fq_config_name} ${fq_config_name}
libc.src.__support.macros.sanitizer libc.src.__support.macros.sanitizer
Show All 14 Lines

libc/test/src/string/memory_utils/CMakeLists.txt

# This test uses too much memory to be made hermetic.
add_libc_unittest( add_libc_unittest(
utils_test utils_test
SUITE SUITE
libc_string_unittests libc-string-tests
SRCS SRCS
op_tests.cpp op_tests.cpp
utils_test.cpp utils_test.cpp
COMPILE_OPTIONS COMPILE_OPTIONS
${LIBC_COMPILE_OPTIONS_NATIVE} ${LIBC_COMPILE_OPTIONS_NATIVE}
-ffreestanding -ffreestanding
DEPENDS DEPENDS
libc.src.__support.CPP.array libc.src.__support.CPP.array
libc.src.__support.CPP.cstddef libc.src.__support.CPP.cstddef
libc.src.__support.CPP.span libc.src.__support.CPP.span
libc.src.__support.macros.sanitizer libc.src.__support.macros.sanitizer
libc.src.string.memory_utils.memory_utils libc.src.string.memory_utils.memory_utils
) )