From 3ddafcd34a1084b6b7dac7050bb3506cc192ce1b Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 2 Jul 2014 10:48:06 -0700 Subject: [PATCH] Disable iconv tests that require on libiconv functionality when not using libiconv --- tests/tests/iconv.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/tests/iconv.cpp b/tests/tests/iconv.cpp index 518e4b44b..5746296ca 100644 --- a/tests/tests/iconv.cpp +++ b/tests/tests/iconv.cpp @@ -12,11 +12,13 @@ // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -#include #include #include +#include +#include + using namespace agi::charset; TEST(lagi_iconv, BasicSetup) { @@ -54,6 +56,7 @@ TEST(lagi_iconv, StrLen4) { } } +#ifdef _LIBICONV_VERSION TEST(lagi_iconv, Fallbacks) { IconvWrapper nofallback("UTF-8", "Shift-JIS", false); IconvWrapper fallback("UTF-8", "Shift-JIS", true); @@ -86,6 +89,7 @@ TEST(lagi_iconv, BadInput) { IconvWrapper utf8("UTF-8", "UTF-16LE"); EXPECT_THROW(utf8.Convert("\xE2\xFF"), BadInput); } +#endif TEST(lagi_iconv, Conversions) { IconvWrapper utf16le("UTF-16LE", "UTF-8", false);