From 1cba8da73560b8683f21273955af8159f9d21492 Mon Sep 17 00:00:00 2001 From: Norbert Runge Date: Mon, 27 Mar 2017 16:30:43 +0000 Subject: [PATCH] ICU-13053 disable tests that where executed (but shouldn't) when UCONFIG_NO_FILTERED_BREAK_ITERATION is set in uconfig.h. X-SVN-Rev: 39942 --- icu4c/source/test/cintltst/cbiapts.c | 2 ++ icu4c/source/test/intltest/rbbitst.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/icu4c/source/test/cintltst/cbiapts.c b/icu4c/source/test/cintltst/cbiapts.c index ec4fc838c07..9f68f0b7f7e 100644 --- a/icu4c/source/test/cintltst/cbiapts.c +++ b/icu4c/source/test/cintltst/cbiapts.c @@ -68,7 +68,9 @@ void addBrkIterAPITest(TestNode** root) addTest(root, &TestBreakIteratorTailoring, "tstxtbd/cbiapts/TestBreakIteratorTailoring"); addTest(root, &TestBreakIteratorRefresh, "tstxtbd/cbiapts/TestBreakIteratorRefresh"); addTest(root, &TestBug11665, "tstxtbd/cbiapts/TestBug11665"); +#if !UCONFIG_NO_FILTERED_BREAK_ITERATION addTest(root, &TestBreakIteratorSuppressions, "tstxtbd/cbiapts/TestBreakIteratorSuppressions"); +#endif } #define CLONETEST_ITERATOR_COUNT 2 diff --git a/icu4c/source/test/intltest/rbbitst.cpp b/icu4c/source/test/intltest/rbbitst.cpp index 815448dfe4a..3df44d12319 100644 --- a/icu4c/source/test/intltest/rbbitst.cpp +++ b/icu4c/source/test/intltest/rbbitst.cpp @@ -1125,7 +1125,9 @@ void RBBITest::executeTest(TestParams *t, UErrorCode &status) { void RBBITest::TestExtended() { -#if !UCONFIG_NO_REGULAR_EXPRESSIONS + // Skip test for now when UCONFIG_NO_FILTERED_BREAK_ITERATION is set. This + // data driven test closely entangles filtered and regular data. +#if !UCONFIG_NO_REGULAR_EXPRESSIONS && !UCONFIG_NO_FILTERED_BREAK_ITERATION UErrorCode status = U_ZERO_ERROR; Locale locale("");