ICU-7650 Fix uconfig test errors in i18n library and test codes.

X-SVN-Rev: 28037

icu4c/source/i18n/vzone.cpp

@@ -11,7 +11,9 @@
  */
 
 #include "unicode/utypes.h"
-#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/uobject.h"
 #include "vzone.h"
 #include "unicode/vtzone.h"
@@ -179,3 +181,5 @@ U_CAPI UClassID U_EXPORT2
 vzone_getDynamicClassID(VZone* zone) {
     return ((VTimeZone*)zone)->VTimeZone::getDynamicClassID();
 }
+
+#endif

icu4c/source/i18n/vzone.h

@@ -16,6 +16,9 @@
 #define __VZONE_H
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "ztrans.h"
 
 #ifndef UCNV_H
@@ -379,3 +382,5 @@ U_DRAFT UClassID U_EXPORT2
 vzone_getDynamicClassID(VZone* zone);
 
 #endif // __VZONE_H
+
+#endif

icu4c/source/i18n/zrule.cpp

@@ -11,7 +11,9 @@
  */
 
 #include "unicode/utypes.h"
-#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/uobject.h"
 #include "zrule.h"
 #include "unicode/tzrule.h"
@@ -144,3 +146,4 @@ izrule_getDynamicClassID(IZRule* rule) {
     return ((InitialTimeZoneRule*)rule)->InitialTimeZoneRule::getDynamicClassID();
 }
 
+#endif

icu4c/source/i18n/zrule.h

@@ -14,6 +14,8 @@
 
 #include "unicode/utypes.h"
 
+#if !UCONFIG_NO_FORMATTING
+
 #ifndef UCNV_H
 
 /**
@@ -296,3 +298,5 @@ U_DRAFT UClassID U_EXPORT2
 izrule_getDynamicClassID(IZRule* rule);
 
 #endif
+
+#endif

icu4c/source/i18n/ztrans.cpp

@@ -11,7 +11,9 @@
  */
 
 #include "unicode/utypes.h"
-#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/uobject.h"
 #include "ztrans.h"
 #include "unicode/tztrans.h"
@@ -95,3 +97,5 @@ U_CAPI UClassID U_EXPORT2
 ztrans_getDynamicClassID(ZTrans* trans){
     return ((TimeZoneTransition*)trans)->TimeZoneTransition::getDynamicClassID();
 }
+
+#endif

icu4c/source/i18n/ztrans.h

@@ -14,6 +14,8 @@
 
 #include "unicode/utypes.h"
 
+#if !UCONFIG_NO_FORMATTING
+
 #ifndef UCNV_H
 
 /**
@@ -182,3 +184,5 @@ U_DRAFT UClassID U_EXPORT2
 ztrans_getDynamicClassID(ZTrans* trans);
 
 #endif
+
+#endif

icu4c/source/test/cintltst/custrtrn.c

@@ -57,7 +57,7 @@ addUCharTransformTest(TestNode** root)
    addTest(root, &Test_FromUTF8Lenient, "custrtrn/Test_FromUTF8Lenient");
    addTest(root, &Test_UChar_WCHART_API,  "custrtrn/Test_UChar_WCHART_API");
    addTest(root, &Test_widestrs,  "custrtrn/Test_widestrs");
-#if !UCONFIG_NO_FILE_IO
+#if !UCONFIG_NO_FILE_IO && !UCONFIG_NO_LEGACY_CONVERSION
    addTest(root, &Test_WCHART_LongString, "custrtrn/Test_WCHART_LongString");
 #endif
    addTest(root, &Test_strToJavaModifiedUTF8,  "custrtrn/Test_strToJavaModifiedUTF8");

icu4c/source/test/intltest/dcfmtest.cpp

@@ -11,7 +11,8 @@
 //
 
 #include "intltest.h"
-#if !UCONFIG_NO_REGULAR_EXPRESSIONS
+
+#if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_REGULAR_EXPRESSIONS
 
 #include "unicode/regex.h"
 #include "unicode/uchar.h"

icu4c/source/test/intltest/itformat.cpp

@@ -126,9 +126,11 @@ void IntlTestFormat::runIndexedTest( int32_t index, UBool exec, const char* &nam
         TESTCLASS(36,PluralFormatTest);
         TESTCLASS(37,DateIntervalFormatTest);
         TESTCLASS(38,TimeUnitTest);
-	    TESTCLASS(39,SelectFormatTest);
-	    TESTCLASS(40,LocaleDisplayNamesTest);
+        TESTCLASS(39,SelectFormatTest);
+        TESTCLASS(40,LocaleDisplayNamesTest);
+#if !UCONFIG_NO_REGULAR_EXPRESSIONS
         TESTCLASS(41,DecimalFormatTest);
+#endif
 
         default: name = ""; break; //needed to end loop
     }

icu4c/source/test/intltest/srchtest.cpp

@@ -9,7 +9,9 @@
 #if !UCONFIG_NO_COLLATION
 
 #include "srchtest.h"
+#if !UCONFIG_NO_BREAK_ITERATION
 #include "../cintltst/usrchdat.c"
+#endif
 #include "unicode/stsearch.h"
 #include "unicode/ustring.h"
 #include "unicode/schriter.h"

icu4c/source/test/intltest/tstnorm.cpp

@@ -52,8 +52,10 @@ void BasicNormalizerTest::runIndexedTest(int32_t index, UBool exec,
         CASE(14,FindFoldFCDExceptions);
         CASE(15,TestCompare);
         CASE(16,TestSkippable);
+#if !UCONFIG_NO_FILE_IO && !UCONFIG_NO_LEGACY_CONVERSION
         CASE(17,TestCustomComp);
         CASE(18,TestCustomFCC);
+#endif
         default: name = ""; break;
     }
 }

icu4c/source/tools/gennorm2/gennorm2.cpp

@@ -136,7 +136,9 @@ main(int argc, char* argv[]) {
         "because UCONFIG_NO_NORMALIZATION is set, \n"
         "see icu/source/common/unicode/uconfig.h\n");
     udata_createDummy(NULL, NULL, options[OUTPUT_FILENAME].value, errorCode);
-    return U_UNSUPPORTED_ERROR;
+    // Should not return an error since this is the expected behaviour if UCONFIG_NO_NORMALIZATION is on.
+    // return U_UNSUPPORTED_ERROR;
+    return 0;
 
 #else