QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-04-26 09:44:33 +00:00
Code Issues Projects Releases Wiki Activity

simple fixes
Some checks failed
buildbot/AndroidBuilder_v8 Build finished.
Details
buildbot/WindowsBuilder Build finished.
Details
buildbot/WindowsCMakeBuilder Build finished.
Details
buildbot/LinuxCMakeBuilderQt6 Build finished.
Details
buildbot/IOSCMakeBuilder Build finished.
Details

Browse Source
This commit is contained in:
Andrei Yankovich 2022-08-25 23:44:52 +03:00
parent 0c7d3f41ed
commit 99c03a50c8
5 changed files with 266 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

317
tests/modules/modulesqt6_3.cpp
View File

@ -28,6 +28,10 @@ QSet<QString> ModulesQt63::testOutLibs(const QString &distDir) const {
}
QSet<QString> ModulesQt63::onlyC(const QString &distDir) const {
return ModulesQt5152::onlyC(distDir);
}
QSet<QString> ModulesQt63::qtLibs(const QString &distDir) const {
TestUtils utils;
@ -39,9 +43,9 @@ QSet<QString> ModulesQt63::qtLibs(const QString &distDir) const {
#ifdef Q_OS_WIN
Tree += utils.createTree(
{
"./" + distDir + "QtWidgetsProject.sh",
"./" + distDir + "bin/QtWidgetsProject",
"./" + distDir + "bin/qt.conf",
"./" + distDir + "/QtWidgetsProject.sh",
"./" + distDir + "/bin/QtWidgetsProject",
"./" + distDir + "/bin/qt.conf",
"./" + distDir + "/Qt6Core.so",
"./" + distDir + "/Qt6DBus.so",
"./" + distDir + "/Qt6EglFSDeviceIntegration.so",
@ -55,154 +59,179 @@ QSet<QString> ModulesQt63::qtLibs(const QString &distDir) const {
"./" + distDir + "/Qt6Widgets.so",
"./" + distDir + "/Qt6WlShellIntegration.so",
"./" + distDir + "/Qt6XcbQpa.so",
"./" + distDir + "lib/libicudata.so",
"./" + distDir + "lib/libicui18n.so",
"./" + distDir + "lib/libicuuc.so",
"./" + distDir + "plugins/iconengines/libqsvgicon.so",
"./" + distDir + "plugins/imageformats/libqgif.so",
"./" + distDir + "plugins/imageformats/libqicns.so",
"./" + distDir + "plugins/imageformats/libqico.so",
"./" + distDir + "plugins/imageformats/libqjpeg.so",
"./" + distDir + "plugins/imageformats/libqpdf.so",
"./" + distDir + "plugins/imageformats/libqsvg.so",
"./" + distDir + "plugins/imageformats/libqtga.so",
"./" + distDir + "plugins/imageformats/libqtiff.so",
"./" + distDir + "plugins/imageformats/libqwbmp.so",
"./" + distDir + "plugins/imageformats/libqwebp.so",
"./" + distDir + "plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so",
"./" + distDir + "plugins/platforminputcontexts/libibusplatforminputcontextplugin.so",
"./" + distDir + "plugins/platforms/libqeglfs.so",
"./" + distDir + "plugins/platforms/libqlinuxfb.so",
"./" + distDir + "plugins/platforms/libqminimal.so",
"./" + distDir + "plugins/platforms/libqminimalegl.so",
"./" + distDir + "plugins/platforms/libqoffscreen.so",
"./" + distDir + "plugins/platforms/libqwayland-egl.so",
"./" + distDir + "plugins/platforms/libqwayland-generic.so",
"./" + distDir + "plugins/platforms/libqxcb.so",
"./" + distDir + "plugins/platformthemes/libqgtk3.so",
"./" + distDir + "plugins/platformthemes/libqxdgdesktopportal.so",
"./" + distDir + "plugins/wayland-shell-integration/libfullscreen-shell-v1.so",
"./" + distDir + "plugins/wayland-shell-integration/libivi-shell.so",
"./" + distDir + "plugins/wayland-shell-integration/libqt-shell.so",
"./" + distDir + "plugins/wayland-shell-integration/libwl-shell-plugin.so",
"./" + distDir + "plugins/wayland-shell-integration/libxdg-shell.so",
"./" + distDir + "plugins/xcbglintegrations/libqxcb-egl-integration.so",
"./" + distDir + "plugins/xcbglintegrations/libqxcb-glx-integration.so",
"./" + distDir + "translations/qtbase_ar.qm",
"./" + distDir + "translations/qtbase_bg.qm",
"./" + distDir + "translations/qtbase_ca.qm",
"./" + distDir + "translations/qtbase_cs.qm",
"./" + distDir + "translations/qtbase_da.qm",
"./" + distDir + "translations/qtbase_de.qm",
"./" + distDir + "translations/qtbase_en.qm",
"./" + distDir + "translations/qtbase_es.qm",
"./" + distDir + "translations/qtbase_fa.qm",
"./" + distDir + "translations/qtbase_fi.qm",
"./" + distDir + "translations/qtbase_fr.qm",
"./" + distDir + "translations/qtbase_gd.qm",
"./" + distDir + "translations/qtbase_he.qm",
"./" + distDir + "translations/qtbase_hr.qm",
"./" + distDir + "translations/qtbase_hu.qm",
"./" + distDir + "translations/qtbase_it.qm",
"./" + distDir + "translations/qtbase_ja.qm",
"./" + distDir + "translations/qtbase_ko.qm",
"./" + distDir + "translations/qtbase_lv.qm",
"./" + distDir + "translations/qtbase_nl.qm",
"./" + distDir + "translations/qtbase_nn.qm",
"./" + distDir + "translations/qtbase_pl.qm",
"./" + distDir + "translations/qtbase_pt_BR.qm",
"./" + distDir + "translations/qtbase_ru.qm",
"./" + distDir + "translations/qtbase_sk.qm",
"./" + distDir + "translations/qtbase_tr.qm",
"./" + distDir + "translations/qtbase_uk.qm",
"./" + distDir + "translations/qtbase_zh_CN.qm",
"./" + distDir + "translations/qtbase_zh_TW.qm"
"./" + distDir + "/lib/libicudata.so",
"./" + distDir + "/lib/libicui18n.so",
"./" + distDir + "/lib/libicuuc.so",
"./" + distDir + "/plugins/iconengines/libqsvgicon.so",
"./" + distDir + "/plugins/imageformats/libqgif.so",
"./" + distDir + "/plugins/imageformats/libqicns.so",
"./" + distDir + "/plugins/imageformats/libqico.so",
"./" + distDir + "/plugins/imageformats/libqjpeg.so",
"./" + distDir + "/plugins/imageformats/libqpdf.so",
"./" + distDir + "/plugins/imageformats/libqsvg.so",
"./" + distDir + "/plugins/imageformats/libqtga.so",
"./" + distDir + "/plugins/imageformats/libqtiff.so",
"./" + distDir + "/plugins/imageformats/libqwbmp.so",
"./" + distDir + "/plugins/imageformats/libqwebp.so",
"./" + distDir + "/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so",
"./" + distDir + "/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so",
"./" + distDir + "/plugins/platforms/libqeglfs.so",
"./" + distDir + "/plugins/platforms/libqlinuxfb.so",
"./" + distDir + "/plugins/platforms/libqminimal.so",
"./" + distDir + "/plugins/platforms/libqminimalegl.so",
"./" + distDir + "/plugins/platforms/libqoffscreen.so",
"./" + distDir + "/plugins/platforms/libqwayland-egl.so",
"./" + distDir + "/plugins/platforms/libqwayland-generic.so",
"./" + distDir + "/plugins/platforms/libqxcb.so",
"./" + distDir + "/plugins/platformthemes/libqgtk3.so",
"./" + distDir + "/plugins/platformthemes/libqxdgdesktopportal.so",
"./" + distDir + "/plugins/wayland-shell-integration/libfullscreen-shell-v1.so",
"./" + distDir + "/plugins/wayland-shell-integration/libivi-shell.so",
"./" + distDir + "/plugins/wayland-shell-integration/libqt-shell.so",
"./" + distDir + "/plugins/wayland-shell-integration/libwl-shell-plugin.so",
"./" + distDir + "/plugins/wayland-shell-integration/libxdg-shell.so",
"./" + distDir + "/plugins/xcbglintegrations/libqxcb-egl-integration.so",
"./" + distDir + "/plugins/xcbglintegrations/libqxcb-glx-integration.so",
"./" + distDir + "/translations/qtbase_ar.qm",
"./" + distDir + "/translations/qtbase_bg.qm",
"./" + distDir + "/translations/qtbase_ca.qm",
"./" + distDir + "/translations/qtbase_cs.qm",
"./" + distDir + "/translations/qtbase_da.qm",
"./" + distDir + "/translations/qtbase_de.qm",
"./" + distDir + "/translations/qtbase_en.qm",
"./" + distDir + "/translations/qtbase_es.qm",
"./" + distDir + "/translations/qtbase_fa.qm",
"./" + distDir + "/translations/qtbase_fi.qm",
"./" + distDir + "/translations/qtbase_fr.qm",
"./" + distDir + "/translations/qtbase_gd.qm",
"./" + distDir + "/translations/qtbase_he.qm",
"./" + distDir + "/translations/qtbase_hr.qm",
"./" + distDir + "/translations/qtbase_hu.qm",
"./" + distDir + "/translations/qtbase_it.qm",
"./" + distDir + "/translations/qtbase_ja.qm",
"./" + distDir + "/translations/qtbase_ko.qm",
"./" + distDir + "/translations/qtbase_lv.qm",
"./" + distDir + "/translations/qtbase_nl.qm",
"./" + distDir + "/translations/qtbase_nn.qm",
"./" + distDir + "/translations/qtbase_pl.qm",
"./" + distDir + "/translations/qtbase_pt_BR.qm",
"./" + distDir + "/translations/qtbase_ru.qm",
"./" + distDir + "/translations/qtbase_sk.qm",
"./" + distDir + "/translations/qtbase_tr.qm",
"./" + distDir + "/translations/qtbase_uk.qm",
"./" + distDir + "/translations/qtbase_zh_CN.qm",
"./" + distDir + "/translations/qtbase_zh_TW.qm"
});
#else
Tree += utils.createTree(
{
"./" + distDir + "QtWidgetsProject.sh",
"./" + distDir + "bin/QtWidgetsProject",
"./" + distDir + "bin/qt.conf",
"./" + distDir + "lib/libQt6Core.so",
"./" + distDir + "lib/libQt6DBus.so",
"./" + distDir + "lib/libQt6EglFSDeviceIntegration.so",
"./" + distDir + "lib/libQt6Gui.so",
"./" + distDir + "lib/libQt6Network.so",
"./" + distDir + "lib/libQt6OpenGL.so",
"./" + distDir + "lib/libQt6Pdf.so",
"./" + distDir + "lib/libQt6Svg.so",
"./" + distDir + "lib/libQt6WaylandClient.so",
"./" + distDir + "lib/libQt6WaylandEglClientHwIntegration.so",
"./" + distDir + "lib/libQt6Widgets.so",
"./" + distDir + "lib/libQt6WlShellIntegration.so",
"./" + distDir + "lib/libQt6XcbQpa.so",
"./" + distDir + "lib/libicudata.so",
"./" + distDir + "lib/libicui18n.so",
"./" + distDir + "lib/libicuuc.so",
"./" + distDir + "plugins/iconengines/libqsvgicon.so",
"./" + distDir + "plugins/imageformats/libqgif.so",
"./" + distDir + "plugins/imageformats/libqicns.so",
"./" + distDir + "plugins/imageformats/libqico.so",
"./" + distDir + "plugins/imageformats/libqjpeg.so",
"./" + distDir + "plugins/imageformats/libqpdf.so",
"./" + distDir + "plugins/imageformats/libqsvg.so",
"./" + distDir + "plugins/imageformats/libqtga.so",
"./" + distDir + "plugins/imageformats/libqtiff.so",
"./" + distDir + "plugins/imageformats/libqwbmp.so",
"./" + distDir + "plugins/imageformats/libqwebp.so",
"./" + distDir + "plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so",
"./" + distDir + "plugins/platforminputcontexts/libibusplatforminputcontextplugin.so",
"./" + distDir + "plugins/platforms/libqeglfs.so",
"./" + distDir + "plugins/platforms/libqlinuxfb.so",
"./" + distDir + "plugins/platforms/libqminimal.so",
"./" + distDir + "plugins/platforms/libqminimalegl.so",
"./" + distDir + "plugins/platforms/libqoffscreen.so",
"./" + distDir + "plugins/platforms/libqwayland-egl.so",
"./" + distDir + "plugins/platforms/libqwayland-generic.so",
"./" + distDir + "plugins/platforms/libqxcb.so",
"./" + distDir + "plugins/platformthemes/libqgtk3.so",
"./" + distDir + "plugins/platformthemes/libqxdgdesktopportal.so",
"./" + distDir + "plugins/wayland-shell-integration/libfullscreen-shell-v1.so",
"./" + distDir + "plugins/wayland-shell-integration/libivi-shell.so",
"./" + distDir + "plugins/wayland-shell-integration/libqt-shell.so",
"./" + distDir + "plugins/wayland-shell-integration/libwl-shell-plugin.so",
"./" + distDir + "plugins/wayland-shell-integration/libxdg-shell.so",
"./" + distDir + "plugins/xcbglintegrations/libqxcb-egl-integration.so",
"./" + distDir + "plugins/xcbglintegrations/libqxcb-glx-integration.so",
"./" + distDir + "translations/qtbase_ar.qm",
"./" + distDir + "translations/qtbase_bg.qm",
"./" + distDir + "translations/qtbase_ca.qm",
"./" + distDir + "translations/qtbase_cs.qm",
"./" + distDir + "translations/qtbase_da.qm",
"./" + distDir + "translations/qtbase_de.qm",
"./" + distDir + "translations/qtbase_en.qm",
"./" + distDir + "translations/qtbase_es.qm",
"./" + distDir + "translations/qtbase_fa.qm",
"./" + distDir + "translations/qtbase_fi.qm",
"./" + distDir + "translations/qtbase_fr.qm",
"./" + distDir + "translations/qtbase_gd.qm",
"./" + distDir + "translations/qtbase_he.qm",
"./" + distDir + "translations/qtbase_hr.qm",
"./" + distDir + "translations/qtbase_hu.qm",
"./" + distDir + "translations/qtbase_it.qm",
"./" + distDir + "translations/qtbase_ja.qm",
"./" + distDir + "translations/qtbase_ko.qm",
"./" + distDir + "translations/qtbase_lv.qm",
"./" + distDir + "translations/qtbase_nl.qm",
"./" + distDir + "translations/qtbase_nn.qm",
"./" + distDir + "translations/qtbase_pl.qm",
"./" + distDir + "translations/qtbase_pt_BR.qm",
"./" + distDir + "translations/qtbase_ru.qm",
"./" + distDir + "translations/qtbase_sk.qm",
"./" + distDir + "translations/qtbase_tr.qm",
"./" + distDir + "translations/qtbase_uk.qm",
"./" + distDir + "translations/qtbase_zh_CN.qm",
"./" + distDir + "translations/qtbase_zh_TW.qm"
"./" + distDir + "/QtWidgetsProject.sh",
"./" + distDir + "/bin/QtWidgetsProject",
"./" + distDir + "/bin/qt.conf",
"./" + distDir + "/lib/libQt6Core.so",
"./" + distDir + "/lib/libQt6DBus.so",
"./" + distDir + "/lib/libQt6EglFSDeviceIntegration.so",
"./" + distDir + "/lib/libQt6Gui.so",
"./" + distDir + "/lib/libQt6Network.so",
"./" + distDir + "/lib/libQt6OpenGL.so",
"./" + distDir + "/lib/libQt6Pdf.so",
"./" + distDir + "/lib/libQt6Svg.so",
"./" + distDir + "/lib/libQt6WaylandClient.so",
"./" + distDir + "/lib/libQt6WaylandEglClientHwIntegration.so",
"./" + distDir + "/lib/libQt6Widgets.so",
"./" + distDir + "/lib/libQt6WlShellIntegration.so",
"./" + distDir + "/lib/libQt6XcbQpa.so",
"./" + distDir + "/lib/libicudata.so",
"./" + distDir + "/lib/libicui18n.so",
"./" + distDir + "/lib/libicuuc.so",
"./" + distDir + "/plugins/iconengines/libqsvgicon.so",
"./" + distDir + "/plugins/imageformats/libqgif.so",
"./" + distDir + "/plugins/imageformats/libqicns.so",
"./" + distDir + "/plugins/imageformats/libqico.so",
"./" + distDir + "/plugins/imageformats/libqjpeg.so",
"./" + distDir + "/plugins/imageformats/libqpdf.so",
"./" + distDir + "/plugins/imageformats/libqsvg.so",
"./" + distDir + "/plugins/imageformats/libqtga.so",
"./" + distDir + "/plugins/imageformats/libqtiff.so",
"./" + distDir + "/plugins/imageformats/libqwbmp.so",
"./" + distDir + "/plugins/imageformats/libqwebp.so",
"./" + distDir + "/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so",
"./" + distDir + "/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so",
"./" + distDir + "/plugins/platforms/libqeglfs.so",
"./" + distDir + "/plugins/platforms/libqlinuxfb.so",
"./" + distDir + "/plugins/platforms/libqminimal.so",
"./" + distDir + "/plugins/platforms/libqminimalegl.so",
"./" + distDir + "/plugins/platforms/libqoffscreen.so",
"./" + distDir + "/plugins/platforms/libqwayland-egl.so",
"./" + distDir + "/plugins/platforms/libqwayland-generic.so",
"./" + distDir + "/plugins/platforms/libqxcb.so",
"./" + distDir + "/plugins/platformthemes/libqgtk3.so",
"./" + distDir + "/plugins/platformthemes/libqxdgdesktopportal.so",
"./" + distDir + "/plugins/wayland-shell-integration/libfullscreen-shell-v1.so",
"./" + distDir + "/plugins/wayland-shell-integration/libivi-shell.so",
"./" + distDir + "/plugins/wayland-shell-integration/libqt-shell.so",
"./" + distDir + "/plugins/wayland-shell-integration/libwl-shell-plugin.so",
"./" + distDir + "/plugins/wayland-shell-integration/libxdg-shell.so",
"./" + distDir + "/plugins/xcbglintegrations/libqxcb-egl-integration.so",
"./" + distDir + "/plugins/xcbglintegrations/libqxcb-glx-integration.so",
"./" + distDir + "/translations/qtbase_ar.qm",
"./" + distDir + "/translations/qtbase_bg.qm",
"./" + distDir + "/translations/qtbase_ca.qm",
"./" + distDir + "/translations/qtbase_cs.qm",
"./" + distDir + "/translations/qtbase_da.qm",
"./" + distDir + "/translations/qtbase_de.qm",
"./" + distDir + "/translations/qtbase_en.qm",
"./" + distDir + "/translations/qtbase_es.qm",
"./" + distDir + "/translations/qtbase_fa.qm",
"./" + distDir + "/translations/qtbase_fi.qm",
"./" + distDir + "/translations/qtbase_fr.qm",
"./" + distDir + "/translations/qtbase_gd.qm",
"./" + distDir + "/translations/qtbase_he.qm",
"./" + distDir + "/translations/qtbase_hr.qm",
"./" + distDir + "/translations/qtbase_hu.qm",
"./" + distDir + "/translations/qtbase_it.qm",
"./" + distDir + "/translations/qtbase_ja.qm",
"./" + distDir + "/translations/qtbase_ko.qm",
"./" + distDir + "/translations/qtbase_lv.qm",
"./" + distDir + "/translations/qtbase_nl.qm",
"./" + distDir + "/translations/qtbase_nn.qm",
"./" + distDir + "/translations/qtbase_pl.qm",
"./" + distDir + "/translations/qtbase_pt_BR.qm",
"./" + distDir + "/translations/qtbase_ru.qm",
"./" + distDir + "/translations/qtbase_sk.qm",
"./" + distDir + "/translations/qtbase_tr.qm",
"./" + distDir + "/translations/qtbase_uk.qm",
"./" + distDir + "/translations/qtbase_zh_CN.qm",
"./" + distDir + "/translations/qtbase_zh_TW.qm"
}
);
#endif
return Tree;
return Tree;
}
QSet<QString> ModulesQt63::qmlVirtualKeyBoadrLibs(const QString &distDir) const
{
}
QSet<QString> ModulesQt63::qtWithoutTr(const QString &distDir) const
{
}
QSet<QString> ModulesQt63::qtWebEngine(const QString &distDir) const
{
}
QSet<QString> ModulesQt63::qtWebEngineWidgets(const QString &distDir) const
{
}
QSet<QString> ModulesQt63::testEmptyParamsTree(const QString &distDir) const
{
}

18
tests/modules/modulesqt6_3.h
View File

@ -14,17 +14,13 @@ public:
QSet<QString> testDistroLibs(const QString &distDir = DISTRO_DIR) const override;
QSet<QString> testOutLibs(const QString &distDir = DISTRO_DIR) const override;
// ModulesQt513 interface
public:
QSet<QString> ignoreFilter(const QSet<QString> &input, const QString &filter) const override;
QSet<QString> replace(const QSet<QString> &data, const QMap<QString, QString> &replaceMap) const override;
QSet<QString> onlyC(const QString &distDir) const override;
QSet<QString> qtLibs(const QString &distDir) const override;
QSet<QString> qmlVirtualKeyBoadrLibs(const QString &distDir) const override;
QSet<QString> qtWithoutTr(const QString &distDir) const override;
QSet<QString> qtWebEngine(const QString &distDir) const override;
QSet<QString> qtWebEngineWidgets(const QString &distDir) const override;
QSet<QString> testEmptyParamsTree(const QString &distDir) const override;
QSet<QString> onlyC(const QString &distDir = DISTRO_DIR) const override;
QSet<QString> qtLibs(const QString &distDir = DISTRO_DIR) const override;
QSet<QString> qmlVirtualKeyBoadrLibs(const QString &distDir = DISTRO_DIR) const override;
QSet<QString> qtWithoutTr(const QString &distDir = DISTRO_DIR) const override;
QSet<QString> qtWebEngine(const QString &distDir = DISTRO_DIR) const override;
QSet<QString> qtWebEngineWidgets(const QString &distDir = DISTRO_DIR) const override;
QSet<QString> testEmptyParamsTree(const QString &distDir = DISTRO_DIR) const override;
};
#endif // MODULESQT6_3_H

81
tests/tstMain.cpp
View File

@ -151,6 +151,9 @@ private slots:
// END TEST CASES
private:
void initTestCase();
void cleanupTestCase();
/**
* @brief initTest This method prepare @a test for run in the QApplication loop.
@ -161,12 +164,88 @@ private:
QCoreApplication *_app = nullptr;
};
void tstMain::initTestCase() {
QDir qt;
QDir("./" + DISTRO_DIR).removeRecursively();
qt.mkpath("./test/Qt/5.12/");
qt.mkpath("./test/extraPath/");
qt.mkpath("./test/extra/");
qt.mkpath("./test/warning/");
qt.mkpath("./test/bins/");
QFile f( "./test/Qt/5.12/generalLib.so");
if (f.open(QIODevice::WriteOnly| QIODevice::Truncate)) {
f.write("lib", 3);
f.close();
}
f.setFileName("./test/extraPath/ExtraLib.so");
if (f.open(QIODevice::WriteOnly| QIODevice::Truncate)) {
f.write("lib", 3);
f.close();
}
f.setFileName("./test/extra/ExtraLib.so");
if (f.open(QIODevice::WriteOnly| QIODevice::Truncate)) {
f.write("lib", 3);
f.close();
}
f.setFileName("./test/warning/WarningLib.so");
if (f.open(QIODevice::WriteOnly| QIODevice::Truncate)) {
f.write("lib", 3);
f.close();
}
f.setFileName("./test/bins/execTarget.exe");
if (f.open(QIODevice::WriteOnly| QIODevice::Truncate)) {
f.write("exec", 3);
f.close();
}
f.setFileName("./test/bins/execTarget");
if (f.open(QIODevice::WriteOnly| QIODevice::Truncate)) {
f.write("exec", 3);
f.close();
}
}
void tstMain::cleanupTestCase() {
QDir qt("./test");
qt.removeRecursively();
}
/**
* @brief tstMain::tstMain
* init all availabel units for testsing
*/
tstMain::tstMain() {
qputenv("QTEST_FUNCTION_TIMEOUT", "1800000");
QString qifwPath = qgetenv("PATH") + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.0/bin/";
qifwPath += qifwPath + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.1/bin/";
qifwPath += qifwPath + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.2/bin/";
qifwPath += qifwPath + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.3/bin/";
qifwPath += qifwPath + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.4/bin/";
qifwPath += qifwPath + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.5/bin/";
qputenv("PATH", qifwPath.toLatin1().data());
TestUtils utils;
QStringList pathList = QProcessEnvironment::systemEnvironment().
value("PATH").split(DeployCore::getEnvSeparator());
qDebug () << pathList;
auto &filesTree = *FilesTreeService::autoInstance();
for (const auto& path: qAsConst(pathList)) {
filesTree += utils.getFilesSet(path, 1);
}
filesTree += utils.getFilesSet(QT_BASE_DIR);
// init xample unit test
int argc =0;
char * argv[] = {nullptr};
@ -179,11 +258,13 @@ tstMain::tstMain() {
QDir(path).removeRecursively();
initTestCase();
}
tstMain::~tstMain() {
_app->exit(0);
delete _app;
cleanupTestCase();
}
void tstMain::initTest(Test *test) {

78
tests/units/testbase.cpp
View File

@ -13,28 +13,6 @@ TestBase::TestBase()
}
void TestBase::deploytest() {
qputenv("QTEST_FUNCTION_TIMEOUT", "1800000");
QString qifwPath = qgetenv("PATH") + DeployCore::getEnvSeparator() + TestQtDir + "../../Tools/QtInstallerFramework/4.0/bin/";
qifwPath += qifwPath + DeployCore::getEnvSeparator() + TestQtDir + "../../Tools/QtInstallerFramework/4.1/bin/";
qifwPath += qifwPath + DeployCore::getEnvSeparator() + TestQtDir + "../../Tools/QtInstallerFramework/4.2/bin/";
qifwPath += qifwPath + DeployCore::getEnvSeparator() + TestQtDir + "../../Tools/QtInstallerFramework/4.3/bin/";
qputenv("PATH", qifwPath.toLatin1().data());
TestUtils utils;
QStringList pathList = QProcessEnvironment::systemEnvironment().
value("PATH").split(DeployCore::getEnvSeparator());
for (const auto& path: qAsConst(pathList)) {
filesTree += utils.getFilesSet(path, 1);
}
filesTree += utils.getFilesSet(TestQtDir);
}
int TestBase::generateLib(const QString &paath) {
QDir dir;
dir.mkpath(QFileInfo(paath).absolutePath());
@ -67,60 +45,6 @@ void TestBase::deleteLib(const QString &paath) {
}
}
void TestBase::initTestCase() {
QDir qt;
QDir("./" + DISTRO_DIR).removeRecursively();
qt.mkpath("./test/Qt/5.12/");
qt.mkpath("./test/extraPath/");
qt.mkpath("./test/extra/");
qt.mkpath("./test/warning/");
qt.mkpath("./test/bins/");
QFile f( "./test/Qt/5.12/generalLib.so");
if (f.open(QIODevice::WriteOnly| QIODevice::Truncate)) {
f.write("lib", 3);
f.close();
}
f.setFileName("./test/extraPath/ExtraLib.so");
if (f.open(QIODevice::WriteOnly| QIODevice::Truncate)) {
f.write("lib", 3);
f.close();
}
f.setFileName("./test/extra/ExtraLib.so");
if (f.open(QIODevice::WriteOnly| QIODevice::Truncate)) {
f.write("lib", 3);
f.close();
}
f.setFileName("./test/warning/WarningLib.so");
if (f.open(QIODevice::WriteOnly| QIODevice::Truncate)) {
f.write("lib", 3);
f.close();
}
f.setFileName("./test/bins/execTarget.exe");
if (f.open(QIODevice::WriteOnly| QIODevice::Truncate)) {
f.write("exec", 3);
f.close();
}
f.setFileName("./test/bins/execTarget");
if (f.open(QIODevice::WriteOnly| QIODevice::Truncate)) {
f.write("exec", 3);
f.close();
}
}
void TestBase::cleanupTestCase() {
QDir qt("./test");
qt.removeRecursively();
}
void TestBase::checkResults(const QSet<QString> &tree, bool noWarnings, bool onlySize) {
TestUtils utils;
@ -144,6 +68,8 @@ void TestBase::checkResults(const QSet<QString> &tree, bool noWarnings, bool onl
return;
}
auto &filesTree = *FilesTreeService::autoInstance();
if (comapre.size() != 0) {
bool bug = false;

6
tests/units/testbase.h
View File

@ -5,8 +5,11 @@
#include "test.h"
#include <QString>
#include <deployconfig.h>
#include <qaservice.h>
class FilesTreeService: public QSet<QString>, public QuasarAppUtils::Service<FilesTreeService>{};
class TestBase: public Test
{
public:
@ -36,9 +39,6 @@ public:
static const QString TestBinDir;
static const QString TestQtDir;
private:
QSet<QString> filesTree;
};
#endif // TESTBASE_H