organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues1 Projects Releases Wiki Activity Actions3

ICU-743 data rearrangement. So tests can find their data

Browse source 
X-SVN-Rev: 3102
This commit is contained in:
Steven R. Loomis 2000-12-03 04:07:13 +00:00
parent 3fc1459fd7
commit d6cf07794e
6 changed files with 15 additions and 10645 deletions

10617
icu4c/data/UnicodeData-3.0.0.txt
View file

File diff suppressed because it is too large Load diff

4
icu4c/data/resfiles.mk
View file

@ -93,9 +93,7 @@ uk.txt uk_UA.txt\
vi.txt vi_VN.txt\
zh.txt zh_CN.txt zh_HK.txt zh_SG.txt zh_TW.txt
# sv_FI_AL.txt\
TRANSLIT_SOURCE = fullhalf.txt translit_index.txt kana.txt kbdescl1.txt\
TRANSLIT_SOURCE=fullhalf.txt translit_index.txt kana.txt kbdescl1.txt\
larabic.txt lcyril.txt ldevan.txt\
lgreek.txt lhebrew.txt ljamo.txt\
lkana.txt quotes.txt ucname.txt

4
icu4c/source/data/locales/resfiles.mk
View file

@ -93,9 +93,7 @@ uk.txt uk_UA.txt\
vi.txt vi_VN.txt\
zh.txt zh_CN.txt zh_HK.txt zh_SG.txt zh_TW.txt
# sv_FI_AL.txt\
TRANSLIT_SOURCE = fullhalf.txt translit_index.txt kana.txt kbdescl1.txt\
TRANSLIT_SOURCE=fullhalf.txt translit_index.txt kana.txt kbdescl1.txt\
larabic.txt lcyril.txt ldevan.txt\
lgreek.txt lhebrew.txt ljamo.txt\
lkana.txt quotes.txt ucname.txt

9
icu4c/source/test/cintltst/cintltst.c
View file

@ -121,13 +121,11 @@ ctest_pathnameInContext( char* fullname, int32_t maxsize, const char* relPath )
#if defined(_WIN32) || defined(WIN32) || defined(__OS2__) || defined(OS2)
/* This should always be u_getDataDirectory().
* getenv should not be used
*/
/*mainDir = getenv("ICU_DATA");*/
mainDir= u_getDataDirectory();
if(mainDir!=NULL) {
strcpy(mainDirBuffer, mainDir);
strcat(mainDirBuffer, "..\\..");
strcat(mainDirBuffer, "..");
} else {
mainDirBuffer[0]='\0';
}
@ -170,11 +168,8 @@ ctest_getTestDirectory()
{
if (_testDirectory == NULL)
{
#if defined(_AIX) || defined(U_SOLARIS) || defined(U_LINUX) || defined(HPUX) || defined(POSIX) || defined(OS390)
/* always relative to icu/source/data/.. */
ctest_setTestDirectory("test|testdata|");
#else
ctest_setTestDirectory("icu|source|test|testdata|");
#endif
}
return _testDirectory;
}

12
icu4c/source/test/cintltst/crestst.c
View file

@ -180,14 +180,11 @@ void TestConstruction1()
const char* locale="te_IN";
char testdatapath[256];
directory= ctest_getTestDirectory();
directory= u_getDataDirectory();
uprv_strcpy(testdatapath, directory);
uprv_strcat(testdatapath, "testdata");
log_verbose("Testing ures_open()......\n");
/*
test1=ures_open("c:\\icu\\icu\\source\\test\\testdata\\testdata", NULL, &err);
test2=ures_open("c:\\icu\\icu\\source\\test\\testdata\\testdata", locale, &err);
*/
test1=ures_open(testdatapath, NULL, &err);
test2=ures_open(testdatapath, locale, &err);
@ -232,11 +229,10 @@ void TestConstruction2()
wchar_t widedirectory[256];
char testdatapath[256];
directory= ctest_getTestDirectory();
directory= u_getDataDirectory();
uprv_strcpy(testdatapath, directory);
uprv_strcat(testdatapath, "testdata");
mbstowcs(widedirectory, testdatapath, 256);
/*mbstowcs(widedirectory, "c:\\icu\\icu\\source\\test\\testdata\\testdata", 256);*/
log_verbose("Testing ures_openW().......\n");
@ -315,7 +311,7 @@ UBool testTag(const char* frag,
int32_t index = 0;
char testdatapath[256];
const char* directory = ctest_getTestDirectory();
const char *directory= u_getDataDirectory();
uprv_strcpy(testdatapath, directory);
uprv_strcat(testdatapath, "testdata");

14
icu4c/source/test/cintltst/creststn.c
View file

@ -197,7 +197,7 @@ static void TestNewTypes() {
UResourceBundle* theBundle = NULL;
char action[256];
char testdatapath[256];
const char* directory = ctest_getTestDirectory();
const char *directory= u_getDataDirectory();
UErrorCode status = U_ZERO_ERROR;
UResourceBundle* res = NULL;
uint8_t *binResult = NULL;
@ -277,7 +277,7 @@ static void TestBinaryCollationData(){
int32_t len=0;
char* action="testing the binary collaton data";
directory= ctest_getTestDirectory();
directory= u_getDataDirectory();
uprv_strcpy(testdatapath, directory);
uprv_strcat(testdatapath, "testdata");
@ -328,7 +328,7 @@ static void TestAPI() {
UResourceBundle *teRes = NULL;
UResourceBundle *teFillin=NULL;
UResourceBundle *teFillin2=NULL;
directory= ctest_getTestDirectory();
directory= u_getDataDirectory();
uprv_strcpy(testdatapath, directory);
uprv_strcat(testdatapath, "testdata");
u_charsToUChars(testdatapath, utestdatapath, strlen(testdatapath)+1);
@ -426,7 +426,7 @@ static void TestErrorConditions(){
UResourceBundle *teFillin2=NULL;
uint8_t *binResult = NULL;
directory= ctest_getTestDirectory();
directory= u_getDataDirectory();
uprv_strcpy(testdatapath, directory);
uprv_strcat(testdatapath, "testdata");
u_uastrcpy(utestdatapath, testdatapath);
@ -658,7 +658,7 @@ static void TestConstruction1()
U_STRING_INIT(te_inVal, "TE_IN", 5);
directory= ctest_getTestDirectory();
directory= u_getDataDirectory();
uprv_strcpy(testdatapath, directory);
uprv_strcat(testdatapath, "testdata");
log_verbose("Testing ures_open()......\n");
@ -716,7 +716,7 @@ static void TestConstruction2()
char testdatapath[256];
int32_t len=0;
directory= ctest_getTestDirectory();
directory= u_getDataDirectory();
uprv_strcpy(testdatapath, directory);
uprv_strcat(testdatapath, "testdata");
mbstowcs(widedirectory, testdatapath, 256);
@ -794,7 +794,7 @@ static UBool testTag(const char* frag,
UResourceBundle* tags=NULL;
UResourceBundle* arrayItem1=NULL;
const char* directory = ctest_getTestDirectory();
const char* directory = u_getDataDirectory();
uprv_strcpy(testdatapath, directory);
uprv_strcat(testdatapath, "testdata");