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-12139 Fix some more uconfig header test failures

Browse source 
X-SVN-Rev: 38477
This commit is contained in:
Michael Ow 2016-03-03 21:51:16 +00:00
parent 9df0fc9bd8
commit 69227215be
5 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1998-2009, International Business Machines Corporation and
* Copyright (c) 1998-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -109,7 +109,7 @@ void MajorTestLevel::runIndexedTest( int32_t index, UBool exec, const char* &nam
break;
case 6: name = "rbbi";
#if !UCONFIG_NO_BREAK_ITERATION
#if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_REGULAR_EXPRESSIONS
if (exec) {
logln("TestSuite RuleBasedBreakIterator---"); logln();
IntlTestRBBI test;

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

@ -14,7 +14,7 @@
#include "unicode/utypes.h"
#if !UCONFIG_NO_BREAK_ITERATION
#if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_REGULAR_EXPRESSIONS
#include "intltest.h"
#include "itrbbi.h"
@ -31,8 +31,10 @@ void IntlTestRBBI::runIndexedTest( int32_t index, UBool exec, const char* &name,
TESTCASE_AUTO_BEGIN;
TESTCASE_AUTO_CLASS(RBBIAPITest);
TESTCASE_AUTO_CLASS(RBBITest);
#if !UCONFIG_NO_FORMATTING
TESTCASE_AUTO_CLASS(RBBIMonkeyTest);
#endif
TESTCASE_AUTO_END;
}
#endif /* #if !UCONFIG_NO_BREAK_ITERATION */
#endif /* #if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_REGULAR_EXPRESSIONS */

6
icu4c/source/test/intltest/itrbbi.h
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1998-2001, International Business Machines Corporation
* Copyright (C) 1998-2016, International Business Machines Corporation
* and others. All Rights Reserved.
**********************************************************************
************************************************************************
@ -16,7 +16,7 @@
#include "unicode/utypes.h"
#if !UCONFIG_NO_BREAK_ITERATION
#if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_REGULAR_EXPRESSIONS
#include "intltest.h"
@ -26,6 +26,6 @@ public:
void runIndexedTest( int32_t index, UBool exec, const char* &name, char* par = NULL );
};
#endif /* #if !UCONFIG_NO_BREAK_ITERATION */
#endif /* #if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_REGULAR_EXPRESSIONS */
#endif

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

@ -6,7 +6,7 @@
#include "unicode/utypes.h"
#if !UCONFIG_NO_BREAK_ITERATION
#if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_REGULAR_EXPRESSIONS && !UCONFIG_NO_FORMATTING
#include "rbbimonkeytest.h"
#include "unicode/utypes.h"
@ -980,4 +980,4 @@ UBool RBBIMonkeyTest::getBoolParam(UnicodeString name, UnicodeString &params, UB
return FALSE;
}
#endif /* !UCONFIG_NO_BREAK_ITERATION */
#endif /* !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_REGULAR_EXPRESSIONS && !UCONFIG_NO_FORMATTING */

4
icu4c/source/test/intltest/rbbimonkeytest.h
View file

@ -8,7 +8,7 @@
#include "unicode/utypes.h"
#if !UCONFIG_NO_BREAK_ITERATION
#if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_REGULAR_EXPRESSIONS && !UCONFIG_NO_FORMATTING
#include "intltest.h"
@ -207,6 +207,6 @@ class RBBIMonkeyImpl: public UObject {
};
#endif /* !UCONFIG_NO_BREAK_ITERATION */
#endif /* !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_REGULAR_EXPRESSIONS && !UCONFIG_NO_FORMATTING */
#endif // RBBIMONKEYTEST_H