organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-14 17:24:01 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-2850 Better fix for MSVC 7

Browse source 
X-SVN-Rev: 11965
This commit is contained in:
George Rhoten 2003-05-16 19:52:01 +00:00
parent a94c4e427d
commit 6aeb28b094
5 changed files with 45 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
icu4c/source/test/intltest/intltest.cpp
View file

@ -1204,53 +1204,14 @@ main(int argc, char* argv[])
}
const char* IntlTest::loadTestData(UErrorCode& err){
const char* directory=NULL;
UResourceBundle* test =NULL;
char* tdpath=NULL;
const char* directory = ".";
const char* tdrelativepath = U_FILE_SEP_STRING"out"U_FILE_SEP_STRING;
const char* tdrelativepath = ".."U_FILE_SEP_STRING".."U_FILE_SEP_STRING"test"U_FILE_SEP_STRING"testdata"U_FILE_SEP_STRING"out"U_FILE_SEP_STRING;
if( _testDataPath == NULL){
directory= pathToDataDirectory();
/* get the data/out dir */
#if defined (U_TOPBUILDDIR)
directory = U_TOPBUILDDIR U_FILE_SEP_STRING "test" U_FILE_SEP_STRING "testdata";
#else
// Use #else so we don't get compiler warnings due to the return above.
/* On Windows, the file name obtained from __FILE__ includes a full path.
* This file is "wherever\icu\source\test\cintltst\cintltst.c"
* Change to "wherever\icu\source\data"
*/
{
char p[1024];
char *pBackSlash;
int i;
strcpy(p, __FILE__);
/* We want to back over three '\' chars. */
/* Only Windows should end up here, so looking for '\' is safe. */
for (i=1; i<=3; i++) {
pBackSlash = strrchr(p, U_FILE_SEP_CHAR);
if (pBackSlash != NULL) {
*pBackSlash = 0; /* Truncate the string at the '\' */
}
}
if (pBackSlash != NULL) {
/* We found and truncated three names from the path.
* Now append "source\data" and set the environment
*/
strcpy(pBackSlash, U_FILE_SEP_STRING "test" U_FILE_SEP_STRING "testdata");
directory = p;
}
else {
/* __FILE__ on MSVC7 does not contain the directory */
directory = ".."U_FILE_SEP_STRING".."U_FILE_SEP_STRING"test"U_FILE_SEP_STRING"testdata"U_FILE_SEP_STRING;
}
}
#endif
tdpath = new char[(( strlen(directory) * strlen(tdrelativepath)) + 10)];//(char*) ctst_malloc(sizeof(char) *(( strlen(directory) * strlen(tdrelativepath)) + 10));
tdpath = (char*) malloc(sizeof(char) *(( strlen(directory) * strlen(tdrelativepath)) + 100));
/* u_getDataDirectory shoul return \source\data ... set the
@ -1259,53 +1220,18 @@ const char* IntlTest::loadTestData(UErrorCode& err){
* Fallback: When Memory mapped file is built
* ..\source\data\out\..\..\test\testdata\out\testdata
*/
strcpy(tdpath, directory);
strcpy(tdpath, directory);
strcat(tdpath, "out"U_FILE_SEP_STRING);
strcat(tdpath, tdrelativepath);
strcat(tdpath,"testdata");
test=ures_open(tdpath, "testtypes", &err);
/* we could not find the data in tdpath
* try tdpathFallback
*/
if(U_FAILURE(err))
{
fprintf(stderr, "Path %s failed to load testdata\n", tdpath);
strcpy(tdpath,directory);
strcat(tdpath,".."U_FILE_SEP_STRING);
strcat(tdpath, tdrelativepath);
strcat(tdpath,"testdata");
err =U_ZERO_ERROR;
test=ures_open(tdpath, "testtypes", &err);
/* we could not find the data in tdpath
* try one more tdpathFallback
*/
if(U_FAILURE(err)){
fprintf(stderr, "Path %s failed to load testdata\n", tdpath);
strcpy(tdpath,directory);
strcat(tdpath,".."U_FILE_SEP_STRING);
strcat(tdpath,".."U_FILE_SEP_STRING);
strcat(tdpath, tdrelativepath);
strcat(tdpath,"testdata");
err =U_ZERO_ERROR;
test=ures_open(tdpath, "testtypes", &err);
/* Fall back did not succeed either so return */
if(U_FAILURE(err)){
err = U_FILE_ACCESS_ERROR;
it_errln((UnicodeString)"construction of NULL did not succeed: "
+ (UnicodeString)u_errorName(err)
+ ", path was based on "
+ (UnicodeString)tdpath
+ (UnicodeString)" \n");
return "";
}
ures_close(test);
_testDataPath = tdpath;
return _testDataPath;
}
ures_close(test);
_testDataPath = tdpath;
return _testDataPath;
/* Fall back did not succeed either so return */
if(U_FAILURE(err)){
err = U_FILE_ACCESS_ERROR;
it_errln((UnicodeString)"Could not load testtypes.res in testdata bundle with path " + tdpath + (UnicodeString)" - " + u_errorName(err));
return "";
}
ures_close(test);
_testDataPath = tdpath;
@ -1366,7 +1292,14 @@ const char * IntlTest::pathToDataDirectory()
}
else {
/* __FILE__ on MSVC7 does not contain the directory */
fgDataDir = ".."U_FILE_SEP_STRING".."U_FILE_SEP_STRING "data" U_FILE_SEP_STRING;
FILE *file = fopen(".."U_FILE_SEP_STRING".."U_FILE_SEP_STRING "data" U_FILE_SEP_STRING "Makefile.in", "r");
if (file) {
fclose(file);
fgDataDir = ".."U_FILE_SEP_STRING".."U_FILE_SEP_STRING "data" U_FILE_SEP_STRING;
}
else {
fgDataDir = ".."U_FILE_SEP_STRING".."U_FILE_SEP_STRING".."U_FILE_SEP_STRING "data" U_FILE_SEP_STRING;
}
}
}
#endif

8
icu4c/source/test/intltest/regextst.cpp
View file

@ -1116,6 +1116,10 @@ void RegexTest::Extended() {
// Open and read the test data file.
//
const char *testDataDirectory = loadTestData(status);
if (U_FAILURE(status)) {
errln("ERROR: could not open test data %s", u_errorName(status));
return;
}
UnicodeString tdd(testDataDirectory);
tdd = RegexMatcher("([/\\\\])out[/\\\\]testdata", tdd, 0, status).
replaceFirst("$1regextst.txt", status);
@ -1433,6 +1437,10 @@ void RegexTest::PerlTests() {
// Open and read the test data file.
//
const char *testDataDirectory = loadTestData(status);
if (U_FAILURE(status)) {
errln("ERROR: could not open test data %s", u_errorName(status));
return;
}
UnicodeString tdd(testDataDirectory);
tdd = RegexMatcher("([/\\\\])out[/\\\\]testdata", tdd, 0, status).
replaceFirst("$1re_tests.txt", status);

8
icu4c/source/test/intltest/thcoll.cpp
View file

@ -117,6 +117,10 @@ void CollationThaiTest::TestNamesList(void) {
uprv_strcpy(buffer,IntlTest::loadTestData(status) );
char* index = 0;
if (U_FAILURE(status)) {
errln("ERROR: could not open test data %s", u_errorName(status));
return;
}
index=strrchr(buffer,(char)U_FILE_SEP_CHAR);
if((unsigned int)(index-buffer) != (strlen(buffer)-1)){
@ -183,6 +187,10 @@ void CollationThaiTest::TestDictionary(void) {
uprv_strcpy(buffer,IntlTest::loadTestData(status) );
char* index = 0;
if (U_FAILURE(status)) {
errln("ERROR: could not open test data %s", u_errorName(status));
return;
}
index=strrchr(buffer,(char)U_FILE_SEP_CHAR);
if((unsigned int)(index-buffer) != (strlen(buffer)-1)){

5
icu4c/source/test/intltest/tsmthred.cpp
View file

@ -945,7 +945,10 @@ void MultithreadTest::TestCollators()
char testDataPath[1024];
uprv_strcpy(testDataPath, IntlTest::loadTestData(status));
char* index = 0;
if (U_FAILURE(status)) {
errln("ERROR: could not open test data %s", u_errorName(status));
return;
}
index=strrchr(testDataPath,(char)U_FILE_SEP_CHAR);
if((unsigned int)(index-testDataPath) != (strlen(testDataPath)-1)){

4
icu4c/source/test/intltest/ucaconf.cpp
View file

@ -26,6 +26,10 @@ status(U_ZERO_ERROR)
}
uprv_strcpy(testDataPath, IntlTest::loadTestData(status));
if (U_FAILURE(status)) {
errln("ERROR: could not open test data %s", u_errorName(status));
return;
}
char* index = 0;
index=strrchr(testDataPath,(char)U_FILE_SEP_CHAR);