organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 06:53:45 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-11628 Fix uconfig test failures

Browse source 
X-SVN-Rev: 37631
This commit is contained in:
Michael Ow 2015-06-30 17:20:55 +00:00
parent d3301c325e
commit 58fd505a84
6 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,9 @@
********************************************************************/
#include "datadrivennumberformattestsuite.h"
#if !UCONFIG_NO_FORMATTING
#include "charstr.h"
#include "ucbuf.h"
#include "unicode/localpointer.h"
@ -297,4 +300,4 @@ UBool DataDrivenNumberFormatTestSuite::isSelectPass(
}
return TRUE;
}
#endif /* !UCONFIG_NO_FORMATTING */

5
icu4c/source/test/intltest/datadrivennumberformattestsuite.h
View file

@ -8,6 +8,9 @@
#define _DATADRIVENNUMBERFORMATTESTSUITE_H__
#include "unicode/utypes.h"
#if !UCONFIG_NO_FORMATTING
#include "unicode/uobject.h"
#include "unicode/unistr.h"
#include "numberformattesttuple.h"
@ -134,5 +137,5 @@ class DataDrivenNumberFormatTestSuite : public IntlTest {
UnicodeString &appendErrorMessage,
UErrorCode &status);
};
#endif /* !UCONFIG_NO_FORMATTING */
#endif // _DATADRIVENNUMBERFORMATTESTSUITE_

3
icu4c/source/test/intltest/itutil.cpp
View file

@ -645,13 +645,12 @@ void LocalPointerTest::TestLocalXyzPointerMoveSwap() {
#else
infoln("TestLocalXyzPointerMoveSwap() without rvalue references");
#endif
#endif /* !UCONFIG_NO_NORMALIZATION */
// Move self assignment leaves the object valid but in an undefined state.
// Do it to make sure there is no crash,
// but do not check for any particular resulting value.
f1.moveFrom(f1);
f3.moveFrom(f3);
#endif /* !UCONFIG_NO_NORMALIZATION */
}
// Try LocalXyzPointer types with NULL pointers.

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

@ -6,6 +6,9 @@
*/
#include "numberformattesttuple.h"
#if !UCONFIG_NO_FORMATTING
#include "ustrfmt.h"
#include "charstr.h"
#include "cstring.h"
@ -441,4 +444,4 @@ NumberFormatTestTuple::isFlag(int32_t fieldId) const {
return *static_cast<const UBool *>(flagAddr);
}
#endif /* !UCONFIG_NO_FORMATTING */

5
icu4c/source/test/intltest/numberformattesttuple.h
View file

@ -8,6 +8,9 @@
#define _NUMBER_FORMAT_TEST_TUPLE
#include "unicode/utypes.h"
#if !UCONFIG_NO_FORMATTING
#include "decimalformatpattern.h"
#include "unicode/decimfmt.h"
#include "unicode/ucurr.h"
@ -221,5 +224,5 @@ private:
UBool isFlag(int32_t fieldId) const;
};
#endif /* !UCONFIG_NO_FORMATTING */
#endif

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

@ -124,12 +124,14 @@ void MultithreadTest::runIndexedTest( int32_t index, UBool exec,
TestUnifiedCache();
}
break;
#if !UCONFIG_NO_TRANSLITERATION
case 9:
name = "TestBreakTranslit";
if (exec) {
TestBreakTranslit();
}
break;
#endif
default:
name = "";
break; //needed to end loop
@ -1421,7 +1423,7 @@ void MultithreadTest::TestUnifiedCache() {
}
}
#if !UCONFIG_NO_TRANSLITERATION
//
// BreakTransliterator Threading Test
// This is a test for bug #11603. Test verified to fail prior to fix.
@ -1476,3 +1478,5 @@ void MultithreadTest::TestBreakTranslit() {
gTranslitInput = NULL;
gTranslitExpected = NULL;
}
#endif /* !UCONFIG_NO_TRANSLITERATION */