diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-09 09:06:21 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-09 09:20:46 (GMT) |
| commit | afc718f1f21fd34a23e34af9b8a83eb55ae26f34 (patch) | |
| tree | e8774e9eea96213f3a549b259942caf63a49cf63 | |
| parent | 95a06aa7e724309c3dcd714dbf8cf3743258592f (diff) | |
| download | Qt-afc718f1f21fd34a23e34af9b8a83eb55ae26f34.zip Qt-afc718f1f21fd34a23e34af9b8a83eb55ae26f34.tar.gz Qt-afc718f1f21fd34a23e34af9b8a83eb55ae26f34.tar.bz2 | |
Autotest: fix forward-declaration test.
The problem was that we forward-declared as struct, but the function was
implemented as class. It's different on MSVC.
Reviewed-by: Trust Me
| -rw-r--r-- | tests/auto/qsharedpointer/tst_qsharedpointer.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp index 58eaacb..46ec035 100644 --- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp +++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp @@ -1701,7 +1701,7 @@ void tst_QSharedPointer::invalidConstructs() "struct DerivedData: public Data { int j; };\n" "\n" "extern int forwardDeclaredDestructorRunCount;\n" - "struct ForwardDeclared;\n" + "class ForwardDeclared;\n" "ForwardDeclared *forwardPointer();\n" ); @@ -1730,6 +1730,10 @@ void tst_QSharedPointer::invalidConstructs() bool result = (test.*testFunction)(body); if (qgetenv("QTEST_EXTERNAL_DEBUG").toInt() > 0) { qDebug("External test output:"); +#ifdef Q_CC_MSVC + // MSVC prints errors to stdout + printf("%s\n", test.standardOutput().constData()); +#endif printf("%s\n", test.standardError().constData()); } if (!result) { |