From 54e7255eb18b1247d7cfda2d6bc120dc9c0f119b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 20 Jul 2017 13:32:03 -0700 Subject: Autotest: adapt to qt_error_string() now returning Win32 messages Instead of Unix "No such file or directory". Change-Id: I84e45059a888497fb55ffffd14d32409773e38fe Reviewed-by: Simon Hausmann --- tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'tests/auto/xmlpatterns/tst_xmlpatterns.cpp') diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index 8db61b9..e2f7337 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -33,6 +33,10 @@ #include "../qxmlquery/TestFundament.h" #include "../network-settings.h" +#ifdef Q_OS_WIN +# include +#endif + /*! \class tst_XmlPatterns \internal @@ -1043,6 +1047,12 @@ QString tst_XmlPatterns::filterStderr(const QString &in) for (const QRegExp& rx : irrelevant) out = out.remove(rx); +#ifdef Q_OS_WIN + // replace some Win32 error messages by standard Unix ones + out.replace(qt_error_string(ERROR_FILE_NOT_FOUND), "No such file or directory"); + out.replace(qt_error_string(ERROR_PATH_NOT_FOUND), "No such file or directory"); +#endif + return out; } -- cgit v1.2.1