moc: add unittest for --ignore-option-clashes
Based on tst_Moc::frameworkSearchPath(). Change-Id: I4f44f98d62acc1a2a92739cceba731dcb5f661b6 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
parent
2c285b893c
commit
cfb5dfb7e8
55
tests/auto/tools/moc/interface-from-include.h
Normal file
55
tests/auto/tools/moc/interface-from-include.h
Normal file
@ -0,0 +1,55 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the test suite of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3.0 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU General Public License version 3.0 requirements will be
|
||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
#ifndef INTERFACE_FROM_INCLUDE_H
|
||||
#define INTERFACE_FROM_INCLUDE_H
|
||||
|
||||
#include <testinterface.h>
|
||||
|
||||
class TestComponent : public QObject, public TestInterface
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_INTERFACES(TestInterface)
|
||||
public:
|
||||
|
||||
virtual void foobar() { }
|
||||
};
|
||||
|
||||
#endif
|
@ -523,6 +523,7 @@ private slots:
|
||||
void structQObject();
|
||||
void namespacedFlags();
|
||||
void warnOnMultipleInheritance();
|
||||
void ignoreOptionClashes();
|
||||
void forgottenQInterface();
|
||||
void os9Newline();
|
||||
void winNewline();
|
||||
@ -969,6 +970,46 @@ void tst_Moc::warnOnMultipleInheritance()
|
||||
#endif
|
||||
}
|
||||
|
||||
void tst_Moc::ignoreOptionClashes()
|
||||
{
|
||||
#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;
|
||||
QStringList args;
|
||||
const QString header = m_sourceDirectory + QStringLiteral("/interface-from-include.h");
|
||||
const QString includeDir = m_sourceDirectory + "/Test.framework/Headers";
|
||||
// given --ignore-option-clashes, -pthread should be ignored, but the -I path should not be.
|
||||
args << "--ignore-option-clashes" << "-pthread" << "-I" << includeDir << "-fno-builtin" << header;
|
||||
proc.start("moc", args);
|
||||
bool finished = proc.waitForFinished();
|
||||
if (!finished)
|
||||
qWarning("waitForFinished failed. QProcess error: %d", (int)proc.error());
|
||||
QVERIFY(finished);
|
||||
if (proc.exitCode() != 0) {
|
||||
qDebug() << proc.readAllStandardError();
|
||||
}
|
||||
QCOMPARE(proc.exitCode(), 0);
|
||||
QCOMPARE(proc.readAllStandardError(), QByteArray());
|
||||
QByteArray mocOut = proc.readAllStandardOutput();
|
||||
|
||||
// If -pthread wasn't ignored, it was parsed as a prefix of "thread/", which breaks compilation.
|
||||
QStringList gccArgs;
|
||||
gccArgs << "-c" << "-x" << "c++" << "-I" << ".."
|
||||
<< "-I" << qtIncludePath << "-I" << includeDir << "-o" << "/dev/null" << "-fPIE" << "-";
|
||||
proc.start("gcc", gccArgs);
|
||||
QVERIFY(proc.waitForStarted());
|
||||
proc.write(mocOut);
|
||||
proc.closeWriteChannel();
|
||||
|
||||
QVERIFY(proc.waitForFinished());
|
||||
QCOMPARE(QString::fromLocal8Bit(proc.readAllStandardError()), QString());
|
||||
#else
|
||||
QSKIP("Only tested on linux/gcc");
|
||||
#endif
|
||||
}
|
||||
|
||||
void tst_Moc::forgottenQInterface()
|
||||
{
|
||||
#ifdef MOC_CROSS_COMPILED
|
||||
|
Loading…
Reference in New Issue
Block a user