Clean up tests, dependencies

Author: mleleszi

libc/src/stdio/printf_core/CMakeLists.txt

@@ -47,9 +47,7 @@ add_header_library(
     libc.include.inttypes
     libc.src.__support.CPP.string_view
     libc.src.__support.FPUtil.fp_bits
-    libc.hdr.types.FILE
     libc.hdr.errno_macros
-    libc.src.__support.File.file
 )
 
 add_header_library(

libc/src/stdio/printf_core/core_structs.h

@@ -12,11 +12,9 @@
 #include "src/__support/macros/config.h"
 
 #include "hdr/errno_macros.h"
-#include "hdr/types/FILE.h"
 #include "src/__support/CPP/string_view.h"
 #include "src/__support/CPP/type_traits.h"
 #include "src/__support/FPUtil/FPBits.h"
-#include "src/__support/File/file.h"
 #include "src/stdio/printf_core/printf_config.h"
 
 #include <inttypes.h>

libc/src/stdio/printf_core/fixed_converter.h

@@ -9,7 +9,6 @@
 #ifndef LLVM_LIBC_SRC_STDIO_PRINTF_CORE_FIXED_CONVERTER_H
 #define LLVM_LIBC_SRC_STDIO_PRINTF_CORE_FIXED_CONVERTER_H
 
-#include "hdr/errno_macros.h"
 #include "include/llvm-libc-macros/stdfix-macros.h"
 #include "src/__support/CPP/string_view.h"
 #include "src/__support/ctype_utils.h"

libc/src/stdio/printf_core/vfprintf_internal.h

@@ -9,7 +9,6 @@
 #ifndef LLVM_LIBC_SRC_STDIO_PRINTF_CORE_VFPRINTF_INTERNAL_H
 #define LLVM_LIBC_SRC_STDIO_PRINTF_CORE_VFPRINTF_INTERNAL_H
 
-#include "hdr/errno_macros.h"
 #include "src/__support/File/file.h"
 #include "src/__support/arg_list.h"
 #include "src/__support/error_or.h"

libc/test/src/stdio/CMakeLists.txt

@@ -170,11 +170,6 @@ if(LLVM_LIBC_FULL_BUILD)
        libc.src.stdio.fopen
        libc.src.stdio.fread
   )
-  if(${LIBC_TARGET_OS} STREQUAL "linux")
-    list(APPEND fprintf_test_deps
-         libc.src.stdio.fopencookie
-    )
-  endif()
   # This is to be used for tests which write to libc's platform streams
   # under full build but write to system-lib's streams otherwise.
   set(hermetic_test_only HERMETIC_TEST_ONLY)

libc/test/src/stdio/fprintf_test.cpp

@@ -20,11 +20,6 @@
 #include "test/UnitTest/ErrnoSetterMatcher.h"
 #include "test/UnitTest/Test.h"
 
-#if defined(LIBC_TARGET_OS_IS_LINUX) &&                                        \
-    !defined(LIBC_COPT_STDIO_USE_SYSTEM_FILE)
-#include "src/stdio/fopencookie.h"
-#endif
-
 namespace printf_test {
 #ifndef LIBC_COPT_STDIO_USE_SYSTEM_FILE
 using LIBC_NAMESPACE::fclose;
@@ -93,33 +88,6 @@ TEST(LlvmLibcFPrintfTest, WriteToFile) {
   ASSERT_EQ(printf_test::fclose(file), 0);
 }
 
-#if !defined(LIBC_COPT_STDIO_USE_SYSTEM_FILE) &&                               \
-    defined(LIBC_TARGET_OS_IS_LINUX)
-TEST(LlvmLibcFPrintfTest, CharsWrittenOverflow) {
-  struct NoopStream {};
-  auto noop_write = [](void *, const char *, size_t size) -> ssize_t {
-    return size;
-  };
-
-  NoopStream stream;
-  cookie_io_functions_t funcs = {nullptr, +noop_write, nullptr, nullptr};
-  ::FILE *file = LIBC_NAMESPACE::fopencookie(&stream, "w", funcs);
-  ASSERT_NE(file, nullptr);
-
-  // Trigger an overflow in the return value of fprintf by writing more than
-  // INT_MAX bytes. We do this by printing a string with precision INT_MAX, and
-  // then one more character.
-  int max_int = LIBC_NAMESPACE::cpp::numeric_limits<int>::max();
-  int result = LIBC_NAMESPACE::fprintf(file, "%*sA", max_int, "");
-
-  EXPECT_LT(result, 0);
-  ASSERT_ERRNO_EQ(EOVERFLOW);
-
-  EXPECT_EQ(printf_test::fclose(file), 0);
-}
-#endif // #if !defined(LIBC_COPT_STDIO_USE_SYSTEM_FILE) &&
-       // defined(LIBC_TARGET_OS_IS_LINUX)
-
 #ifndef LIBC_COPT_PRINTF_NO_NULLPTR_CHECKS
 TEST(LlvmLibcFPrintfTest, NullPtrCheck) {
   const char *FILENAME = APPEND_LIBC_TEST("fprintf_nullptr.test");

libc/test/src/stdio/snprintf_test.cpp

@@ -8,8 +8,12 @@
 
 #include "src/stdio/snprintf.h"
 
+#include "test/UnitTest/ErrnoCheckingTest.h"
+#include "test/UnitTest/ErrnoSetterMatcher.h"
 #include "test/UnitTest/Test.h"
 
+using LlvmLibcSNPrintfTest = LIBC_NAMESPACE::testing::ErrnoCheckingTest;
+
 // The sprintf test cases cover testing the shared printf functionality, so
 // these tests will focus on snprintf exclusive features.
 
@@ -59,3 +63,14 @@ TEST(LlvmLibcSNPrintfTest, NoCutOff) {
   EXPECT_EQ(written, 10);
   ASSERT_STREQ(buff, "1234567890");
 }
+
+TEST(LlvmLibcSNPrintfTest, CharsWrittenOverflow) {
+  char buff[0];
+
+  // Trigger an overflow in the return value of snprintf by writing more than
+  // INT_MAX bytes.
+  int int_max = LIBC_NAMESPACE::cpp::numeric_limits<int>::max();
+  int written = LIBC_NAMESPACE::snprintf(buff, 0, "%*stest", int_max, "");
+  EXPECT_LT(written, 0);
+  ASSERT_ERRNO_EQ(EOVERFLOW);
+}

libc/test/src/stdio/vfprintf_test.cpp

@@ -23,11 +23,6 @@
 #include "test/UnitTest/ErrnoSetterMatcher.h"
 #include "test/UnitTest/Test.h"
 
-#if defined(LIBC_TARGET_OS_IS_LINUX) &&                                        \
-    !defined(LIBC_COPT_STDIO_USE_SYSTEM_FILE)
-#include "src/stdio/fopencookie.h"
-#endif
-
 namespace printf_test {
 #ifndef LIBC_COPT_STDIO_USE_SYSTEM_FILE
 using LIBC_NAMESPACE::fclose;
@@ -103,30 +98,3 @@ TEST(LlvmLibcVFPrintfTest, WriteToFile) {
 
   ASSERT_EQ(printf_test::fclose(file), 0);
 }
-
-#if !defined(LIBC_COPT_STDIO_USE_SYSTEM_FILE) &&                               \
-    defined(LIBC_TARGET_OS_IS_LINUX)
-TEST(LlvmLibcVFPrintfTest, CharsWrittenOverflow) {
-  struct NoopStream {};
-  auto noop_write = [](void *, const char *, size_t size) -> ssize_t {
-    return size;
-  };
-
-  NoopStream stream;
-  cookie_io_functions_t funcs = {nullptr, +noop_write, nullptr, nullptr};
-  ::FILE *file = LIBC_NAMESPACE::fopencookie(&stream, "w", funcs);
-  ASSERT_NE(file, nullptr);
-
-  // Trigger an overflow in the return value of vfprintf by writing more than
-  // INT_MAX bytes. We do this by printing a string with precision INT_MAX, and
-  // then one more character.
-  int max_int = LIBC_NAMESPACE::cpp::numeric_limits<int>::max();
-  int result = call_vfprintf(file, "%*sA", max_int, "");
-
-  EXPECT_LT(result, 0);
-  ASSERT_ERRNO_EQ(EOVERFLOW);
-
-  EXPECT_EQ(printf_test::fclose(file), 0);
-}
-#endif // !defined(LIBC_COPT_STDIO_USE_SYSTEM_FILE) &&
-       // defined(LIBC_TARGET_OS_IS_LINUX)