procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Fix std::print test case for Windows

Browse source 
libstdc++-v3/ChangeLog:

	* src/c++23/print.cc (__write_to_terminal) [_WIN32]: If handle
	does not refer to the console then just write to it using normal
	file I/O.
	* testsuite/27_io/print/2.cc (as_printed_to_terminal): Print
	error message on failure.
	(test_utf16_transcoding): Adjust for as_printed_to_terminal
	modifying its argument.
This commit is contained in:
Jonathan Wakely 2023-12-15 12:58:37 +00:00
parent 7d2e100058
commit 1d8ac2a74f
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libstdc++-v3/src/c++23/print.cc
View file

@ -35,7 +35,8 @@
#ifdef _WIN32
# include <stdio.h> // _fileno
# include <io.h> // _get_osfhandle
# include <io.h> // _get_osfhandle, _open_osfhandle, _write
# include <fcntl.h> // _O_APPEND
# include <windows.h> // GetLastError, WriteConsoleW
#elifdef _GLIBCXX_HAVE_UNISTD_H
# include <stdio.h> // fileno
@ -324,6 +325,16 @@ namespace
if (!to_valid_utf16(str, wstr))
ec = std::make_error_code(errc::illegal_byte_sequence);
// This allows us to test this function with a normal file,
// see testsuite/27_io/print/2.cc
if (!check_for_console(term))
{
int fd = _open_osfhandle((intptr_t)term, _O_APPEND);
if (_write(fd, wstr.data(), wstr.size() * 2) == -1)
ec = {errno, generic_category()};
return ec;
}
unsigned long nchars = 0;
WriteConsoleW(term, wstr.data(), wstr.size(), &nchars, nullptr);
if (nchars != wstr.size())

7
libstdc++-v3/testsuite/27_io/print/2.cc
View file

@ -39,7 +39,11 @@ as_printed_to_terminal(std::string& s)
#else
const auto ec = std::__write_to_terminal(strm, s);
#endif
VERIFY( !ec || ec == std::make_error_code(std::errc::illegal_byte_sequence) );
if (ec && ec != std::make_error_code(std::errc::illegal_byte_sequence))
{
std::println("Failed to : {}", ec.message());
VERIFY(!ec);
}
std::fclose(strm);
std::ifstream in(f.path);
s.assign(std::istreambuf_iterator<char>(in), {});
@ -114,6 +118,7 @@ test_utf16_transcoding()
VERIFY( as_printed_to_terminal(s) );
VERIFY( utf16_from_bytes(s) == s2 );
s = (const char*)u8"£🇬🇧 €🇪🇺";
s += " \xa3 10.99 \xee\xdd";
VERIFY( ! as_printed_to_terminal(s) );
std::u16string repl = u"\uFFFD";