diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-09-04 12:40:16 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-14 06:24:38 +0200 |
| commit | 34cd8fd566cd61385db12112d9515b0d5388dad3 (patch) | |
| tree | 0f311e165c03c040f2c32261f96d80965443d4c6 /tests/auto/corelib/global/qlogging/tst_qlogging.cpp | |
| parent | 6fd1895b918c45d8404ff38319f508f0357cba27 (diff) | |
tests: Don't omit the body of a test function with QT_BUILD_INTERNAL
Changing it outside of the test function definition to avoid running
empty/inapplicable test functions.
Change-Id: I713560cde7f715696984ed082d682900f5f1bcdd
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
Diffstat (limited to 'tests/auto/corelib/global/qlogging/tst_qlogging.cpp')
| -rw-r--r-- | tests/auto/corelib/global/qlogging/tst_qlogging.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp index 5474b9aa3b..0bc2a3fc86 100644 --- a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp +++ b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp @@ -58,8 +58,10 @@ private slots: void installMsgHandler(); void installBothHandler(); +#ifdef QT_BUILD_INTERNAL void cleanupFuncinfo_data(); void cleanupFuncinfo(); +#endif void qMessagePattern(); @@ -326,11 +328,9 @@ public: }; +#ifdef QT_BUILD_INTERNAL void tst_qmessagehandler::cleanupFuncinfo_data() { -#ifndef QT_BUILD_INTERNAL - QSKIP("Requires -developer-build"); -#endif QTest::addColumn<QString>("funcinfo"); QTest::addColumn<QString>("expected"); @@ -608,7 +608,9 @@ void tst_qmessagehandler::cleanupFuncinfo_data() QTest::newRow("gcc_39") << "int TestClass1::operator>(int)" - << "TestClass1::operator>";} + << "TestClass1::operator>"; +} +#endif #ifdef QT_BUILD_INTERNAL QT_BEGIN_NAMESPACE @@ -616,16 +618,16 @@ extern QByteArray qCleanupFuncinfo(QByteArray); QT_END_NAMESPACE #endif +#ifdef QT_BUILD_INTERNAL void tst_qmessagehandler::cleanupFuncinfo() { -#ifdef QT_BUILD_INTERNAL QFETCH(QString, funcinfo); // qDebug() << funcinfo.toLatin1(); QByteArray result = qCleanupFuncinfo(funcinfo.toLatin1()); QTEST(QString::fromLatin1(result), "expected"); -#endif } +#endif void tst_qmessagehandler::qMessagePattern() { |