diff options
| author | Paolo Carlini <pcarlini@unitus.it> | 2003-06-16 23:24:40 +0200 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2003-06-16 21:24:40 +0000 |
| commit | 8363b7738f923bff7a4ff0a58f2699fb3b40435d (patch) | |
| tree | cd37e494e2157085e240e24ad33b7f59999bd878 | |
| parent | b57b79f767ad7d4ff784a597494be221700333cc (diff) | |
| download | gcc-8363b7738f923bff7a4ff0a58f2699fb3b40435d.zip gcc-8363b7738f923bff7a4ff0a58f2699fb3b40435d.tar.gz gcc-8363b7738f923bff7a4ff0a58f2699fb3b40435d.tar.bz2 | |
1-in.cc: Fix for systems with BUFSIZ != 8192.
2003-06-16 Paolo Carlini <pcarlini@unitus.it>
* testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc: Fix
for systems with BUFSIZ != 8192.
* testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc: Ditto.
* testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc:
Minor tweaks.
From-SVN: r68041
4 files changed, 22 insertions, 9 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7b6f186..b9df740 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2003-06-16 Paolo Carlini <pcarlini@unitus.it> + + * testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc: Fix + for systems with BUFSIZ != 8192. + * testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc: Ditto. + * testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc: + Minor tweaks. + 2003-06-16 Andreas Jaeger <aj@suse.de> * acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE): Make diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc index 021a1c8..0f17624 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc @@ -37,12 +37,12 @@ void test05() typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; - bool test = true; + bool test = true; streamsize strmsz_1, strmsz_2, strmsz_3; - int i = 0, j = 0, k = 0; char carray1[13] = ""; char carray2[8192] = ""; + char buffer[8192] = ""; int_type c1, c2, c3, c4; // streamsize sgetn(char_type *s, streamsize n) @@ -52,7 +52,10 @@ void test05() // in { - constraint_filebuf fb_01; + constraint_filebuf fb_01; + // Need this since BUFSIZ is only guaranteed >= 255 and we want + // to trigger the same underflow situation everywhere. + fb_01.pubsetbuf(buffer, 8192); fb_01.open(name_01, ios_base::in); VERIFY( !fb_01.write_position() ); strmsz_1 = fb_01.in_avail(); // 8261 diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc index 432ed6c..ff2663e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc @@ -38,12 +38,12 @@ void test05() typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; - bool test = true; + bool test = true; streamsize strmsz_1, strmsz_2, strmsz_3; - int i = 0, j = 0, k = 0; char carray1[13] = ""; char carray2[8192] = ""; + char buffer[8192] = ""; int_type c1, c2, c3, c4; // streamsize sgetn(char_type *s, streamsize n) @@ -65,7 +65,10 @@ void test05() // in | out 2 { - constraint_filebuf fb_01; + constraint_filebuf fb_01; + // Need this since BUFSIZ is only guaranteed >= 255 and we want + // to trigger the same underflow situation everywhere. + fb_01.pubsetbuf(buffer, 8192); fb_01.open(name_01, ios_base::in | ios_base::out); VERIFY( fb_01.write_position() ); strmsz_1 = fb_01.in_avail(); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc index dcefe01..7bd5e37 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc @@ -37,10 +37,9 @@ void test05() typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; - bool test = true; + bool test = true; streamsize strmsz_1, strmsz_2, strmsz_3; - int i = 0, j = 0, k = 0; char carray1[13] = ""; char carray2[8192] = ""; int_type c1, c2, c3, c4; @@ -52,7 +51,7 @@ void test05() // out { - constraint_filebuf fb_02; + constraint_filebuf fb_02; fb_02.open(name_02, ios_base::out | ios_base::trunc); VERIFY( fb_02.write_position() ); VERIFY( !fb_02.read_position() ); |