Revision control

/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
**
** This file is part of the Qt Data Visualization module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:GPL$
** 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 or (at your option) any later version
** approved by the KDE Free Qt Foundation. The licenses are as published by
** the Free Software Foundation and appearing in the file LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QtQuickTest/quicktest.h>
- class tst_skiptest: public QObject
+ class tst_qmltest: public QObject
{
Q_OBJECT
private slots:
void skiptest() { QSKIP("This test will fail, skipping."); };
};
int main(int argc, char **argv)
{
if (!qEnvironmentVariableIsEmpty("QEMU_LD_PREFIX")) {
qWarning("This test would fail due to QEMU emulation shortcomings, so it will be skipped.");
- tst_skiptest skip;
- return QTest::qExec(&skip);
+ tst_qmltest skip;
+ return QTest::qExec(&skip, argc, argv);
}
#ifdef Q_OS_QNX
if (qEnvironmentVariable("QTEST_ENVIRONMENT").split(' ').contains("ci") &&
qEnvironmentVariable("QT_QPA_PLATFORM").split(' ').contains("offscreen")
) {
qWarning("This test would fail on CI QNX QEMU without OpenGL support, so it will be skipped.");
- tst_skiptest skip;
- return QTest::qExec(&skip);
+ tst_qmltest skip;
+ return QTest::qExec(&skip, argc, argv);
}
#endif
qputenv("QSG_RHI_BACKEND", "opengl");
QTEST_SET_MAIN_SOURCE_PATH
return quick_test_main(argc, argv, "qmltest", QUICK_TEST_SOURCE_DIR);
}
#include "tst_qmltest.moc"