Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
Files
cb8564b6771e2dbcbb07fa81ab1dcae109ac3cfd
MSYS2-packages/icu/51.1-cygwin-tests.patch
Alexpux 6691f8d446 Add ICU package (need for new sqlite)
2014-02-03 13:59:50 +04:00

230 lines
8.7 KiB
Diff
Raw Blame History

diff -Naur icu-orig/source/test/intltest/dtfmttst.cpp icu-cygwin/source/test/intltest/dtfmttst.cpp
--- icu-orig/source/test/intltest/dtfmttst.cpp 2013-05-24 00:00:54.000000000 +0400
+++ icu-cygwin/source/test/intltest/dtfmttst.cpp 2014-02-03 10:14:36.297800000 +0400
@@ -23,7 +23,7 @@
#include "caltest.h" // for fieldName
#include <stdio.h> // for sprintf
-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
#include "windttst.h"
#endif
@@ -2260,7 +2260,7 @@
void DateFormatTest::TestHost(void)
{
-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
Win32DateTimeTest::testLocales(this);
#endif
}
diff -Naur icu-orig/source/test/intltest/uobjtest.cpp icu-cygwin/source/test/intltest/uobjtest.cpp
--- icu-orig/source/test/intltest/uobjtest.cpp 2013-05-24 00:00:56.000000000 +0400
+++ icu-cygwin/source/test/intltest/uobjtest.cpp 2014-02-03 10:14:36.297800000 +0400
@@ -382,13 +382,11 @@
TESTCLASSID_FACTORY(IndianCalendar, Calendar::createInstance(Locale("@calendar=indian"), status));
TESTCLASSID_FACTORY(ChineseCalendar, Calendar::createInstance(Locale("@calendar=chinese"), status));
TESTCLASSID_FACTORY(TaiwanCalendar, Calendar::createInstance(Locale("@calendar=roc"), status));
-#if U_PLATFORM_HAS_WIN32_API
- TESTCLASSID_FACTORY(Win32DateFormat, DateFormat::createDateInstance(DateFormat::kFull, Locale("@compat=host")));
#if U_PLATFORM_USES_ONLY_WIN32_API
+ TESTCLASSID_FACTORY(Win32DateFormat, DateFormat::createDateInstance(DateFormat::kFull, Locale("@compat=host")));
TESTCLASSID_FACTORY(Win32NumberFormat, NumberFormat::createInstance(Locale("@compat=host"), status));
#endif
#endif
-#endif
#if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_FILE_IO
/* TESTCLASSID_ABSTRACT(BreakIterator); No staticID! */
diff -Naur icu-orig/source/test/intltest/windttst.cpp icu-cygwin/source/test/intltest/windttst.cpp
--- icu-orig/source/test/intltest/windttst.cpp 2013-05-24 00:00:56.000000000 +0400
+++ icu-cygwin/source/test/intltest/windttst.cpp 2014-02-03 10:14:36.297800000 +0400
@@ -11,7 +11,7 @@
#include "unicode/utypes.h"
-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
#if !UCONFIG_NO_FORMATTING
@@ -193,4 +193,4 @@
#endif /* #if !UCONFIG_NO_FORMATTING */
-#endif /* U_PLATFORM_HAS_WIN32_API */
+#endif /* U_PLATFORM_USES_ONLY_WIN32_API */
diff -Naur icu-orig/source/test/intltest/windttst.h icu-cygwin/source/test/intltest/windttst.h
--- icu-orig/source/test/intltest/windttst.h 2013-05-24 00:00:50.000000000 +0400
+++ icu-cygwin/source/test/intltest/windttst.h 2014-02-03 10:14:36.297800000 +0400
@@ -14,7 +14,7 @@
#include "unicode/utypes.h"
-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
#if !UCONFIG_NO_FORMATTING
@@ -36,6 +36,6 @@
#endif /* #if !UCONFIG_NO_FORMATTING */
-#endif // U_PLATFORM_HAS_WIN32_API
+#endif // U_PLATFORM_USES_ONLY_WIN32_API
#endif // __WINDTTST
diff -Naur icu-orig/source/test/intltest/winutil.cpp icu-cygwin/source/test/intltest/winutil.cpp
--- icu-orig/source/test/intltest/winutil.cpp 2013-05-24 00:00:48.000000000 +0400
+++ icu-cygwin/source/test/intltest/winutil.cpp 2014-02-03 10:14:36.297800000 +0400
@@ -11,7 +11,7 @@
#include "unicode/utypes.h"
-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
#if !UCONFIG_NO_FORMATTING
@@ -92,4 +92,4 @@
#endif /* #if !UCONFIG_NO_FORMATTING */
-#endif /* U_PLATFORM_HAS_WIN32_API */
+#endif /* U_PLATFORM_USES_ONLY_WIN32_API */
diff -Naur icu-orig/source/test/intltest/winutil.h icu-cygwin/source/test/intltest/winutil.h
--- icu-orig/source/test/intltest/winutil.h 2013-05-24 00:00:48.000000000 +0400
+++ icu-cygwin/source/test/intltest/winutil.h 2014-02-03 10:14:36.297800000 +0400
@@ -14,7 +14,7 @@
#include "unicode/utypes.h"
-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
#if !UCONFIG_NO_FORMATTING
@@ -41,6 +41,6 @@
#endif /* #if !UCONFIG_NO_FORMATTING */
-#endif // U_PLATFORM_HAS_WIN32_API
+#endif // U_PLATFORM_USES_ONLY_WIN32_API
#endif // __WINUTIL
diff -Naur icu-orig/source/test/perf/collperf/collperf.cpp icu-cygwin/source/test/perf/collperf/collperf.cpp
--- icu-orig/source/test/perf/collperf/collperf.cpp 2013-05-24 00:01:16.000000000 +0400
+++ icu-cygwin/source/test/perf/collperf/collperf.cpp 2014-02-03 10:14:36.313400000 +0400
@@ -112,7 +112,7 @@
ucol_getSortKey(col, data[i].icu_data, data[i].icu_data_len, icu_key, MAX_KEY_LENGTH);
}
-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
// pre-generated in CollPerfTest::prepareData(), need not to check error here
void win_key_null(int32_t i){
//LCMAP_SORTsk 0x00000400 // WC sort sk (normalize)
@@ -294,7 +294,7 @@
return strcmp((char *) da->icu_key, (char *) db->icu_key);
}
-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
static int win_cmp_null(const void *a, const void *b) {
QCAST();
//CSTR_LESS_THAN 1
@@ -329,7 +329,7 @@
QFUNC(posix_strcoll_null, strcoll, posix_data)
QFUNC(posix_cmpkey, strcmp, posix_key)
-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
QFUNC(win_cmpkey, strcmp, win_key)
QFUNC(win_wcscmp, wcscmp, win_data)
#endif
@@ -449,7 +449,7 @@
return strcmp( (char *) rnd[i].icu_key, (char *) ord[j].icu_key );
}
-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
int win_cmp_null(int32_t i, int32_t j) {
int t = CompareStringW(win_langid, 0, rnd[i].win_data, -1, ord[j].win_data, -1);
if (t == 0){
@@ -586,7 +586,7 @@
locale = "en_US"; // set default locale
}
-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
if (options[i].doesOccur) {
char *endp;
int tmp = strtol(options[i].value, &endp, 0);
@@ -686,7 +686,7 @@
TEST_KEYGEN(TestIcu_KeyGen_null, icu_key_null);
TEST_KEYGEN(TestIcu_KeyGen_len, icu_key_len);
TEST_KEYGEN(TestPosix_KeyGen_null, posix_key_null);
-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
TEST_KEYGEN(TestWin_KeyGen_null, win_key_null);
TEST_KEYGEN(TestWin_KeyGen_len, win_key_len);
#endif
@@ -712,7 +712,7 @@
TEST_QSORT(TestIcu_qsort_usekey, icu_cmpkey);
TEST_QSORT(TestPosix_qsort_strcoll_null, posix_strcoll_null);
TEST_QSORT(TestPosix_qsort_usekey, posix_cmpkey);
-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
TEST_QSORT(TestWin_qsort_CompareStringW_null, win_cmp_null);
TEST_QSORT(TestWin_qsort_CompareStringW_len, win_cmp_len);
TEST_QSORT(TestWin_qsort_usekey, win_cmpkey);
@@ -727,7 +727,7 @@
TEST_BIN(TestIcu_BinarySearch_cmpCPO, icu_cmpcpo);
TEST_BIN(TestPosix_BinarySearch_strcoll_null, posix_strcoll_null);
TEST_BIN(TestPosix_BinarySearch_usekey, posix_cmpkey);
-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
TEST_BIN(TestWin_BinarySearch_CompareStringW_null, win_cmp_null);
TEST_BIN(TestWin_BinarySearch_CompareStringW_len, win_cmp_len);
#endif
@@ -827,7 +827,7 @@
t = strxfrm(posix_key->last(), posix_data->dataOf(i), s);
if (t != s) {status = U_INVALID_FORMAT_ERROR;return;}
-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
// Win data
s = icu_data->lengthOf(i) + 1; // plus terminal NULL
win_data->append_one(s);
@@ -850,7 +850,7 @@
rnd_index[i].posix_key = posix_key->last();
rnd_index[i].posix_data = posix_data->dataOf(i);
rnd_index[i].posix_data_len = posix_data->lengthOf(i);
-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
rnd_index[i].win_key = win_key->dataOf(i);
rnd_index[i].win_data = win_data->dataOf(i);
rnd_index[i].win_data_len = win_data->lengthOf(i);
@@ -869,7 +869,7 @@
SORT(ord_icu_key, icu_cmpkey);
SORT(ord_posix_data, posix_strcoll_null);
SORT(ord_posix_key, posix_cmpkey);
-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
SORT(ord_win_data, win_cmp_len);
SORT(ord_win_key, win_cmpkey);
SORT(ord_win_wcscmp, win_wcscmp);
diff -Naur icu-orig/source/test/perf/normperf/normperf.h icu-cygwin/source/test/perf/normperf/normperf.h
--- icu-orig/source/test/perf/normperf/normperf.h 2013-05-24 00:01:12.000000000 +0400
+++ icu-cygwin/source/test/perf/normperf/normperf.h 2014-02-03 10:14:36.313400000 +0400
@@ -315,7 +315,7 @@
}
#endif
-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
int32_t WinNormNFD(const UChar* src, int32_t srcLen, UChar* dest, int32_t dstLen, int32_t options, UErrorCode* status) {
return FoldStringW(MAP_COMPOSITE,src,srcLen,dest,dstLen);
Reference in New Issue View Git Blame Copy Permalink