From: Norbert Runge <nrunge@google.com>
Date: Mon, 27 Mar 2017 16:05:50 +0000 (+0000)
Subject: ICU-13053 disable a test that is executed (when it shouldn't) when
X-Git-Tag: release-59-rc~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac907110dd84318433262d3521d10074d1291515;p=icu

ICU-13053 disable a test that is executed (when it shouldn't) when
UCONFIG_NO_LEGACY_CONVERSION is set.

X-SVN-Rev: 39940
---

diff --git a/icu4c/source/test/intltest/csdetest.cpp b/icu4c/source/test/intltest/csdetest.cpp
index 5194cbb094d..4edacad6435 100644
--- a/icu4c/source/test/intltest/csdetest.cpp
+++ b/icu4c/source/test/intltest/csdetest.cpp
@@ -818,7 +818,7 @@ void CharsetDetectionTest::Ticket6394Test() {
 //               similar Windows and non-Windows SBCS encodings. State was kept in the shared
 //               Charset Recognizer objects, and could be overwritten.
 void CharsetDetectionTest::Ticket6954Test() {
-#if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_FORMATTING
+#if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION && !UCONFIG_NO_FORMATTING
     UErrorCode status = U_ZERO_ERROR;
     UnicodeString sISO = "This is a small sample of some English text. Just enough to be sure that it detects correctly.";
     UnicodeString ssWindows("This is another small sample of some English text. Just enough to be sure that it detects correctly."