equal
deleted
inserted
replaced
1 /**************************************************************************** |
1 /**************************************************************************** |
2 ** |
2 ** |
3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). |
3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
4 ** All rights reserved. |
4 ** All rights reserved. |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
6 ** |
6 ** |
7 ** This file is part of the test suite of the Qt Toolkit. |
7 ** This file is part of the test suite of the Qt Toolkit. |
8 ** |
8 ** |
246 continue; |
246 continue; |
247 if (line.endsWith(" : failure location")) |
247 if (line.endsWith(" : failure location")) |
248 continue; |
248 continue; |
249 |
249 |
250 const QString output(QString::fromLatin1(line)); |
250 const QString output(QString::fromLatin1(line)); |
251 const QString expected(QString::fromLatin1(exp.at(i))); |
251 const QString expected(QString::fromLatin1(exp.at(i)).replace("<INSERT_QT_VERSION_HERE>", QT_VERSION_STR)); |
252 |
252 |
253 if (line.contains("ASSERT") && output != expected) |
253 if (line.contains("ASSERT") && output != expected) |
254 QEXPECT_FAIL("assert", "QTestLib prints out the absolute path.", Continue); |
254 QEXPECT_FAIL("assert", "QTestLib prints out the absolute path.", Continue); |
255 |
255 |
256 /* On some platforms we compile without RTTI, and as a result we never throw an exception. */ |
256 /* On some platforms we compile without RTTI, and as a result we never throw an exception. */ |