boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-17 14:22:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge ICU testing fixes from Trunk.

Browse Source 
Authorized by Daniel James.

[SVN r72846]
This commit is contained in:
John Maddock
2011-07-02 08:59:55 +00:00
parent bad2122f48
commit 490b3a6547
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/regress/main.cpp
View File

@ -20,6 +20,10 @@
#include "test_locale.hpp" #include "test_locale.hpp"
#include <stdarg.h> #include <stdarg.h>
#ifdef BOOST_HAS_ICU
#include <unicode/uloc.h>
#endif
#ifdef TEST_THREADS #ifdef TEST_THREADS
#include <list> #include <list>
#include <boost/thread.hpp> #include <boost/thread.hpp>
@ -82,6 +86,19 @@ void run_tests()
int cpp_main(int /*argc*/, char * /*argv*/[]) int cpp_main(int /*argc*/, char * /*argv*/[])
{ {
#ifdef BOOST_HAS_ICU
//
// We need to set the default locale used by ICU,
// otherwise some of our tests using equivalence classes fail.
//
UErrorCode err = U_ZERO_ERROR;
uloc_setDefault("en", &err);
if(err != U_ZERO_ERROR)
{
std::cerr << "Unable to set the default ICU locale to \"en\"." << std::endl;
return -1;
}
#endif
#ifdef TEST_THREADS #ifdef TEST_THREADS
try{ try{
get_array_data(); // initialises data. get_array_data(); // initialises data.

4
test/regress/test_unicode.cpp
View File

@ -75,8 +75,8 @@ void test_unicode()
TEST_REGEX_CLASS_U(Non-Spacing Mark, 20EA); TEST_REGEX_CLASS_U(Non-Spacing Mark, 20EA);
TEST_REGEX_CLASS_U(Mc, 1938); TEST_REGEX_CLASS_U(Mc, 1938);
TEST_REGEX_CLASS_U(Spacing Combining Mark, 1938); TEST_REGEX_CLASS_U(Spacing Combining Mark, 1938);
TEST_REGEX_CLASS_U(Me, 06DE); TEST_REGEX_CLASS_U(Me, 0488);
TEST_REGEX_CLASS_U(Enclosing Mark, 06DE); TEST_REGEX_CLASS_U(Enclosing Mark, 0488);
TEST_REGEX_CLASS_U(N*, 0669); TEST_REGEX_CLASS_U(N*, 0669);
TEST_REGEX_CLASS_U(Number, 0669); TEST_REGEX_CLASS_U(Number, 0669);
TEST_REGEX_CLASS_U(Nd, 0669); TEST_REGEX_CLASS_U(Nd, 0669);