From abc145a322be89c774fdcae8c883685d7943028a Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Thu, 19 Aug 2004 10:30:05 +0000 Subject: [PATCH] 1.cc: Add VERIFY on the results. 2004-08-19 Paolo Carlini * testsuite/22_locale/time_put/put/char/1.cc: Add VERIFY on the results. * testsuite/22_locale/time_put/put/char/2.cc: Likewise. * testsuite/22_locale/time_put/put/char/3.cc: Likewise. * testsuite/22_locale/time_put/put/char/4.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/1.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/2.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/3.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/4.cc: Likewise. From-SVN: r86246 --- libstdc++-v3/ChangeLog | 12 ++++++++++++ .../testsuite/22_locale/time_put/put/char/1.cc | 7 +++++++ .../testsuite/22_locale/time_put/put/char/2.cc | 7 +++++++ .../testsuite/22_locale/time_put/put/char/3.cc | 11 +++++++++-- .../testsuite/22_locale/time_put/put/char/4.cc | 7 +++++++ .../testsuite/22_locale/time_put/put/wchar_t/1.cc | 7 +++++++ .../testsuite/22_locale/time_put/put/wchar_t/2.cc | 7 +++++++ .../testsuite/22_locale/time_put/put/wchar_t/3.cc | 11 +++++++++-- .../testsuite/22_locale/time_put/put/wchar_t/4.cc | 7 +++++++ 9 files changed, 72 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 579bf095e30..e934d3bd88c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,15 @@ +2004-08-19 Paolo Carlini + + * testsuite/22_locale/time_put/put/char/1.cc: Add VERIFY on the + results. + * testsuite/22_locale/time_put/put/char/2.cc: Likewise. + * testsuite/22_locale/time_put/put/char/3.cc: Likewise. + * testsuite/22_locale/time_put/put/char/4.cc: Likewise. + * testsuite/22_locale/time_put/put/wchar_t/1.cc: Likewise. + * testsuite/22_locale/time_put/put/wchar_t/2.cc: Likewise. + * testsuite/22_locale/time_put/put/wchar_t/3.cc: Likewise. + * testsuite/22_locale/time_put/put/wchar_t/4.cc: Likewise. + 2004-08-19 Paolo Carlini * config/abi/x86_64-linux-gnu/baseline_symbols.txt: Update to 3.4.0. diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/1.cc index a1785440128..2fe95341605 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/1.cc @@ -55,15 +55,22 @@ void test01() oss.str(empty); iterator_type os_it21 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x'); string result21 = oss.str(); // "04/04/71" + VERIFY( result21 == "04/04/71" ); + oss.str(empty); iterator_type os_it22 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X'); string result22 = oss.str(); // "12:00:00" + VERIFY( result22 == "12:00:00" ); + oss.str(empty); iterator_type os_it31 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x', 'E'); string result31 = oss.str(); // "04/04/71" + VERIFY( result31 == "04/04/71" ); + oss.str(empty); iterator_type os_it32 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X', 'E'); string result32 = oss.str(); // "12:00:00" + VERIFY( result32 == "12:00:00" ); } int main() diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/2.cc index d7dad7feedb..004bea81fff 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/2.cc @@ -52,15 +52,22 @@ void test02() oss.str(empty); // "%d.%m.%Y" iterator_type os_it23 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x'); string result23 = oss.str(); // "04.04.1971" + VERIFY( result23 == "04.04.1971" ); + oss.str(empty); // "%T" iterator_type os_it24 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X'); string result24 = oss.str(); // "12:00:00" + VERIFY( result24 == "12:00:00" ); + oss.str(empty); iterator_type os_it33 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x', 'E'); string result33 = oss.str(); // "04.04.1971" + VERIFY( result33 == "04.04.1971" ); + oss.str(empty); iterator_type os_it34 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X', 'E'); string result34 = oss.str(); // "12:00:00" + VERIFY( result34 == "12:00:00" ); } int main() diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc index 8124107499d..3a46e83995d 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc @@ -52,15 +52,22 @@ void test03() oss.str(empty); // "%A, %B %d, %Y" iterator_type os_it25 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x'); string result25 = oss.str(); // "Sunday, April 04, 1971" + VERIFY( result25 == "Sunday, April 04, 1971" ); + oss.str(empty); // "%I:%M:%S %Z" iterator_type os_it26 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X'); - string result26 = oss.str(); // "12:00:00 PST" + string result26 = oss.str(); // "12:00:00 CET" + VERIFY( result26 == "12:00:00 CET" ); + oss.str(empty); iterator_type os_it35 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x', 'E'); string result35 = oss.str(); // "Sunday, April 04, 1971" + VERIFY( result35 == "Sunday, April 04, 1971" ); + oss.str(empty); iterator_type os_it36 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X', 'E'); - string result36 = oss.str(); // "12:00:00 PST" + string result36 = oss.str(); // "12:00:00 CET" + VERIFY( result36 == "12:00:00 CET" ); } int main() diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc index 7640fc0ed7d..95f922cb2f1 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc @@ -51,15 +51,22 @@ void test04() oss.str(empty); // "%d.%m.%Y" iterator_type os_it27 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x'); string result27 = oss.str(); // "04.04.1971" + VERIFY( result27 == "04.04.1971" ); + oss.str(empty); // "%T" iterator_type os_it28 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X'); string result28 = oss.str(); // "12:00:00" + VERIFY( result28 == "12:00:00" ); + oss.str(empty); iterator_type os_it37 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x', 'E'); string result37 = oss.str(); // "04.04.1971" + VERIFY( result37 == "04.04.1971" ); + oss.str(empty); iterator_type os_it38 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X', 'E'); string result38 = oss.str(); // "12:00:00" + VERIFY( result38 == "12:00:00" ); } int main() diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/1.cc index e9a9e8580d8..549945447e3 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/1.cc @@ -55,15 +55,22 @@ void test01() oss.str(empty); iterator_type os_it21 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x'); wstring result21 = oss.str(); // "04/04/71" + VERIFY( result21 == L"04/04/71" ); + oss.str(empty); iterator_type os_it22 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X'); wstring result22 = oss.str(); // "12:00:00" + VERIFY( result22 == L"12:00:00" ); + oss.str(empty); iterator_type os_it31 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x', 'E'); wstring result31 = oss.str(); // "04/04/71" + VERIFY( result31 == L"04/04/71" ); + oss.str(empty); iterator_type os_it32 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X', 'E'); wstring result32 = oss.str(); // "12:00:00" + VERIFY( result32 == L"12:00:00" ); } int main() diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/2.cc index a4a696892d7..2250127379a 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/2.cc @@ -52,15 +52,22 @@ void test02() oss.str(empty); // "%d.%m.%Y" iterator_type os_it23 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x'); wstring result23 = oss.str(); // "04.04.1971" + VERIFY( result23 == L"04.04.1971" ); + oss.str(empty); // "%T" iterator_type os_it24 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X'); wstring result24 = oss.str(); // "12:00:00" + VERIFY( result24 == L"12:00:00" ); + oss.str(empty); iterator_type os_it33 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x', 'E'); wstring result33 = oss.str(); // "04.04.1971" + VERIFY( result33 == L"04.04.1971" ); + oss.str(empty); iterator_type os_it34 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X', 'E'); wstring result34 = oss.str(); // "12:00:00" + VERIFY( result34 == L"12:00:00" ); } int main() diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc index a95248ed327..72c702c5fb6 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc @@ -52,15 +52,22 @@ void test03() oss.str(empty); // "%A, %B %d, %Y" iterator_type os_it25 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x'); wstring result25 = oss.str(); // "Sunday, April 04, 1971" + VERIFY( result25 == L"Sunday, April 04, 1971" ); + oss.str(empty); // "%I:%M:%S %Z" iterator_type os_it26 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X'); - wstring result26 = oss.str(); // "12:00:00 PST" + wstring result26 = oss.str(); // "12:00:00 CET" + VERIFY( result26 == L"12:00:00 CET" ); + oss.str(empty); iterator_type os_it35 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x', 'E'); wstring result35 = oss.str(); // "Sunday, April 04, 1971" + VERIFY( result35 == L"Sunday, April 04, 1971" ); + oss.str(empty); iterator_type os_it36 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X', 'E'); - wstring result36 = oss.str(); // "12:00:00 PST" + wstring result36 = oss.str(); // "12:00:00 CET" + VERIFY( result36 == L"12:00:00 CET" ); } int main() diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc index 84bd7756429..aec5c0a6eb6 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc @@ -51,15 +51,22 @@ void test04() oss.str(empty); // "%d.%m.%Y" iterator_type os_it27 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x'); wstring result27 = oss.str(); // "04.04.1971" + VERIFY( result27 == L"04.04.1971" ); + oss.str(empty); // "%T" iterator_type os_it28 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X'); wstring result28 = oss.str(); // "12:00:00" + VERIFY( result28 == L"12:00:00" ); + oss.str(empty); iterator_type os_it37 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x', 'E'); wstring result37 = oss.str(); // "04.04.1971" + VERIFY( result37 == L"04.04.1971" ); + oss.str(empty); iterator_type os_it38 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X', 'E'); wstring result38 = oss.str(); // "12:00:00" + VERIFY( result38 == L"12:00:00" ); } int main() -- 2.30.2