From 3988ad95f757f7531e8133a10e83f74ab0ce1b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 12 Feb 2013 16:36:40 +0100 Subject: moc: Error out when detecting unterminated macro usage Exhausting the symbol list while looking for the final right parenthesis means it is missing. Task-number: QTBUG-29308 Change-Id: Iccf5897b0f5eb719699fd12d6c8e4a16ff189d9b Reviewed-by: Simon Hausmann --- tests/auto/tools/moc/tst_moc.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'tests/auto/tools/moc/tst_moc.cpp') diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp index 8d180ce20b..af77e5c3ad 100644 --- a/tests/auto/tools/moc/tst_moc.cpp +++ b/tests/auto/tools/moc/tst_moc.cpp @@ -558,6 +558,7 @@ private slots: void autoSignalSpyMetaTypeRegistration(); void parseDefines(); void preprocessorOnly(); + void unterminatedFunctionMacro(); signals: void sigWithUnsignedArg(unsigned foo); @@ -2948,6 +2949,26 @@ void tst_Moc::preprocessorOnly() #endif } + +void tst_Moc::unterminatedFunctionMacro() +{ +#ifdef MOC_CROSS_COMPILED + QSKIP("Not tested when cross-compiled"); +#endif +#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS) + QProcess proc; + proc.start("moc", QStringList() << "-E" << m_sourceDirectory + QStringLiteral("/unterminated-function-macro.h")); + QVERIFY(proc.waitForFinished()); + QCOMPARE(proc.exitCode(), 1); + QCOMPARE(proc.readAllStandardOutput(), QByteArray()); + QByteArray errorOutput = proc.readAllStandardError(); + QVERIFY(!errorOutput.isEmpty()); + QVERIFY(errorOutput.contains("missing ')' in macro usage")); +#else + QSKIP("Only tested on linux/gcc"); +#endif +} + QTEST_MAIN(tst_Moc) #include "tst_moc.moc" -- cgit v1.2.3