Skip to content

R
riscv-gcc-1
Commit 820d2ff7 by Paolo Carlini
Options

[multiple changes] 

2010-06-26  Paolo Carlini  <paolo.carlini@oracle.com>

	* testsuite/util/testsuite_hooks.h: Cast fn to bool.

2010-06-26  Kees Cook  <kees.cook@canonical.com>

	* testsuite/27_io/ios_base/sync_with_stdio/1.cc: Verify freopen.
	* testsuite/27_io/objects/wchar_t/9520.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/9661-1.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/12048-2.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/12048-4.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/11.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/12048-1.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/12048-3.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/10.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/12048-5.cc: Likewise.
	* testsuite/27_io/objects/char/9661-1.cc: Likewise.
	* testsuite/27_io/objects/char/12048-2.cc: Likewise.
	* testsuite/27_io/objects/char/12048-4.cc: Likewise.
	* testsuite/27_io/objects/char/9.cc: Likewise.
	* testsuite/27_io/objects/char/12048-1.cc: Likewise.
	* testsuite/27_io/objects/char/12048-3.cc: Likewise.
	* testsuite/27_io/objects/char/12048-5.cc: Likewise.
	* testsuite/ext/stdio_sync_filebuf/wchar_t/12077.cc: Likewise.
	* testsuite/27_io/basic_filebuf/setbuf/char/12875-2.cc: Verify fgets.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc: Verify
	fwrite.
	* testsuite/ext/stdio_sync_filebuf/wchar_t/1.cc: Likewise.
	* testsuite/ext/stdio_sync_filebuf/char/1.cc: Likewise.

From-SVN: r161441
parent 2639084e
Showing with 55 additions and 24 deletions
libstdc++-v3/ChangeLog
2010-06-26 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/util/testsuite_hooks.h: Cast fn to bool.
2010-06-26 Kees Cook <kees.cook@canonical.com>
* testsuite/27_io/ios_base/sync_with_stdio/1.cc: Verify freopen.
* testsuite/27_io/objects/wchar_t/9520.cc: Likewise.
* testsuite/27_io/objects/wchar_t/9661-1.cc: Likewise.
* testsuite/27_io/objects/wchar_t/12048-2.cc: Likewise.
* testsuite/27_io/objects/wchar_t/12048-4.cc: Likewise.
* testsuite/27_io/objects/wchar_t/11.cc: Likewise.
* testsuite/27_io/objects/wchar_t/12048-1.cc: Likewise.
* testsuite/27_io/objects/wchar_t/12048-3.cc: Likewise.
* testsuite/27_io/objects/wchar_t/10.cc: Likewise.
* testsuite/27_io/objects/wchar_t/12048-5.cc: Likewise.
* testsuite/27_io/objects/char/9661-1.cc: Likewise.
* testsuite/27_io/objects/char/12048-2.cc: Likewise.
* testsuite/27_io/objects/char/12048-4.cc: Likewise.
* testsuite/27_io/objects/char/9.cc: Likewise.
* testsuite/27_io/objects/char/12048-1.cc: Likewise.
* testsuite/27_io/objects/char/12048-3.cc: Likewise.
* testsuite/27_io/objects/char/12048-5.cc: Likewise.
* testsuite/ext/stdio_sync_filebuf/wchar_t/12077.cc: Likewise.
* testsuite/27_io/basic_filebuf/setbuf/char/12875-2.cc: Verify fgets.
* testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc: Verify
fwrite.
* testsuite/ext/stdio_sync_filebuf/wchar_t/1.cc: Likewise.
* testsuite/ext/stdio_sync_filebuf/char/1.cc: Likewise.
2010-06-26 Jonathan Wakely <jwakely.gcc@gmail.com> 2010-06-26 Jonathan Wakely <jwakely.gcc@gmail.com>
* doc/xml/faq.xml: Fix typo. * doc/xml/faq.xml: Fix typo.
......
libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/12875-2.cc
...@@ -44,7 +44,7 @@ void test02() ...@@ -44,7 +44,7 @@ void test02()
FILE* in = fopen(name, "r"); FILE* in = fopen(name, "r");
char str[256]; char str[256];
fgets(str, 256, in); VERIFY( fgets(str, 256, in) );
VERIFY( !strcmp(str, "Hello, world") ); VERIFY( !strcmp(str, "Hello, world") );
fclose(in); fclose(in);
} }
......
libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc
...@@ -161,7 +161,7 @@ void test02() ...@@ -161,7 +161,7 @@ void test02()
const char* name = "tmp_11544-2"; const char* name = "tmp_11544-2";
FILE* f = fopen(name, "w"); FILE* f = fopen(name, "w");
fwrite("aaaab", 1, 5, f); VERIFY( fwrite("aaaab", 1, 5, f) == 5 );
fclose(f); fclose(f);
wifstream in; wifstream in;
......
libstdc++-v3/testsuite/27_io/ios_base/sync_with_stdio/1.cc
...@@ -41,7 +41,7 @@ void ...@@ -41,7 +41,7 @@ void
test01() test01()
{ {
std::ios_base::sync_with_stdio(); std::ios_base::sync_with_stdio();
std::freopen("ios_base_members_static-1.txt", "w", stderr); VERIFY( std::freopen("ios_base_members_static-1.txt", "w", stderr) );
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
{ {
......
libstdc++-v3/testsuite/27_io/objects/char/12048-1.cc
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
void void
test01() test01()
{ {
std::freopen("cin_unget-1.txt", "r", stdin); VERIFY( std::freopen("cin_unget-1.txt", "r", stdin) );
char c1; char c1;
char c2; char c2;
......
libstdc++-v3/testsuite/27_io/objects/char/12048-2.cc
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
void void
test01() test01()
{ {
std::freopen("cin_unget-1.txt", "r", stdin); VERIFY( std::freopen("cin_unget-1.txt", "r", stdin) );
char c1; char c1;
int c2; int c2;
......
libstdc++-v3/testsuite/27_io/objects/char/12048-3.cc
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
void void
test01() test01()
{ {
std::freopen("cin_unget-1.txt", "r", stdin); VERIFY( std::freopen("cin_unget-1.txt", "r", stdin) );
char buf[2]; char buf[2];
VERIFY( std::cin.rdbuf()->sgetn(buf, 2) == 2 ); VERIFY( std::cin.rdbuf()->sgetn(buf, 2) == 2 );
......
libstdc++-v3/testsuite/27_io/objects/char/12048-4.cc
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
void void
test01() test01()
{ {
std::freopen("cin_unget-1.txt", "r", stdin); VERIFY( std::freopen("cin_unget-1.txt", "r", stdin) );
char buf[2]; char buf[2];
VERIFY( std::cin.rdbuf()->sgetn(buf, 2) == 2 ); VERIFY( std::cin.rdbuf()->sgetn(buf, 2) == 2 );
......
libstdc++-v3/testsuite/27_io/objects/char/12048-5.cc
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
void void
test01() test01()
{ {
std::freopen("cin_unget-1.txt", "r", stdin); VERIFY( std::freopen("cin_unget-1.txt", "r", stdin) );
char c1; char c1;
int c2; int c2;
......
libstdc++-v3/testsuite/27_io/objects/char/9.cc
...@@ -34,7 +34,7 @@ void test09() ...@@ -34,7 +34,7 @@ void test09()
fputs("abc\n", fout); fputs("abc\n", fout);
fclose(fout); fclose(fout);
freopen(name, "r", stdin); VERIFY( freopen(name, "r", stdin) );
// basic_streambuf::showmanyc returns 0. // basic_streambuf::showmanyc returns 0.
VERIFY( 0 == std::cin.rdbuf()->in_avail() ); VERIFY( 0 == std::cin.rdbuf()->in_avail() );
......
libstdc++-v3/testsuite/27_io/objects/char/9661-1.cc
...@@ -68,7 +68,7 @@ bool test01() ...@@ -68,7 +68,7 @@ bool test01()
exit(0); exit(0);
} }
freopen(name, "r", stdin); VERIFY( freopen(name, "r", stdin) );
s1.wait(); s1.wait();
int c1 = fgetc(stdin); int c1 = fgetc(stdin);
......
libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc
...@@ -95,7 +95,7 @@ void test10() ...@@ -95,7 +95,7 @@ void test10()
VERIFY( n == e_size ); VERIFY( n == e_size );
fclose(file); fclose(file);
freopen(name, "r", stdin); VERIFY( freopen(name, "r", stdin) );
wchar_t* wbuf = new wchar_t[i_size + 10]; wchar_t* wbuf = new wchar_t[i_size + 10];
wcin.read(wbuf, i_size + 10); wcin.read(wbuf, i_size + 10);
......
libstdc++-v3/testsuite/27_io/objects/wchar_t/11.cc
...@@ -90,7 +90,7 @@ void test11() ...@@ -90,7 +90,7 @@ void test11()
}; };
size_t i_size = wcslen(i_lit); size_t i_size = wcslen(i_lit);
freopen(name, "w", stdout); VERIFY( freopen(name, "w", stdout) );
wcout.write(i_lit, i_size); wcout.write(i_lit, i_size);
wcout.flush(); wcout.flush();
......
libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-1.cc
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
void void
test01() test01()
{ {
std::freopen("cin_unget-1.txt", "r", stdin); VERIFY( std::freopen("cin_unget-1.txt", "r", stdin) );
wchar_t c1; wchar_t c1;
wchar_t c2; wchar_t c2;
......
libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-2.cc
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
void void
test01() test01()
{ {
std::freopen("cin_unget-1.txt", "r", stdin); VERIFY( std::freopen("cin_unget-1.txt", "r", stdin) );
wchar_t c1; wchar_t c1;
std::wint_t c2; std::wint_t c2;
......
libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-3.cc
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
void void
test01() test01()
{ {
std::freopen("cin_unget-1.txt", "r", stdin); VERIFY( std::freopen("cin_unget-1.txt", "r", stdin) );
wchar_t buf[2]; wchar_t buf[2];
VERIFY( std::wcin.rdbuf()->sgetn(buf, 2) == 2 ); VERIFY( std::wcin.rdbuf()->sgetn(buf, 2) == 2 );
......
libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
void void
test01() test01()
{ {
std::freopen("cin_unget-1.txt", "r", stdin); VERIFY( std::freopen("cin_unget-1.txt", "r", stdin) );
wchar_t buf[2]; wchar_t buf[2];
VERIFY( std::wcin.rdbuf()->sgetn(buf, 2) == 2 ); VERIFY( std::wcin.rdbuf()->sgetn(buf, 2) == 2 );
......
libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-5.cc
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
void void
test01() test01()
{ {
std::freopen("cin_unget-1.txt", "r", stdin); VERIFY( std::freopen("cin_unget-1.txt", "r", stdin) );
wchar_t c1; wchar_t c1;
std::wint_t c2; std::wint_t c2;
......
libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc
...@@ -38,7 +38,7 @@ void test01() ...@@ -38,7 +38,7 @@ void test01()
locale loc (locale("de_DE.ISO-8859-15@euro")); locale loc (locale("de_DE.ISO-8859-15@euro"));
locale::global(loc); // Set locale for stdin locale::global(loc); // Set locale for stdin
freopen(name, "r", stdin); VERIFY( freopen(name, "r", stdin) );
wcin.imbue(loc); wcin.imbue(loc);
......
libstdc++-v3/testsuite/27_io/objects/wchar_t/9661-1.cc
...@@ -67,7 +67,7 @@ bool test01() ...@@ -67,7 +67,7 @@ bool test01()
exit(0); exit(0);
} }
freopen(name, "r", stdin); VERIFY( freopen(name, "r", stdin) );
s1.wait(); s1.wait();
wint_t c1 = fgetwc(stdin); wint_t c1 = fgetwc(stdin);
......
libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/1.cc
...@@ -33,7 +33,7 @@ void test01() ...@@ -33,7 +33,7 @@ void test01()
const char* name = "stdiobuf-1.txt"; const char* name = "stdiobuf-1.txt";
FILE* fout = fopen(name, "w"); FILE* fout = fopen(name, "w");
fwrite(c_lit, 1, size, fout); VERIFY( fwrite(c_lit, 1, size, fout) == size );
fclose(fout); fclose(fout);
FILE* fin = fopen(name, "r"); FILE* fin = fopen(name, "r");
......
libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/1.cc
...@@ -33,7 +33,7 @@ void test01() ...@@ -33,7 +33,7 @@ void test01()
const char* name = "stdiobuf-1.txt"; const char* name = "stdiobuf-1.txt";
FILE* fout = fopen(name, "w"); FILE* fout = fopen(name, "w");
fwrite(c_lit, 1, size, fout); VERIFY( fwrite(c_lit, 1, size, fout) == size );
fclose(fout); fclose(fout);
FILE* fin = fopen(name, "r"); FILE* fin = fopen(name, "r");
......
libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12077.cc
...@@ -64,7 +64,7 @@ void test01() ...@@ -64,7 +64,7 @@ void test01()
fputs(str, file); fputs(str, file);
fclose(file); fclose(file);
freopen(name, "r", stdin); VERIFY( freopen(name, "r", stdin) );
streamsize n = wcin.rdbuf()->in_avail(); streamsize n = wcin.rdbuf()->in_avail();
while (n--) while (n--)
......
libstdc++-v3/testsuite/util/testsuite_hooks.h
// -*- C++ -*- // -*- C++ -*-
// Utility subroutines for the C++ library testsuite. // Utility subroutines for the C++ library testsuite.
// //
// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 // Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
// 2009, 2010
// Free Software Foundation, Inc. // Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // This file is part of the GNU ISO C++ Library. This library is free
...@@ -59,7 +60,7 @@ ...@@ -59,7 +60,7 @@
# include <cassert> # include <cassert>
# define VERIFY(fn) assert(fn) # define VERIFY(fn) assert(fn)
#else #else
# define VERIFY(fn) test &= (fn) # define VERIFY(fn) test &= bool(fn)
#endif #endif
#ifdef _GLIBCXX_HAVE_UNISTD_H #ifdef _GLIBCXX_HAVE_UNISTD_H
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment