QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-19 21:09:36 +00:00
Code Issues Projects Releases Wiki Activity

ref #549 "fix tests added 5.15.2 case "

Browse Source
This commit is contained in:
Andrei Yankovich 2021-03-27 16:28:54 +03:00
parent fab851f5cc
commit eccc02014e
5 changed files with 189 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UnitTests/UnitTests.pro
View File

@ -36,6 +36,7 @@ SOURCES += tst_deploytest.cpp \
modulesqt513.cpp \ modulesqt513.cpp \
modulesqt514.cpp \ modulesqt514.cpp \
modulesqt515.cpp \ modulesqt515.cpp \
modulesqt5152.cpp \
qmlcreator.cpp \ qmlcreator.cpp \
testutils.cpp testutils.cpp
@ -49,6 +50,7 @@ HEADERS += \
modulesqt513.h \ modulesqt513.h \
modulesqt514.h \ modulesqt514.h \
modulesqt515.h \ modulesqt515.h \
modulesqt5152.h \
qmlcreator.h \ qmlcreator.h \
testutils.h testutils.h

6
UnitTests/modules.h
View File

@ -12,7 +12,11 @@
#include <configparser.h> #include <configparser.h>
#include <QSet> #include <QSet>
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 2)
#include "modulesqt5152.h"
class Modules : public ModulesQt5152
#elif QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
#include "modulesqt515.h" #include "modulesqt515.h"
class Modules : public ModulesQt515 class Modules : public ModulesQt515

98
UnitTests/modulesqt515.cpp
View File

@ -49,22 +49,6 @@ QSet<QString> ModulesQt515::qmlLibs(const QString &distDir) const {
"./" + distDir + "/qml/QtQuick/Controls.2/VerticalHeaderView.qml", "./" + distDir + "/qml/QtQuick/Controls.2/VerticalHeaderView.qml",
"./" + distDir + "/qml/QtQuick/Controls.2/designer/InsetSection.qml", "./" + distDir + "/qml/QtQuick/Controls.2/designer/InsetSection.qml",
"./" + distDir + "/translations/qtdeclarative_tr.qm", "./" + distDir + "/translations/qtdeclarative_tr.qm",
"./" + distDir + "/lib/Qt5RemoteObjects.dll",
"./" + distDir + "/qml/QtQml/Models.2/modelsplugin.dll",
"./" + distDir + "/qml/QtQml/Models.2/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/Models.2/qmldir",
"./" + distDir + "/qml/QtQml/RemoteObjects/qtqmlremoteobjects.dll",
"./" + distDir + "/qml/QtQml/RemoteObjects/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/RemoteObjects/qmldir",
"./" + distDir + "/qml/QtQml/StateMachine/qtqmlstatemachine.dll",
"./" + distDir + "/qml/QtQml/StateMachine/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/StateMachine/qmldir",
"./" + distDir + "/qml/QtQml/WorkerScript.2/workerscriptplugin.dll",
"./" + distDir + "/qml/QtQml/WorkerScript.2/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/WorkerScript.2/qmldir",
"./" + distDir + "/qml/QtQml/qmlplugin.dll",
"./" + distDir + "/qml/QtQml/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/qmldir",
}); });
#else #else
res -= utils.createTree({ res -= utils.createTree({
@ -102,22 +86,6 @@ QSet<QString> ModulesQt515::qmlLibs(const QString &distDir) const {
"./" + distDir + "/qml/QtQuick/Controls.2/designer/InsetSection.qml", "./" + distDir + "/qml/QtQuick/Controls.2/designer/InsetSection.qml",
"./" + distDir + "/translations/qtdeclarative_tr.qm", "./" + distDir + "/translations/qtdeclarative_tr.qm",
"./" + distDir + "/lib/libQt5RemoteObjects.so",
"./" + distDir + "/qml/QtQml/Models.2/libmodelsplugin.so",
"./" + distDir + "/qml/QtQml/Models.2/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/Models.2/qmldir",
"./" + distDir + "/qml/QtQml/RemoteObjects/libqtqmlremoteobjects.so",
"./" + distDir + "/qml/QtQml/RemoteObjects/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/RemoteObjects/qmldir",
"./" + distDir + "/qml/QtQml/StateMachine/libqtqmlstatemachine.so",
"./" + distDir + "/qml/QtQml/StateMachine/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/StateMachine/qmldir",
"./" + distDir + "/qml/QtQml/WorkerScript.2/libworkerscriptplugin.so",
"./" + distDir + "/qml/QtQml/WorkerScript.2/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/WorkerScript.2/qmldir",
"./" + distDir + "/qml/QtQml/libqmlplugin.so",
"./" + distDir + "/qml/QtQml/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/qmldir",
} }
); );
#endif #endif
@ -174,22 +142,6 @@ QSet<QString> ModulesQt515::testDistroLibs(const QString &distDir) const {
"./" + distDir + "/package2/ZzZ/translations/qtdeclarative_tr.qm", "./" + distDir + "/package2/ZzZ/translations/qtdeclarative_tr.qm",
"./" + distDir + "/package2/ZzZ/translations/qtbase_tr.qm", "./" + distDir + "/package2/ZzZ/translations/qtbase_tr.qm",
"./" + distDir + "/lolTr/qtbase_tr.qm", "./" + distDir + "/lolTr/qtbase_tr.qm",
"./" + distDir + "/package2/ZzZ/Qt5RemoteObjects.dll",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/Models.2/modelsplugin.dll",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/Models.2/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/Models.2/qmldir",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/RemoteObjects/qtqmlremoteobjects.dll",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/RemoteObjects/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/RemoteObjects/qmldir",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/StateMachine/qtqmlstatemachine.dll",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/StateMachine/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/StateMachine/qmldir",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/WorkerScript.2/workerscriptplugin.dll",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/WorkerScript.2/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/WorkerScript.2/qmldir",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/qmlplugin.dll",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/qmldir",
}); });
@ -219,22 +171,6 @@ QSet<QString> ModulesQt515::testDistroLibs(const QString &distDir) const {
"./" + distDir + "/package2/ZzZ/translations/qtdeclarative_tr.qm", "./" + distDir + "/package2/ZzZ/translations/qtdeclarative_tr.qm",
"./" + distDir + "/package2/ZzZ/translations/qtbase_tr.qm", "./" + distDir + "/package2/ZzZ/translations/qtbase_tr.qm",
"./" + distDir + "/lolTr/qtbase_tr.qm", "./" + distDir + "/lolTr/qtbase_tr.qm",
"./" + distDir + "/package2/ZzZ/lib/libQt5RemoteObjects.so",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/Models.2/libmodelsplugin.so",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/Models.2/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/Models.2/qmldir",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/RemoteObjects/libqtqmlremoteobjects.so",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/RemoteObjects/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/RemoteObjects/qmldir",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/StateMachine/libqtqmlstatemachine.so",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/StateMachine/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/StateMachine/qmldir",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/WorkerScript.2/libworkerscriptplugin.so",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/WorkerScript.2/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/WorkerScript.2/qmldir",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/libqmlplugin.so",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/qmldir",
}); });
@ -273,22 +209,7 @@ QSet<QString> ModulesQt515::testOutLibs(const QString &distDir) const {
"./" + distDir + "/q/QtQuick/Controls.2/designer/InsetSection.qml", "./" + distDir + "/q/QtQuick/Controls.2/designer/InsetSection.qml",
"./" + distDir + "/lolTr/qtdeclarative_tr.qm", "./" + distDir + "/lolTr/qtdeclarative_tr.qm",
"./" + distDir + "/lolTr/qtbase_tr.qm", "./" + distDir + "/lolTr/qtbase_tr.qm",
"./" + distDir + "/lolLib/Qt5RemoteObjects.dll",
"./" + distDir + "/q/QtQml/Models.2/modelsplugin.dll",
"./" + distDir + "/q/QtQml/Models.2/plugins.qmltypes",
"./" + distDir + "/q/QtQml/Models.2/qmldir",
"./" + distDir + "/q/QtQml/RemoteObjects/qtqmlremoteobjects.dll",
"./" + distDir + "/q/QtQml/RemoteObjects/plugins.qmltypes",
"./" + distDir + "/q/QtQml/RemoteObjects/qmldir",
"./" + distDir + "/q/QtQml/StateMachine/qtqmlstatemachine.dll",
"./" + distDir + "/q/QtQml/StateMachine/plugins.qmltypes",
"./" + distDir + "/q/QtQml/StateMachine/qmldir",
"./" + distDir + "/q/QtQml/WorkerScript.2/workerscriptplugin.dll",
"./" + distDir + "/q/QtQml/WorkerScript.2/plugins.qmltypes",
"./" + distDir + "/q/QtQml/WorkerScript.2/qmldir",
"./" + distDir + "/q/QtQml/qmlplugin.dll",
"./" + distDir + "/q/QtQml/plugins.qmltypes",
"./" + distDir + "/q/QtQml/qmldir",
}); });
#else #else
@ -315,22 +236,7 @@ QSet<QString> ModulesQt515::testOutLibs(const QString &distDir) const {
"./" + distDir + "/q/QtQuick/Controls.2/designer/InsetSection.qml", "./" + distDir + "/q/QtQuick/Controls.2/designer/InsetSection.qml",
"./" + distDir + "/lolTr/qtdeclarative_tr.qm", "./" + distDir + "/lolTr/qtdeclarative_tr.qm",
"./" + distDir + "/lolTr/qtbase_tr.qm", "./" + distDir + "/lolTr/qtbase_tr.qm",
"./" + distDir + "/lolLib/libQt5RemoteObjects.so",
"./" + distDir + "/q/QtQml/Models.2/libmodelsplugin.so",
"./" + distDir + "/q/QtQml/Models.2/plugins.qmltypes",
"./" + distDir + "/q/QtQml/Models.2/qmldir",
"./" + distDir + "/q/QtQml/RemoteObjects/libqtqmlremoteobjects.so",
"./" + distDir + "/q/QtQml/RemoteObjects/plugins.qmltypes",
"./" + distDir + "/q/QtQml/RemoteObjects/qmldir",
"./" + distDir + "/q/QtQml/StateMachine/libqtqmlstatemachine.so",
"./" + distDir + "/q/QtQml/StateMachine/plugins.qmltypes",
"./" + distDir + "/q/QtQml/StateMachine/qmldir",
"./" + distDir + "/q/QtQml/WorkerScript.2/libworkerscriptplugin.so",
"./" + distDir + "/q/QtQml/WorkerScript.2/plugins.qmltypes",
"./" + distDir + "/q/QtQml/WorkerScript.2/qmldir",
"./" + distDir + "/q/QtQml/libqmlplugin.so",
"./" + distDir + "/q/QtQml/plugins.qmltypes",
"./" + distDir + "/q/QtQml/qmldir",
}); });
res -= utils.createTree({ res -= utils.createTree({

162
UnitTests/modulesqt5152.cpp Normal file
View File

@ -0,0 +1,162 @@
#include "modulesqt5152.h"
ModulesQt5152::ModulesQt5152()
{
}
QSet<QString> ModulesQt5152::qmlLibs(const QString &distDir) const {
TestUtils utils;
auto res = ModulesQt515::qmlLibs(distDir);
#ifdef Q_OS_WIN
res += utils.createTree({
"./" + distDir + "/qml/QtQml/WorkerScript.2/qmldir",
"./" + distDir + "/qml/QtQml/qmldir",
"./" + distDir + "/qml/QtQml/qmlplugin.dll",
"./" + distDir + "/qml/QtQml/RemoteObjects/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/RemoteObjects/qtqmlremoteobjects.dll",
"./" + distDir + "/qml/QtQml/StateMachine/qtqmlstatemachine.dll",
"./" + distDir + "/qml/QtQml/Models.2/modelsplugin.dll",
"./" + distDir + "/lib/Qt5RemoteObjects.dll",
"./" + distDir + "/qml/QtQml/Models.2/qmldir",
"./" + distDir + "/qml/QtQml/WorkerScript.2/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/RemoteObjects/qmldir",
"./" + distDir + "/qml/QtQml/Models.2/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/StateMachine/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/WorkerScript.2/workerscriptplugin.dll",
"./" + distDir + "/qml/QtQml/StateMachine/qmldir",
});
#else
res += utils.createTree({
"./" + distDir + "/qml/QtQml/WorkerScript.2/qmldir",
"./" + distDir + "/qml/QtQml/qmldir",
"./" + distDir + "/qml/QtQml/libqmlplugin.so",
"./" + distDir + "/qml/QtQml/RemoteObjects/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/RemoteObjects/libqtqmlremoteobjects.so",
"./" + distDir + "/qml/QtQml/StateMachine/libqtqmlstatemachine.so",
"./" + distDir + "/qml/QtQml/Models.2/libmodelsplugin.so",
"./" + distDir + "/lib/libQt5RemoteObjects.so",
"./" + distDir + "/qml/QtQml/Models.2/qmldir",
"./" + distDir + "/qml/QtQml/WorkerScript.2/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/RemoteObjects/qmldir",
"./" + distDir + "/qml/QtQml/Models.2/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/StateMachine/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/WorkerScript.2/libworkerscriptplugin.so",
"./" + distDir + "/qml/QtQml/StateMachine/qmldir",
});
#endif
return res;
}
QSet<QString> ModulesQt5152::testDistroLibs(const QString &distDir) const {
TestUtils utils;
auto res = ModulesQt515::testDistroLibs(distDir);
#ifdef Q_OS_WIN
res += utils.createTree({
"./" + distDir + "/package2/ZzZ/Qt5RemoteObjects.dll",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/Models.2/modelsplugin.dll",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/Models.2/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/Models.2/qmldir",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/RemoteObjects/qtqmlremoteobjects.dll",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/RemoteObjects/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/RemoteObjects/qmldir",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/StateMachine/qtqmlstatemachine.dll",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/StateMachine/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/StateMachine/qmldir",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/WorkerScript.2/workerscriptplugin.dll",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/WorkerScript.2/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/WorkerScript.2/qmldir",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/qmlplugin.dll",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/qmldir",
});
#else
res += utils.createTree({
"./" + distDir + "/package2/ZzZ/lib/libQt5RemoteObjects.so",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/Models.2/libmodelsplugin.so",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/Models.2/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/Models.2/qmldir",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/RemoteObjects/libqtqmlremoteobjects.so",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/RemoteObjects/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/RemoteObjects/qmldir",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/StateMachine/libqtqmlstatemachine.so",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/StateMachine/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/StateMachine/qmldir",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/WorkerScript.2/libworkerscriptplugin.so",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/WorkerScript.2/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/WorkerScript.2/qmldir",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/libqmlplugin.so",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/plugins.qmltypes",
"./" + distDir + "/package2/ZzZ/q/and/q/QtQml/qmldir",
});
#endif
return res;
}
QSet<QString> ModulesQt5152::testOutLibs(const QString &distDir) const {
TestUtils utils;
auto res = ModulesQt515::testOutLibs(distDir);
#ifdef Q_OS_WIN
res += utils.createTree({
"./" + distDir + "/lolLib/Qt5RemoteObjects.dll",
"./" + distDir + "/q/QtQml/Models.2/modelsplugin.dll",
"./" + distDir + "/q/QtQml/Models.2/plugins.qmltypes",
"./" + distDir + "/q/QtQml/Models.2/qmldir",
"./" + distDir + "/q/QtQml/RemoteObjects/qtqmlremoteobjects.dll",
"./" + distDir + "/q/QtQml/RemoteObjects/plugins.qmltypes",
"./" + distDir + "/q/QtQml/RemoteObjects/qmldir",
"./" + distDir + "/q/QtQml/StateMachine/qtqmlstatemachine.dll",
"./" + distDir + "/q/QtQml/StateMachine/plugins.qmltypes",
"./" + distDir + "/q/QtQml/StateMachine/qmldir",
"./" + distDir + "/q/QtQml/WorkerScript.2/workerscriptplugin.dll",
"./" + distDir + "/q/QtQml/WorkerScript.2/plugins.qmltypes",
"./" + distDir + "/q/QtQml/WorkerScript.2/qmldir",
"./" + distDir + "/q/QtQml/qmlplugin.dll",
"./" + distDir + "/q/QtQml/plugins.qmltypes",
"./" + distDir + "/q/QtQml/qmldir",
});
#else
res += utils.createTree({
"./" + distDir + "/lolLib/libQt5RemoteObjects.so",
"./" + distDir + "/q/QtQml/Models.2/libmodelsplugin.so",
"./" + distDir + "/q/QtQml/Models.2/plugins.qmltypes",
"./" + distDir + "/q/QtQml/Models.2/qmldir",
"./" + distDir + "/q/QtQml/RemoteObjects/libqtqmlremoteobjects.so",
"./" + distDir + "/q/QtQml/RemoteObjects/plugins.qmltypes",
"./" + distDir + "/q/QtQml/RemoteObjects/qmldir",
"./" + distDir + "/q/QtQml/StateMachine/libqtqmlstatemachine.so",
"./" + distDir + "/q/QtQml/StateMachine/plugins.qmltypes",
"./" + distDir + "/q/QtQml/StateMachine/qmldir",
"./" + distDir + "/q/QtQml/WorkerScript.2/libworkerscriptplugin.so",
"./" + distDir + "/q/QtQml/WorkerScript.2/plugins.qmltypes",
"./" + distDir + "/q/QtQml/WorkerScript.2/qmldir",
"./" + distDir + "/q/QtQml/libqmlplugin.so",
"./" + distDir + "/q/QtQml/plugins.qmltypes",
"./" + distDir + "/q/QtQml/qmldir",
});
#endif
return res;
}

18
UnitTests/modulesqt5152.h Normal file
View File

@ -0,0 +1,18 @@
#ifndef MODULESQT5152_H
#define MODULESQT5152_H
#include "modulesqt515.h"
class ModulesQt5152: public ModulesQt515
{
public:
ModulesQt5152();
// ModulesQt513 interface
public:
QSet<QString> qmlLibs(const QString &distDir = DISTRO_DIR) const override;
QSet<QString> testDistroLibs(const QString &distDir = DISTRO_DIR) const override;
QSet<QString> testOutLibs(const QString &distDir = DISTRO_DIR) const override;
};
#endif // MODULESQT5152_H