diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-10-29 12:18:11 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-29 13:46:55 +0100 |
commit | e880ff9cae5cfd215a9fea0bce27a8f3d2d227b0 (patch) | |
tree | 1b59fac8db5f769dd11c93328f072724435aba8b /src/testlib | |
parent | 8fedf683691d4ce6e1c1aea5dda3a4f16f29b635 (diff) |
List possible matches when specifying invalid test function.
List functions matching the command line parameter instead
of dumping all functions.
Change-Id: Ic504587b1036f09702f47579f90406333c4efbeb
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'src/testlib')
-rw-r--r-- | src/testlib/qtestcase.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index d302a77206..6ff449fbcb 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -1203,12 +1203,15 @@ Q_TESTLIB_EXPORT bool printAvailableFunctions = false; Q_TESTLIB_EXPORT QStringList testFunctions; Q_TESTLIB_EXPORT QStringList testTags; -static void qPrintTestSlots(FILE *stream) +static void qPrintTestSlots(FILE *stream, const char *filter = 0) { for (int i = 0; i < QTest::currentTestObject->metaObject()->methodCount(); ++i) { QMetaMethod sl = QTest::currentTestObject->metaObject()->method(i); - if (isValidSlot(sl)) - fprintf(stream, "%s\n", sl.methodSignature().constData()); + if (isValidSlot(sl)) { + const QByteArray signature = sl.methodSignature(); + if (!filter || QString::fromLatin1(signature).contains(QLatin1String(filter), Qt::CaseInsensitive)) + fprintf(stream, "%s\n", signature.constData()); + } } } @@ -1570,9 +1573,10 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml) qsnprintf(buf + off, qMin(512 - off, 3), "()"); // append "()" int idx = QTest::currentTestObject->metaObject()->indexOfMethod(buf); if (idx < 0 || !isValidSlot(QTest::currentTestObject->metaObject()->method(idx))) { - fprintf(stderr, "Unknown testfunction: '%s'\n", buf); - fprintf(stderr, "Available testfunctions:\n"); - qPrintTestSlots(stderr); + fprintf(stderr, "Unknown test function: '%s'. Possible matches:\n", buf); + buf[off] = 0; + qPrintTestSlots(stderr, buf); + fprintf(stderr, "\n%s -functions\nlists all available test functions.\n", argv[0]); exit(1); } testFuncs[testFuncCount].set(idx, data); |