From 69227215beefa9a0c98c3c161292227bde01fe77 Mon Sep 17 00:00:00 2001
From: Michael Ow <mow@svn.icu-project.org>
Date: Thu, 3 Mar 2016 21:51:16 +0000
Subject: [PATCH] ICU-12139 Fix some more uconfig header test failures

X-SVN-Rev: 38477
---
 icu4c/source/test/intltest/itmajor.cpp        | 4 ++--
 icu4c/source/test/intltest/itrbbi.cpp         | 6 ++++--
 icu4c/source/test/intltest/itrbbi.h           | 6 +++---
 icu4c/source/test/intltest/rbbimonkeytest.cpp | 4 ++--
 icu4c/source/test/intltest/rbbimonkeytest.h   | 4 ++--
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/icu4c/source/test/intltest/itmajor.cpp b/icu4c/source/test/intltest/itmajor.cpp
index b6b1ea8760f..463c1197aad 100644
--- a/icu4c/source/test/intltest/itmajor.cpp
+++ b/icu4c/source/test/intltest/itmajor.cpp
@@ -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;
diff --git a/icu4c/source/test/intltest/itrbbi.cpp b/icu4c/source/test/intltest/itrbbi.cpp
index acd1a2f6177..def75821585 100644
--- a/icu4c/source/test/intltest/itrbbi.cpp
+++ b/icu4c/source/test/intltest/itrbbi.cpp
@@ -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 */
diff --git a/icu4c/source/test/intltest/itrbbi.h b/icu4c/source/test/intltest/itrbbi.h
index 86a2ac4251c..856762a78c1 100644
--- a/icu4c/source/test/intltest/itrbbi.h
+++ b/icu4c/source/test/intltest/itrbbi.h
@@ -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
diff --git a/icu4c/source/test/intltest/rbbimonkeytest.cpp b/icu4c/source/test/intltest/rbbimonkeytest.cpp
index 1415f2988c3..90246aac223 100644
--- a/icu4c/source/test/intltest/rbbimonkeytest.cpp
+++ b/icu4c/source/test/intltest/rbbimonkeytest.cpp
@@ -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 */
diff --git a/icu4c/source/test/intltest/rbbimonkeytest.h b/icu4c/source/test/intltest/rbbimonkeytest.h
index a3d4b92774a..f8b3ff510de 100644
--- a/icu4c/source/test/intltest/rbbimonkeytest.h
+++ b/icu4c/source/test/intltest/rbbimonkeytest.h
@@ -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