qt5/tests/CMakeLists.txt | 2 +- qt5/tests/check_pagelabelinfo.cpp | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-)
New commits: commit c4c55d9e3572b2b4ef84d7cdd0b50ca6d3bbd19e Author: Albert Astals Cid <[email protected]> Date: Tue Oct 2 20:09:37 2018 +0200 Fix windows build by not build a test that doesnt' build anymore diff --git a/qt5/tests/CMakeLists.txt b/qt5/tests/CMakeLists.txt index 13768031..7dbad8b4 100644 --- a/qt5/tests/CMakeLists.txt +++ b/qt5/tests/CMakeLists.txt @@ -69,9 +69,9 @@ qt5_add_qtest(check_qt5_permissions check_permissions.cpp) qt5_add_qtest(check_qt5_search check_search.cpp) qt5_add_qtest(check_qt5_actualtext check_actualtext.cpp) qt5_add_qtest(check_qt5_lexer check_lexer.cpp) -qt5_add_qtest(check_qt5_pagelabelinfo check_pagelabelinfo.cpp) qt5_add_qtest(check_qt5_goostring check_goostring.cpp) qt5_add_qtest(check_qt5_utf_conversion check_utf_conversion.cpp) if (NOT WIN32) + qt5_add_qtest(check_qt5_pagelabelinfo check_pagelabelinfo.cpp) qt5_add_qtest(check_qt5_strings check_strings.cpp) endif () commit ad998fc493b5fae74f79d53ec930e2b4067e7dda Author: Albert Astals Cid <[email protected]> Date: Tue Oct 2 19:44:21 2018 +0200 don't fail tests on platforms we already know the test fails diff --git a/qt5/tests/check_pagelabelinfo.cpp b/qt5/tests/check_pagelabelinfo.cpp index 1b13be95..6a3d89d0 100644 --- a/qt5/tests/check_pagelabelinfo.cpp +++ b/qt5/tests/check_pagelabelinfo.cpp @@ -4,6 +4,8 @@ #include "PageLabelInfo_p.h" +#include "config.h" + class TestPageLabelInfo : public QObject { Q_OBJECT @@ -28,7 +30,13 @@ void TestPageLabelInfo::testFromDecimalUnicode() { std::unique_ptr<GooString> str(Poppler::QStringToUnicodeGooString(QString::fromLocal8Bit("2342"))); const auto res = fromDecimal(str->getCString(), str->getCString() + str->getLength(), str->hasUnicodeMarker()); +#ifndef HAVE_CODECVT + QEXPECT_FAIL("", "unicode text to index fails without codecvt", Continue); +#endif QCOMPARE(res.first, 2342); +#ifndef HAVE_CODECVT + QEXPECT_FAIL("", "unicode text to index fails without codecvt", Continue); +#endif QCOMPARE(res.second, true); } _______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
