This is an archive of the discontinued LLVM Phabricator instance.

Differential D149750

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

Authored by jhuber6 on May 3 2023, 8:02 AM.

Details

Reviewers
sivachandra
lntue
michaelrj
Commits
rG78d7d62c36f5: [libc] Enable the '__support' unit tests to be hermetic
Summary

This patch updates the __support unit tests to be built as hermetic
tests. The only tests we needed to disable were because of the use of
realloc which is not implemented correctly as it doesn't copy the
memory.

Depends on D149745

Diff Detail

Event Timeline

jhuber6 created this revision.May 3 2023, 8:02 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptMay 3 2023, 8:02 AM
Herald added subscribers: libc-commits, ecnelises, tschuett. · View Herald Transcript
jhuber6 requested review of this revision.May 3 2023, 8:02 AM
Harbormaster completed remote builds in B229689: Diff 519076.May 3 2023, 8:11 AM
sivachandra added inline comments.May 3 2023, 9:13 AM
libc/test/src/__support/CMakeLists.txt
91

We do have realloc: https://github.com/llvm/llvm-project/blob/main/libc/test/UnitTest/HermeticTestUtils.cpp#L68

jhuber6 added inline comments.May 3 2023, 9:14 AM
libc/test/src/__support/CMakeLists.txt
91

Doesn't realloc need to copy the old memory? This just allocates a new pointer, which is going to be zero thus the tests fail and print an empty string.

sivachandra accepted this revision.May 3 2023, 9:17 AM
sivachandra added inline comments.
libc/test/src/__support/CMakeLists.txt
91

Ah, yes! Indeed!

This revision is now accepted and ready to land.May 3 2023, 9:17 AM
This revision was landed with ongoing or failed builds.May 3 2023, 9:38 AM
Closed by commit rG78d7d62c36f5: [libc] Enable the '__support' unit tests to be hermetic (authored by jhuber6). · Explain Why
This revision was automatically updated to reflect the committed changes.
jhuber6 added a commit: rG78d7d62c36f5: [libc] Enable the '__support' unit tests to be hermetic.

Revision Contents

PathSize
libc/
test/
src/
__support/
40 lines
CPP/
44 lines
FPUtil/
4 lines
File/
8 lines
OSUtil/
2 lines
linux/
x86_64/
6 lines
4 lines

Diff 519129

libc/test/src/__support/CMakeLists.txt

add_custom_target(libc_support_unittests) add_custom_target(libc-support-tests)
add_libc_unittest( add_libc_test(
blockstore_test blockstore_test
SUITE SUITE
libc_support_unittests libc-support-tests
SRCS SRCS
blockstore_test.cpp blockstore_test.cpp
DEPENDS DEPENDS
libc.src.__support.blockstore libc.src.__support.blockstore
) )
add_libc_unittest( add_libc_test(
endian_test endian_test
SUITE SUITE
libc_support_unittests libc-support-tests
SRCS SRCS
endian_test.cpp endian_test.cpp
DEPENDS DEPENDS
libc.src.__support.common libc.src.__support.common
) )
add_libc_unittest( add_libc_test(
high_precision_decimal_test high_precision_decimal_test
SUITE SUITE
libc_support_unittests libc-support-tests
SRCS SRCS
high_precision_decimal_test.cpp high_precision_decimal_test.cpp
DEPENDS DEPENDS
libc.src.__support.high_precision_decimal libc.src.__support.high_precision_decimal
libc.src.__support.uint128 libc.src.__support.uint128
) )
add_libc_unittest( add_libc_test(
str_to_float_test str_to_float_test
SUITE SUITE
libc_support_unittests libc-support-tests
SRCS SRCS
str_to_float_test.cpp str_to_float_test.cpp
DEPENDS DEPENDS
libc.src.__support.str_to_float libc.src.__support.str_to_float
libc.src.__support.uint128 libc.src.__support.uint128
libc.src.errno.errno libc.src.errno.errno
) )
add_libc_unittest( add_libc_test(
integer_to_string_test integer_to_string_test
SUITE SUITE
libc_support_unittests libc-support-tests
SRCS SRCS
integer_to_string_test.cpp integer_to_string_test.cpp
DEPENDS DEPENDS
libc.src.__support.integer_to_string libc.src.__support.integer_to_string
libc.src.__support.CPP.string_view libc.src.__support.CPP.string_view
) )
add_libc_unittest( add_libc_test(
arg_list_test arg_list_test
SUITE SUITE
libc_support_unittests libc-support-tests
SRCS SRCS
arg_list_test.cpp arg_list_test.cpp
DEPENDS DEPENDS
libc.src.__support.arg_list libc.src.__support.arg_list
) )
add_libc_unittest( add_libc_test(
uint_test uint_test
SUITE SUITE
libc_support_unittests libc-support-tests
SRCS SRCS
uint_test.cpp uint_test.cpp
DEPENDS DEPENDS
libc.src.__support.uint libc.src.__support.uint
libc.src.__support.CPP.optional libc.src.__support.CPP.optional
) )
add_libc_unittest( add_libc_test(
fixedvector_test fixedvector_test
SUITE SUITE
libc_support_unittests libc-support-tests
SRCS SRCS
fixedvector_test.cpp fixedvector_test.cpp
DEPENDS DEPENDS
libc.src.__support.fixedvector libc.src.__support.fixedvector
) )
add_libc_unittest( add_libc_test(
char_vector_test char_vector_test
# This test relies on 'realloc' which is not implemented for hermetic tests.
UNIT_TEST_ONLY
sivachandraUnsubmitted
Not Done
ReplyInline Actions

We do have realloc: https://github.com/llvm/llvm-project/blob/main/libc/test/UnitTest/HermeticTestUtils.cpp#L68

sivachandra: We do have realloc: https://github.com/llvm/llvm…
jhuber6AuthorUnsubmitted
Done
ReplyInline Actions

Doesn't realloc need to copy the old memory? This just allocates a new pointer, which is going to be zero thus the tests fail and print an empty string.

jhuber6: Doesn't `realloc` need to copy the old memory? This just allocates a new pointer, which is…
sivachandraUnsubmitted
Done
ReplyInline Actions

Ah, yes! Indeed!

sivachandra: Ah, yes! Indeed!
SUITE SUITE
libc_support_unittests libc-support-tests
SRCS SRCS
char_vector_test.cpp char_vector_test.cpp
DEPENDS DEPENDS
libc.src.__support.char_vector libc.src.__support.char_vector
) )
add_executable( add_executable(
libc_str_to_float_comparison_test libc_str_to_float_comparison_test
Show All 26 Lines

libc/test/src/__support/CPP/CMakeLists.txt

add_custom_target(libc_cpp_utils_unittests) add_custom_target(libc-cpp-utils-tests)
add_libc_unittest( add_libc_test(
bitset_test bitset_test
SUITE SUITE
libc_cpp_utils_unittests libc-cpp-utils-tests
SRCS SRCS
bitset_test.cpp bitset_test.cpp
DEPENDS DEPENDS
libc.src.__support.CPP.bitset libc.src.__support.CPP.bitset
) )
add_libc_unittest( add_libc_test(
cstddef_test cstddef_test
SUITE SUITE
libc_cpp_utils_unittests libc-cpp-utils-tests
SRCS SRCS
cstddef_test.cpp cstddef_test.cpp
DEPENDS DEPENDS
libc.src.__support.CPP.cstddef libc.src.__support.CPP.cstddef
) )
add_libc_unittest( add_libc_test(
stringview_test stringview_test
SUITE SUITE
libc_cpp_utils_unittests libc-cpp-utils-tests
SRCS SRCS
stringview_test.cpp stringview_test.cpp
DEPENDS DEPENDS
libc.src.__support.CPP.string_view libc.src.__support.CPP.string_view
) )
add_libc_unittest( add_libc_test(
limits_test limits_test
SUITE SUITE
libc_cpp_utils_unittests libc-cpp-utils-tests
SRCS SRCS
limits_test.cpp limits_test.cpp
DEPENDS DEPENDS
libc.src.__support.CPP.limits libc.src.__support.CPP.limits
libc.src.__support.uint libc.src.__support.uint
) )
add_libc_unittest( add_libc_test(
int_seq_test int_seq_test
SUITE SUITE
libc_cpp_utils_unittests libc-cpp-utils-tests
SRCS SRCS
integer_sequence_test.cpp integer_sequence_test.cpp
DEPENDS DEPENDS
libc.src.__support.CPP.utility libc.src.__support.CPP.utility
) )
add_libc_unittest( add_libc_test(
atomic_test atomic_test
SUITE SUITE
libc_cpp_utils_unittests libc-cpp-utils-tests
SRCS SRCS
atomic_test.cpp atomic_test.cpp
DEPENDS DEPENDS
libc.src.__support.CPP.atomic libc.src.__support.CPP.atomic
) )
add_libc_unittest( add_libc_test(
stringstream_test stringstream_test
SUITE SUITE
libc_cpp_utils_unittests libc-cpp-utils-tests
SRCS SRCS
stringstream_test.cpp stringstream_test.cpp
DEPENDS DEPENDS
libc.src.__support.CPP.span libc.src.__support.CPP.span
libc.src.__support.CPP.stringstream libc.src.__support.CPP.stringstream
) )
add_libc_unittest( add_libc_test(
optional_test optional_test
SUITE SUITE
libc_cpp_utils_unittests libc-cpp-utils-tests
SRCS SRCS
optional_test.cpp optional_test.cpp
DEPENDS DEPENDS
libc.src.__support.CPP.optional libc.src.__support.CPP.optional
) )
add_libc_unittest( add_libc_test(
span_test span_test
SUITE SUITE
libc_cpp_utils_unittests libc-cpp-utils-tests
SRCS SRCS
span_test.cpp span_test.cpp
DEPENDS DEPENDS
libc.src.__support.CPP.span libc.src.__support.CPP.span
) )
add_libc_unittest( add_libc_test(
string_test string_test
# This test relies on 'realloc' which is not implemented for hermetic tests.
UNIT_TEST_ONLY
SUITE SUITE
libc_cpp_utils_unittests libc-cpp-utils-tests
SRCS SRCS
string_test.cpp string_test.cpp
DEPENDS DEPENDS
libc.src.__support.CPP.string libc.src.__support.CPP.string
libc.src.__support.CPP.string_view libc.src.__support.CPP.string_view
) )

libc/test/src/__support/FPUtil/CMakeLists.txt

add_custom_target(libc_fputil_unittests) add_custom_target(libc-fputil-tests)
add_fp_unittest( add_fp_unittest(
dyadic_float_test dyadic_float_test
NEED_MPFR NEED_MPFR
SUITE SUITE
libc_fputil_unittests libc-fputil-tests
SRCS SRCS
dyadic_float_test.cpp dyadic_float_test.cpp
DEPENDS DEPENDS
libc.src.__support.FPUtil.dyadic_float libc.src.__support.FPUtil.dyadic_float
) )

libc/test/src/__support/File/CMakeLists.txt

if(NOT (TARGET libc.src.__support.threads.mutex)) if(NOT (TARGET libc.src.__support.threads.mutex))
# Not all platforms have a mutex implementation. If mutex is unvailable, # Not all platforms have a mutex implementation. If mutex is unvailable,
# we just skip everything about files. # we just skip everything about files.
return() return()
endif() endif()
add_libc_unittest( add_libc_test(
file_test file_test
SUITE SUITE
libc_support_unittests libc-support-tests
SRCS SRCS
file_test.cpp file_test.cpp
LINK_LIBRARIES LINK_LIBRARIES
LibcMemoryHelpers LibcMemoryHelpers
DEPENDS DEPENDS
libc.include.errno libc.include.errno
libc.include.stdio libc.include.stdio
libc.include.stdlib libc.include.stdlib
libc.src.__support.CPP.new libc.src.__support.CPP.new
libc.src.__support.File.file libc.src.__support.File.file
) )
if (TARGET libc.src.__support.File.platform_file) if (TARGET libc.src.__support.File.platform_file)
add_libc_unittest( add_libc_test(
platform_file_test platform_file_test
SUITE SUITE
libc_support_unittests libc-support-tests
SRCS SRCS
platform_file_test.cpp platform_file_test.cpp
DEPENDS DEPENDS
libc.src.__support.File.file libc.src.__support.File.file
libc.src.__support.File.platform_file libc.src.__support.File.platform_file
libc.include.stdio libc.include.stdio
) )
endif() endif()
add_subdirectory(testdata) add_subdirectory(testdata)

libc/test/src/__support/OSUtil/CMakeLists.txt

add_custom_target(libc_osutil_tests) add_custom_target(libc-osutil-tests)
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LIBC_TARGET_OS}) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LIBC_TARGET_OS})
add_subdirectory(${LIBC_TARGET_OS}) add_subdirectory(${LIBC_TARGET_OS})
endif() endif()

libc/test/src/__support/OSUtil/linux/x86_64/CMakeLists.txt

add_libc_unittest( add_libc_test(
syscall_unittest syscall_test
SUITE libc_osutil_tests SUITE libc-osutil-tests
SRCS syscall_test.cpp SRCS syscall_test.cpp
COMPILE_OPTIONS COMPILE_OPTIONS
-Wno-unused-variable # Only signature tests, declared variables are unused. -Wno-unused-variable # Only signature tests, declared variables are unused.
DEPENDS DEPENDS
libc.src.__support.OSUtil.osutil libc.src.__support.OSUtil.osutil
) )

libc/test/src/__support/char_vector_test.cpp

Show First 20 Lines • Show All 65 Lines • ▼ Show 20 Lines constexpr char test_str[] =
"12345678901234567890123456789012345678901234567890" "12345678901234567890123456789012345678901234567890"
"ABCDEFGHIJKLMNOPQRSTUVWXYabcdefghijklmnopqrstuvwxy" "ABCDEFGHIJKLMNOPQRSTUVWXYabcdefghijklmnopqrstuvwxy"
"12345678901234567890123456789012345678901234567890" "12345678901234567890123456789012345678901234567890"
"ABCDEFGHIJKLMNOPQRSTUVWXYabcdefghijklmnopqrstuvwxy" "ABCDEFGHIJKLMNOPQRSTUVWXYabcdefghijklmnopqrstuvwxy"
"12345678901234567890123456789012345678901234567890" "12345678901234567890123456789012345678901234567890"
"ABCDEFGHIJKLMNOPQRSTUVWXYabcdefghijklmnopqrstuvwxy"; "ABCDEFGHIJKLMNOPQRSTUVWXYabcdefghijklmnopqrstuvwxy";
for (size_t i = 0; test_str[i] != '\0'; ++i) { for (size_t i = 0; test_str[i] != '\0'; ++i) {
ASSERT_EQ(v.length(), i); ASSERT_EQ(v.length(), i);
v.append(test_str[i]); ASSERT_TRUE(v.append(test_str[i]));
} }
ASSERT_STREQ(v.c_str(), test_str);
ASSERT_EQ(v.length(), size_t(1000)); ASSERT_EQ(v.length(), size_t(1000));
ASSERT_STREQ(v.c_str(), test_str);
} }