e86f3c0188
For Q_OS_WIN, a path is only truly absolute if it includes a drive letter; merely starting with a slash is not enough. (We can't support UNC paths, so don't even try: qmake runs various commands in the source directory using CMD.exe, which doesn't support UNC as PWD.) This requires, when resolving a path relative to a root, transcribing the root's drive to such not-quite-absolute paths. Changed QMakeGlobals, $$absolute_path() and $$relative_path() to now use IoUtils::resolvePath() rather than delegating to QDir's absolute path method, since that doesn't correctly recognize the need for a drive letter (and qmake did run into problems with some paths, from splitPathList and a failing test, as a result). Moved existing ioUtils tests for handling of relative / absolute paths out into separate functions and expanded significantly. Fixed some existing tests to use an absolute path where one is needed; added two tests involving driveless (but rooted) paths; and fixed the test init to set a value for QT_HOST_DATA/src property (the lack of which lead to an assertion failure with this fix). Task-number: QTBUG-50839 Change-Id: I2bfc13c1bfbe1ae09997274622ea55cb3de31b43 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
112 lines
3.2 KiB
C++
112 lines
3.2 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the test suite of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
|
|
** 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 The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include <qmakeevaluator.h>
|
|
|
|
#include <QObject>
|
|
#include <QProcessEnvironment>
|
|
#include <QtTest/QtTest>
|
|
|
|
class tst_qmakelib : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
tst_qmakelib() {}
|
|
virtual ~tst_qmakelib() {}
|
|
|
|
private slots:
|
|
void initTestCase();
|
|
void cleanupTestCase();
|
|
|
|
void quoteArgUnix_data();
|
|
void quoteArgUnix();
|
|
void quoteArgWin_data();
|
|
void quoteArgWin();
|
|
|
|
void pathUtils();
|
|
void ioUtilRelativity_data();
|
|
void ioUtilRelativity();
|
|
void ioUtilResolve_data();
|
|
void ioUtilResolve();
|
|
|
|
void proString();
|
|
void proStringList();
|
|
|
|
void proParser_data();
|
|
void proParser();
|
|
|
|
void proEval_data();
|
|
void proEval();
|
|
|
|
private:
|
|
void addParseOperators();
|
|
void addParseValues();
|
|
void addParseConditions();
|
|
void addParseControlStatements();
|
|
void addParseBraces();
|
|
void addParseCustomFunctions();
|
|
void addParseAbuse();
|
|
|
|
void addAssignments();
|
|
void addExpansions();
|
|
void addControlStructs();
|
|
void addReplaceFunctions(const QString &qindir);
|
|
void addTestFunctions(const QString &qindir);
|
|
|
|
QProcessEnvironment m_env;
|
|
QHash<ProKey, ProString> m_prop;
|
|
QString m_indir, m_outdir;
|
|
};
|
|
|
|
class QMakeTestHandler : public QMakeHandler {
|
|
public:
|
|
QMakeTestHandler() : QMakeHandler(), printed(false) {}
|
|
virtual void message(int type, const QString &msg, const QString &fileName, int lineNo)
|
|
{ print(fileName, lineNo, type, msg); }
|
|
|
|
virtual void fileMessage(int type, const QString &msg)
|
|
{ Q_UNUSED(type) doPrint(msg); }
|
|
|
|
virtual void aboutToEval(ProFile *, ProFile *, EvalFileType) {}
|
|
virtual void doneWithEval(ProFile *) {}
|
|
|
|
void setExpectedMessages(const QStringList &msgs) { expected = msgs; }
|
|
QStringList expectedMessages() const { return expected; }
|
|
|
|
bool printedMessages() const { return printed; }
|
|
|
|
private:
|
|
void print(const QString &fileName, int lineNo, int type, const QString &msg);
|
|
void doPrint(const QString &msg);
|
|
|
|
QStringList expected;
|
|
bool printed;
|
|
};
|
|
|