From 94c298e2a0ae409e283cab96c954a685bd865a70 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Tue, 23 Oct 2018 18:09:41 -0700 Subject: Export of internal Abseil changes. -- 441d1aa02483cdc510eb2fef012b31384fd8e3a6 by Eric Fiselier : Fix str_format with non-POSIX libc implementations. PiperOrigin-RevId: 218441122 -- da6190130e74222af6eb161a5593364341370370 by Jon Cohen : Refactor ExceptionSafetyTester::Test in order to remove the levels of indirection related to unpacking tuples. PiperOrigin-RevId: 218403355 GitOrigin-RevId: 441d1aa02483cdc510eb2fef012b31384fd8e3a6 Change-Id: I6f6b978eb96fe261e8ee41ecdce185e5356a601d --- absl/strings/str_format_test.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'absl/strings/str_format_test.cc') diff --git a/absl/strings/str_format_test.cc b/absl/strings/str_format_test.cc index ea9a3a176612..87ed234fe825 100644 --- a/absl/strings/str_format_test.cc +++ b/absl/strings/str_format_test.cc @@ -242,6 +242,7 @@ class TempFile { std::string ReadFile() { std::fseek(file_, 0, SEEK_END); int size = std::ftell(file_); + EXPECT_GT(size, 0); std::rewind(file_); std::string str(2 * size, ' '); int read_bytes = std::fread(&str[0], 1, str.size(), file_); @@ -270,7 +271,7 @@ TEST_F(FormatEntryPointTest, FPrintFError) { EXPECT_EQ(errno, EBADF); } -#if __GNUC__ +#if __GLIBC__ TEST_F(FormatEntryPointTest, FprintfTooLarge) { std::FILE* f = std::fopen("/dev/null", "w"); int width = 2000000000; @@ -297,7 +298,7 @@ TEST_F(FormatEntryPointTest, PrintF) { EXPECT_EQ(result, 30); EXPECT_EQ(tmp.ReadFile(), "STRING: ABC NUMBER: -000000019"); } -#endif // __GNUC__ +#endif // __GLIBC__ TEST_F(FormatEntryPointTest, SNPrintF) { char buffer[16]; -- cgit 1.4.1