Commit 27b4d95a by Paolo Carlini Committed by Paolo Carlini

2002-05-13 Paolo Carlini <pcarlini@unitus.it>

	* testsuite/22_locale/codecvt_members_char_char.cc
	(test03): Robustify wrt localedata.
	* testsuite/22_locale/codecvt_members_wchar_t_char.cc (test03): Likewise.
	* testsuite/22_locale/collate_members_char.cc (test04): Likewise.
	* testsuite/22_locale/collate_members_wchar_t.cc (test04): Likewise.
	* testsuite/22_locale/ctype_members_char.cc (test05): Likewise.
	* testsuite/22_locale/ctype_members_wchar_t.cc (test04): Likewise.
	* testsuite/22_locale/messages_members_char.cc (test03): Likewise.
	* testsuite/22_locale/money_get_members_char.cc (test08): Likewise.
	* testsuite/22_locale/money_get_members_wchar_t.cc (test08): Likewise.
	* testsuite/22_locale/money_put_members_char.cc (test07): Likewise.
	* testsuite/22_locale/money_put_members_wchar_t.cc (test07): Likewise.
	* testsuite/22_locale/moneypunct_members_char.cc (test03): Likewise.
	* testsuite/22_locale/moneypunct_members_wchar_t.cc (test03): Likewise.
	* testsuite/22_locale/num_get_members_char.cc (test06): Likewise.
	* testsuite/22_locale/num_get_members_wchar_t.cc (test06): Likewise.
	* testsuite/22_locale/num_put_members_char.cc (test04): Add comment.
	* testsuite/22_locale/num_put_members_wchar_t.cc (test04): Likewise.
	* testsuite/22_locale/numpunct_members_char.cc (test03): Likewise.
	* testsuite/22_locale/numpunct_members_wchar_t.cc (test03): Likewise.
	* testsuite/22_locale/time_get_members_char.cc (test08): Likewise.
	* testsuite/22_locale/time_get_members_wchar_t.cc (test08): Likewise.
	* testsuite/22_locale/time_put_members_char.cc (test04): Likewise.
	* testsuite/22_locale/time_put_members_wchar_t.cc (test04): Likewise.

From-SVN: r53419
parent 8dfea428
2002-05-13 Paolo Carlini <pcarlini@unitus.it>
* testsuite/22_locale/codecvt_members_char_char.cc
(test03): Robustify wrt localedata.
* testsuite/22_locale/codecvt_members_wchar_t_char.cc (test03): Likewise.
* testsuite/22_locale/collate_members_char.cc (test04): Likewise.
* testsuite/22_locale/collate_members_wchar_t.cc (test04): Likewise.
* testsuite/22_locale/ctype_members_char.cc (test05): Likewise.
* testsuite/22_locale/ctype_members_wchar_t.cc (test04): Likewise.
* testsuite/22_locale/messages_members_char.cc (test03): Likewise.
* testsuite/22_locale/money_get_members_char.cc (test08): Likewise.
* testsuite/22_locale/money_get_members_wchar_t.cc (test08): Likewise.
* testsuite/22_locale/money_put_members_char.cc (test07): Likewise.
* testsuite/22_locale/money_put_members_wchar_t.cc (test07): Likewise.
* testsuite/22_locale/moneypunct_members_char.cc (test03): Likewise.
* testsuite/22_locale/moneypunct_members_wchar_t.cc (test03): Likewise.
* testsuite/22_locale/num_get_members_char.cc (test06): Likewise.
* testsuite/22_locale/num_get_members_wchar_t.cc (test06): Likewise.
* testsuite/22_locale/num_put_members_char.cc (test04): Add comment.
* testsuite/22_locale/num_put_members_wchar_t.cc (test04): Likewise.
* testsuite/22_locale/numpunct_members_char.cc (test03): Likewise.
* testsuite/22_locale/numpunct_members_wchar_t.cc (test03): Likewise.
* testsuite/22_locale/time_get_members_char.cc (test08): Likewise.
* testsuite/22_locale/time_get_members_wchar_t.cc (test08): Likewise.
* testsuite/22_locale/time_put_members_char.cc (test04): Likewise.
* testsuite/22_locale/time_put_members_wchar_t.cc (test04): Likewise.
2002-05-12 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> 2002-05-12 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* config/os/irix/irix5.2/bits/os_defines.h: Revert 2002-05-06 * config/os/irix/irix5.2/bits/os_defines.h: Revert 2002-05-06
......
...@@ -102,10 +102,14 @@ void test03() ...@@ -102,10 +102,14 @@ void test03()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
std::string loc2 = setlocale(LC_ALL, NULL); {
VERIFY( loc1 == loc2 ); std::string preLANG = tentLANG;
test01();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
int main () int main ()
......
...@@ -134,10 +134,14 @@ void test03() ...@@ -134,10 +134,14 @@ void test03()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
std::string loc2 = setlocale(LC_ALL, NULL); {
VERIFY( loc1 == loc2 ); std::string preLANG = tentLANG;
test01();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
#endif /* !defined(_GLIBCPP_USE_WCHAR_T) */ #endif /* !defined(_GLIBCPP_USE_WCHAR_T) */
......
...@@ -166,11 +166,15 @@ void test04() ...@@ -166,11 +166,15 @@ void test04()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
test03(); {
std::string loc2 = setlocale(LC_ALL, NULL); std::string preLANG = tentLANG;
VERIFY( loc1 == loc2 ); test01();
test03();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
int main() int main()
......
...@@ -166,11 +166,15 @@ void test04() ...@@ -166,11 +166,15 @@ void test04()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
test03(); {
std::string loc2 = setlocale(LC_ALL, NULL); std::string preLANG = tentLANG;
VERIFY( loc1 == loc2 ); test01();
test03();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
#endif #endif
......
...@@ -285,12 +285,16 @@ void test05() ...@@ -285,12 +285,16 @@ void test05()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
test02(); {
test03(); std::string preLANG = tentLANG;
std::string loc2 = setlocale(LC_ALL, NULL); test01();
VERIFY( loc1 == loc2 ); test02();
test03();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
int main() int main()
......
...@@ -120,10 +120,14 @@ void test04() ...@@ -120,10 +120,14 @@ void test04()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
std::string loc2 = setlocale(LC_ALL, NULL); {
VERIFY( loc1 == loc2 ); std::string preLANG = tentLANG;
test01();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
#endif /* !defined(_GLIBCPP_USE_WCHAR_T) */ #endif /* !defined(_GLIBCPP_USE_WCHAR_T) */
......
...@@ -104,10 +104,14 @@ void test03() ...@@ -104,10 +104,14 @@ void test03()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
std::string loc2 = setlocale(LC_ALL, NULL); {
VERIFY( loc1 == loc2 ); std::string preLANG = tentLANG;
test01();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
int main() int main()
......
...@@ -551,15 +551,19 @@ void test08() ...@@ -551,15 +551,19 @@ void test08()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
test02(); {
test03(); std::string preLANG = tentLANG;
test05(); test01();
test06(); test02();
test07(); test03();
std::string loc2 = setlocale(LC_ALL, NULL); test05();
VERIFY( loc1 == loc2 ); test06();
test07();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
int main() int main()
......
...@@ -552,15 +552,19 @@ void test08() ...@@ -552,15 +552,19 @@ void test08()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
test02(); {
test03(); std::string preLANG = tentLANG;
test05(); test01();
test06(); test02();
test07(); test03();
std::string loc2 = setlocale(LC_ALL, NULL); test05();
VERIFY( loc1 == loc2 ); test06();
test07();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
#endif #endif
......
...@@ -373,14 +373,18 @@ void test07() ...@@ -373,14 +373,18 @@ void test07()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
test02(); {
test03(); std::string preLANG = tentLANG;
test05(); test01();
test06(); test02();
std::string loc2 = setlocale(LC_ALL, NULL); test03();
VERIFY( loc1 == loc2 ); test05();
test06();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
int main() int main()
......
...@@ -373,14 +373,18 @@ void test07() ...@@ -373,14 +373,18 @@ void test07()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
test02(); {
test03(); std::string preLANG = tentLANG;
test05(); test01();
test06(); test02();
std::string loc2 = setlocale(LC_ALL, NULL); test03();
VERIFY( loc1 == loc2 ); test05();
test06();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
#endif #endif
......
...@@ -128,10 +128,14 @@ void test03() ...@@ -128,10 +128,14 @@ void test03()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
std::string loc2 = setlocale(LC_ALL, NULL); {
VERIFY( loc1 == loc2 ); std::string preLANG = tentLANG;
test01();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
int main() int main()
......
...@@ -129,10 +129,14 @@ void test03() ...@@ -129,10 +129,14 @@ void test03()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
std::string loc2 = setlocale(LC_ALL, NULL); {
VERIFY( loc1 == loc2 ); std::string preLANG = tentLANG;
test01();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
#endif #endif
......
...@@ -418,13 +418,17 @@ void test06() ...@@ -418,13 +418,17 @@ void test06()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
test02(); {
test04(); std::string preLANG = tentLANG;
test05(); test01();
std::string loc2 = setlocale(LC_ALL, NULL); test02();
VERIFY( loc1 == loc2 ); test04();
test05();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
int main() int main()
......
...@@ -420,13 +420,17 @@ void test06() ...@@ -420,13 +420,17 @@ void test06()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
test02(); {
test04(); std::string preLANG = tentLANG;
test05(); test01();
std::string loc2 = setlocale(LC_ALL, NULL); test02();
VERIFY( loc1 == loc2 ); test04();
test05();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
#endif #endif
......
...@@ -315,11 +315,15 @@ void test04() ...@@ -315,11 +315,15 @@ void test04()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
test02(); {
std::string loc2 = setlocale(LC_ALL, NULL); std::string preLANG = tentLANG;
VERIFY( loc1 == loc2 ); test01();
test02();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
int main() int main()
......
...@@ -315,11 +315,15 @@ void test04() ...@@ -315,11 +315,15 @@ void test04()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
test02(); {
std::string loc2 = setlocale(LC_ALL, NULL); std::string preLANG = tentLANG;
VERIFY( loc1 == loc2 ); test01();
test02();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
#endif #endif
......
...@@ -106,10 +106,14 @@ void test03() ...@@ -106,10 +106,14 @@ void test03()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
std::string loc2 = setlocale(LC_ALL, NULL); {
VERIFY( loc1 == loc2 ); std::string preLANG = tentLANG;
test01();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
int main() int main()
......
...@@ -104,10 +104,14 @@ void test03() ...@@ -104,10 +104,14 @@ void test03()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
std::string loc2 = setlocale(LC_ALL, NULL); {
VERIFY( loc1 == loc2 ); std::string preLANG = tentLANG;
test01();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
#endif #endif
......
...@@ -704,15 +704,19 @@ void test08() ...@@ -704,15 +704,19 @@ void test08()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
test02(); {
test03(); std::string preLANG = tentLANG;
test04(); test01();
test05(); test02();
test06(); test03();
std::string loc2 = setlocale(LC_ALL, NULL); test04();
VERIFY( loc1 == loc2 ); test05();
test06();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
int main() int main()
......
...@@ -704,15 +704,19 @@ void test08() ...@@ -704,15 +704,19 @@ void test08()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
test02(); {
test03(); std::string preLANG = tentLANG;
test04(); test01();
test05(); test02();
test06(); test03();
std::string loc2 = setlocale(LC_ALL, NULL); test04();
VERIFY( loc1 == loc2 ); test05();
test06();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
#endif #endif
......
...@@ -255,11 +255,15 @@ void test04() ...@@ -255,11 +255,15 @@ void test04()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
test02(); {
std::string loc2 = setlocale(LC_ALL, NULL); std::string preLANG = tentLANG;
VERIFY( loc1 == loc2 ); test01();
test02();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
int main() int main()
......
...@@ -257,11 +257,15 @@ void test04() ...@@ -257,11 +257,15 @@ void test04()
{ {
bool test = true; bool test = true;
std::string loc1 = setlocale(LC_ALL, "ja_JP.eucjp"); const char* tentLANG = setlocale(LC_ALL, "ja_JP.eucjp");
test01(); if (tentLANG != NULL)
test02(); {
std::string loc2 = setlocale(LC_ALL, NULL); std::string preLANG = tentLANG;
VERIFY( loc1 == loc2 ); test01();
test02();
std::string postLANG = setlocale(LC_ALL, NULL);
VERIFY( preLANG == postLANG );
}
} }
#endif #endif
......
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