]> granicus.if.org Git - icu/commitdiff
ICU-13667 Fixes compilation errors related to UCONFIG_NO_XXX flag variations.
authorNorbert Runge <nrunge@google.com>
Thu, 31 May 2018 21:53:43 +0000 (21:53 +0000)
committerNorbert Runge <nrunge@google.com>
Thu, 31 May 2018 21:53:43 +0000 (21:53 +0000)
X-SVN-Rev: 41494

icu4c/source/test/intltest/itutil.cpp
icu4c/source/test/intltest/strcase.cpp
icu4c/source/test/intltest/tsmthred.cpp

index 7f969d9ad8feba514199c137fe304a0c0f65a849..7b2995f7ccdcdaef777f9a442953363710d441be 100644 (file)
@@ -40,7 +40,9 @@ extern IntlTest *createSimpleFormatterTest();
 extern IntlTest *createUnifiedCacheTest();
 extern IntlTest *createQuantityFormatterTest();
 extern IntlTest *createPluralMapTest();
+#if !UCONFIG_NO_FORMATTING
 extern IntlTest *createStaticUnicodeSetsTest();
+#endif
 
 
 #define CASE(id, test) case id:                               \
@@ -138,11 +140,13 @@ void IntlTestUtilities::runIndexedTest( int32_t index, UBool exec, const char* &
             break;
         case 24:
             name = "StaticUnicodeSetsTest";
+#if !UCONFIG_NO_FORMATTING
             if (exec) {
                 logln("TestSuite StaticUnicodeSetsTest---"); logln();
                 LocalPointer<IntlTest> test(createStaticUnicodeSetsTest());
                 callTest(*test, par);
             }
+#endif
             break;
         default: name = ""; break; //needed to end loop
     }
index 238c80ac9d3bda727f6175bafb90429420542edc..fe983da181cf312ef5626ff3ca891b9145d220be 100644 (file)
@@ -1534,6 +1534,7 @@ void StringCaseTest::TestInPlaceTitle() {
     assertEquals("u_strToTitle(in-place) length", u_strlen(expected), length);
     assertEquals("u_strToTitle(in-place)", expected, s);
 }
+#endif
 
 void StringCaseTest::TestCaseMapEditsIteratorDocs() {
     IcuTestErrorCode status(*this, "TestCaseMapEditsIteratorDocs");
@@ -1684,4 +1685,4 @@ void StringCaseTest::TestCaseMapEditsIteratorDocs() {
     }
 }
 
-#endif
+//#endif
index d0d7a1e475dfab591ef7de94d4e1a835a8983ba1..eb7b882f5a0f2bb66de2b9b733d534880a960719 100644 (file)
@@ -78,8 +78,10 @@ void MultithreadTest::runIndexedTest( int32_t index, UBool exec,
     TESTCASE_AUTO(TestAnyTranslit);
     TESTCASE_AUTO(TestConditionVariables);
     TESTCASE_AUTO(TestUnifiedCache);
+#if !UCONFIG_NO_TRANSLITERATION
     TESTCASE_AUTO(TestBreakTranslit);
     TESTCASE_AUTO(TestIncDec);
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
     TESTCASE_AUTO_END
 }