aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@suse.de>2003-11-29 17:42:16 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2003-11-29 17:42:16 +0000
commit2d25605a546af33df11715eff5cc16393c0b2257 (patch)
tree4205618e8b5db46e1ce8ecdaf3b5d4d043b26e06
parent26b0ad130a5795cd760d22e27d16d14d4579a77e (diff)
downloadgcc-2d25605a546af33df11715eff5cc16393c0b2257.zip
gcc-2d25605a546af33df11715eff5cc16393c0b2257.tar.gz
gcc-2d25605a546af33df11715eff5cc16393c0b2257.tar.bz2
13171-2.cc: Tweak for a few small problems (fix timings, use VERIFY..)
2003-11-29 Paolo Carlini <pcarlini@suse.de> * testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc: Tweak for a few small problems (fix timings, use VERIFY..) From-SVN: r74034
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc18
2 files changed, 17 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 31a4765..5e7d21f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-29 Paolo Carlini <pcarlini@suse.de>
+
+ * testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc:
+ Tweak for a few small problems (fix timings, use VERIFY..)
+
2003-11-28 Paolo Carlini <pcarlini@suse.de>
* testsuite/27_io/basic_filebuf/imbue/char/13171-3.cc: Remove.
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc
index 65190ad..74aa1fc 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc
@@ -20,7 +20,6 @@
#include <fstream>
#include <locale>
-#include <cassert>
#include <sys/types.h>
#include <sys/stat.h>
@@ -33,6 +32,9 @@ void test01()
bool test __attribute__((unused)) = true;
using namespace std;
+ locale loc_fr(__gnu_test::try_named_locale("fr_FR"));
+ locale loc_en(__gnu_test::try_named_locale("en_US"));
+
const char* name = "tmp_fifo_13171-2";
unlink(name);
mkfifo(name, S_IRWXU);
@@ -43,21 +45,25 @@ void test01()
filebuf fb;
fb.open(name, ios_base::out);
fb.sputc('S');
+ fb.pubsync();
+ sleep(2);
fb.close();
- return;
+ exit(0);
}
filebuf fb;
- fb.pubimbue(__gnu_test::try_named_locale("fr_FR"));
+ fb.pubimbue(loc_fr);
fb.open(name, ios_base::in);
- assert(fb.is_open());
- fb.pubimbue(__gnu_test::try_named_locale("en_US"));
+ sleep(1);
+ VERIFY( fb.is_open() );
+ fb.pubimbue(loc_en);
filebuf::int_type c = fb.sgetc();
- assert(c == 'S');
fb.close();
+ VERIFY( c == 'S' );
}
int main()
{
test01();
+ return 0;
}